Sfoglia il codice sorgente

1. 菜单界面的高级查询页面查询字段排序无效

杨志杰 3 anni fa
parent
commit
d02f1f9526

+ 5 - 7
src/window/filter/ComplexFilterPanel.vue

@@ -760,7 +760,7 @@ export default {
     propertyChanged: function (filterSchemaLine) {
       var _self = this;
 
-      this.filterSchema.filterSchemaLines.forEach(function (filterSchemaLine1) {
+      _self.filterSchema.filterSchemaLines.forEach(function (filterSchemaLine1) {
         if (filterSchemaLine.fieldName === filterSchemaLine1.fieldName) {
           filterSchemaLine1.visible = filterSchemaLine.visible;
           filterSchemaLine1.sortNo = filterSchemaLine.sortNo;
@@ -770,14 +770,12 @@ export default {
       FilterSchema.filterSchemaLinePropertyChanged(
         _self.windowNo,
         _self.tabIndex,
-        this.filterSchema.filterSchemaLines,
+        _self.filterSchema.filterSchemaLines,
       );
 
-      //    this.filterSchema.filterSchemaLines.sort(function (item1, item2) {
-      //      return item1.sortNo - item2.sortNo;
-      //    });
-      
-      
+      _self.filterSchema.filterSchemaLines.sort(function (item1, item2) {
+        return item1.sortNo - item2.sortNo;
+      });
     },
 
     /**

+ 21 - 2
src/window/filter/FilterColumnDef.vue

@@ -1,16 +1,18 @@
 <template>
   <div class="btn-group">
     <button
+      id="filter-column-def"
       type="button"
       class="btn btn-default dropdown-toggle"
       aria-haspopup="true"
       aria-expanded="false"
-      @click="showDropdown = !showDropdown"
+      @click="showDropdown = true"
     >
-      <span class="fa fa-bars" />
+      <span id="filter-column-def-span" class="fa fa-bars" />
     </button>
     <ul
       v-show="showDropdown"
+      v-click-outside="onClickOutside"
       class="dropdown-menu dropdown-menu-right dropmenu-userdefined column-prop"
     >
       <li
@@ -48,8 +50,14 @@
 <script>
 import FilterSchema from './FilterSchema.js';
 import Language from '../../common/Language.js';
+import vClickOutside from 'click-outside-vue3';
+
 export default {
 
+  directives: {
+    clickOutside: vClickOutside.directive,
+  },
+
   components: {
 
   },
@@ -132,6 +140,17 @@ export default {
         this.$emit('propertyChanged', filterSchemaLineClone2);
       }
     },
+
+    
+    /**
+     * 当点击'搜索范围'以外的DOM,隐藏'搜索范围'以外
+     */
+    onClickOutside: function(e) {
+      if(e.srcElement != null && (e.srcElement.id == 'filter-column-def' || e.srcElement.id == 'filter-column-def-span')){
+        return;
+      }
+      this.showDropdown = false;
+    },
   },
 };
 </script>