测试css冲突

config/gulpConfig.js

@@ -7,8 +7,8 @@ module.exports = {
     common_jspaths:[
         'lib/jquery/jquery-3.2.1.min.js',
         'lib/popper/popper.min.js',
-        'lib/bootstrap/bootstrap.min.js',
         'lib/jquery-ui/jquery-0i.min.js',
+        'lib/bootstrap/bootstrap.min.js',
         'web/building_saas/js/*.js',
         'public/web/scMathUtil.js',
         'public/web/gljUtil.js',
@@ -45,16 +45,16 @@ module.exports = {
     ],
     main_css:[
         'lib/ztree/css/zTreeStyle.css',
-        'lib/jquery-ui/jquery-ui.css',
-        'lib/spreadjs/sheets/css/gc.spread.sheets.sc.css',
-        'lib/jquery-contextmenu/jquery.contextMenu.css'
+        //'lib/jquery-ui/jquery-ui.css',
+        //'lib/spreadjs/sheets/css/gc.spread.sheets.sc.css',
+        //'lib/jquery-contextmenu/jquery.contextMenu.css'
     ],
     main_jspaths:[
         'lib/JSExpressionEval_src/*.js',
         '!lib/JSExpressionEval_src/JsHashMap.js',
-        'lib/jquery-ui/jquery-ui.min.js',
+       /* 'lib/jquery-ui/jquery-ui.min.js',
         'lib/jquery-ui/jquery-ui-datepickerCN.js',
-        'lib/jquery-contextmenu/*.js',
+        'lib/jquery-contextmenu/!*.js',*/
         //'lib/lodash/lodash.js',
         // 'test/tmp_data/test_ration_calc/ration_calc_base.js',
         'web/building_saas/main/js/models/main_consts.js',

web/building_saas/main/html/main.html

@@ -6,19 +6,25 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title><%= projectData.name !== undefined ? projectData.name : '造价书' %>-纵横云计价</title>
-    <!-- inject:css -->
+
+    <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">
+    <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.sc.css" type="text/css">
+
+    <!-- inject:css -->
+    <!--<link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">-->
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/web/building_saas/css/custom.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <!--zTree-->
     <link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
     <!--SpreadJs-->
-    <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">
-    <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.sc.css" type="text/css">
+   <!-- <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">
+    <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.sc.css" type="text/css">-->
     <link rel="stylesheet" href="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.css">
     <!-- jquery.contextmenu -->
-    <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">
+   <!-- <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">-->
     <!-- endinject -->
     <script>
         // 这里的变量供页面调用
@@ -348,9 +354,9 @@
                                           <div class="col px-1">
                                               <div class="input-group" id="stdBillsGuidanceSearch">
                                                   <input type="text" class="form-control form-control-sm" placeholder="输入编码或名称">
-                                                  <span class="input-group-btn">
-                                            <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
-                                        </span>
+                                                  <div class="input-group-append">
+                                                      <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
+                                                  </div>
                                               </div>
                                           </div>
                                           <div class="col p-0">
@@ -389,11 +395,17 @@
                                           <select class="form-control form-control-sm col-6" id="stdBillsLibSelect">
                                           </select>
                                           <div class="input-group col-6" id="stdBillsSearch">
+                                              <input type="text" class="form-control form-control-sm" placeholder="输入编码或名称" value="">
+                                              <div class="input-group-append">
+                                                  <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
+                                              </div>
+                                          </div>
+                                         <!-- <div class="input-group col-6" id="stdBillsSearch">
                                               <input type="text" class="form-control form-control-sm" placeholder="输入编码或名称">
                                               <span class="input-group-btn">
                                                   <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
                                               </span>
-                                          </div>
+                                          </div>-->
                                           <!--搜索结果窗体-->
                                           <div class="side-search-box col-12 p-2" id="stdBillsSearchResult" style="display: none;">
                                               <div class="d-flex justify-content-between">
@@ -428,9 +440,9 @@
                                           </select>
                                           <div class="input-group col-6">
                                               <input type="text" class="form-control form-control-sm" placeholder="搜索定额" value="" id="rationSearchKeyword">
-                                              <span class="input-group-btn">
+                                              <div class="input-group-append">
                                                   <button class="btn btn-secondary btn-sm" type="button" id="rationSearch"><i class="fa fa-search" aria-hidden="true"></i></button>
-                                              </span>
+                                              </div>
                                           </div>
                                           <!--搜索结果窗体-->
                                           <div class="side-search-box col-12 p-0" id="rationSearchResult" style="display: none;">
@@ -1442,6 +1454,13 @@
         <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.11.1.2.min.js"></script>
         <script>GC.Spread.Sheets.LicenseKey =  '<%- LicenseKey %>';</script>
 
+    <script type="text/javascript" src="/lib/jquery-ui/jquery-ui.min.js"></script>
+    <script type="text/javascript" src="/lib/jquery-ui/jquery-ui-datepickerCN.js"></script>
+    <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.js"></script>
+    <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
+    <script src="/lib/popper/popper.min.js"></script>
+    <script src="/lib/bootstrap/bootstrap.min.js"></script>
+
         <script src="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.min.js" type="text/javascript"></script>
         <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
         <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
@@ -1471,10 +1490,10 @@
         <script src="/lib/JSExpressionEval_src/Tokanizer.js"></script>
         <script src="/lib/JSExpressionEval_src/Evaluator.js"></script>
         <!--end expression calculate-->
-        <script type="text/javascript" src="/lib/jquery-ui/jquery-ui.min.js"></script>
+        <!--<script type="text/javascript" src="/lib/jquery-ui/jquery-ui.min.js"></script>
         <script type="text/javascript" src="/lib/jquery-ui/jquery-ui-datepickerCN.js"></script>
         <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.js"></script>
-        <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
+        <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>-->
         <!--<script type="text/javascript" src="/lib/lodash/lodash.js"></script>-->
     <!-- Common -->
         <script type="text/javascript" src="/public/web/common_ajax.js"></script>
@@ -1483,8 +1502,8 @@
         <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
 
         <!-- JS. -->
-        <script src="/lib/popper/popper.min.js"></script>
-        <script src="/lib/bootstrap/bootstrap.min.js"></script>
+        <!--<script src="/lib/popper/popper.min.js"></script>
+        <script src="/lib/bootstrap/bootstrap.min.js"></script>-->
         <script src="/web/building_saas/js/global.js"></script>
         <!--报表 zTree -->
 

web/building_saas/main/js/views/std_billsGuidance_lib.js

@@ -631,7 +631,7 @@ const billsGuidance = (function () {
             }
         });
         //搜索
-        $('#stdBillsGuidanceSearch>span>button').click(function () {
+        $('#stdBillsGuidanceSearch>div>button').click(function () {
             if(!bills.tree){
                 return;
             }
@@ -697,7 +697,7 @@ const billsGuidance = (function () {
         $('#stdBillsGuidanceSearch>input').bind('keypress', function (event) {
             if(event.keyCode === 13){
                 $(this).blur();
-                $('#stdBillsGuidanceSearch>span>button').click();
+                $('#stdBillsGuidanceSearch>div>button').click();
             }
         });
         // 关闭搜索结果

web/building_saas/main/js/views/std_bills_lib.js

@@ -259,7 +259,7 @@ var billsLibObj = {
             $.bootstrapLoading.end();
         });
 
-        $('#stdBillsSearch>span>button').click(function () {
+        $('#stdBillsSearch>div>button').click(function () {
             billsLibObj.clearHighLight(billsLibObj.stdBillsSpread);
             var keyword = $('#stdBillsSearch>input').val();
             if (!keyword || keyword === '') {
@@ -504,7 +504,7 @@ $('#stdBillsLibSelect').change(function () {
 $('#stdBillsSearch>input').bind('keypress', function (event) {
     if(event.keyCode === 13){
         $(this).blur();
-        $('#stdBillsSearch>span>button').click();
+        $('#stdBillsSearch>div>button').click();
     }
 });