doway-coms 1.6.73 → 1.6.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.6.73",
+  "version": "1.6.74",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/SeqSetting.vue

@@ -107,26 +107,7 @@ export default {
     }
   },
   created() {
-    this.adjustUserDefineColumns = this.userDefineColumns;
-    // 设置唯一标识，用于保存时找到字段并重新排序
-    this.adjustUserDefineColumns.forEach((x, index)=> x.currentKey = index + x.field)
-    this.columns = [];
-    this.adjustUserDefineColumns.forEach((item) => {
-      // 去除操作列和序号、多选框列
-      if (item.field === "operation" || item.field == undefined) {
-          return;
-      }
-      const column = {
-        currentKey: item.currentKey,
-        field: item.field,
-        title: item.title,
-        visible: item.visible,
-        width: item.width,
-        filters: item.filters,
-        order: item.order,
-      }
-      this.columns.push(column);
-    })
+    this.setColumnsOptions()
   },
   mounted() {
     // 初始排序数组
@@ -134,6 +115,28 @@ export default {
     this.setOptions()
   },
   methods: {
+    setColumnsOptions() {
+      this.adjustUserDefineColumns = this.userDefineColumns;
+      // 设置唯一标识，用于保存时找到字段并重新排序
+      this.adjustUserDefineColumns.forEach((x, index)=> x.currentKey = index + x.field)
+      this.columns = [];
+      this.adjustUserDefineColumns.forEach((item) => {
+        // 去除操作列和序号、多选框列
+        if (item.field === "operation" || item.field == undefined) {
+            return;
+        }
+        const column = {
+          currentKey: item.currentKey,
+          field: item.field,
+          title: item.title,
+          visible: item.visible,
+          width: item.width,
+          filters: item.filters,
+          order: item.order,
+        }
+        this.columns.push(column);
+      })
+    },
     // 配置方法
     setOptions() {
         var vm = this
@@ -204,6 +207,14 @@ export default {
       })
       saveUserModuleDataFieldApi(postData)
         .then(res => {
+          // 更改columns序号
+          // vm.columns.forEach(column => {
+          //   let tempObject = postData.fields.find(x => x.field == column.field)
+          //   if (tempObject) {
+          //     column.sort = tempObject.sort
+          //   }
+          // })
+          // console.log('1',vm.columns);
           // 返回表格组件触发更新
           vm.$emit('saveSeqConfig',postData, res.content)
         })

package/packages/BaseGrid/src/index.vue

@@ -101,6 +101,7 @@
                 :height="height"
                 :userDefineColumns="userDefineColumns"
                 ref="baseAdjustGridView"
+                @saveSeqConfig="saveSeqConfig"
               />
             </template>
             <div @click="clickHeader" v-if="moduleCode && dataCode" >
@@ -741,7 +742,7 @@ export default {
   props: {
     isSeqPopover: {
       type: Boolean,
-      default: true,
+      default: false,
     },
     showOverFlow: {
       type: Boolean,
@@ -1867,9 +1868,9 @@ export default {
       let tableCollectColumn = this.$refs.baseGrid.getTableColumn().collectColumn;
       // 表格排序信息更新
       XEUtils.arrayEach(tableCollectColumn, (loopCol) => {
-        const find = XEUtils.find(emitColumns, item => loopCol.field === item.field)
+        const find = XEUtils.find(emitColumns.fields, item => loopCol.field === item.field)
         if (find) {
-          loopCol.sort = find.sort
+          loopCol.params.sort = find.sort
         }
       })
       //设置表格顺序
@@ -1878,9 +1879,11 @@ export default {
         (p) => p.params.sort
       );
       // 更新表格
-      vm.$refs.baseGrid.reloadColumn(tableCollectColumn);
+      this.$refs.baseGrid.reloadColumn(tableCollectColumn)
+      this.userDefineColumns = this.tableCollectColumn
+      // this.$refs.baseAdjustGridView.setColumnsOptions()
       //清空store缓存
-      vm.$store.commit(
+      this.$store.commit(
         "SET_MODULE_VIEW_INFO",{
           moduleCode:this.moduleCode,
           info: resData