doway-coms 2.2.10 → 2.2.12

package/package.json

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

package/packages/BasePulldown/src/index.vue

@@ -402,7 +402,15 @@ export default {
       }
     }
   },
-  watch: {},
+  watch: {
+    // 触发下拉表格字段更改，直接重新渲染
+    columns: {
+      handler(newVal) {
+        this.reloadColumn()
+      },
+      deep: true
+    }
+  },
   computed: {
     currentValue: {
       // 动态计算currentValue的值
@@ -501,6 +509,85 @@ export default {
     }
   },
   methods: {
+    // 刷新重置字段列
+    reloadColumn() {
+      this.internalColumns = []
+      this.internalColumns.push({
+        type: 'seq',
+        fixed: 'left',
+        width: 50,
+      })
+      if (this.isMultiSelect === true) {
+        this.internalColumns.push({
+          type: 'checkbox',
+          fixed: 'left',
+          width: 40,
+        })
+      }
+      for (let i = 0; i < this.columns.length; i++) {
+        this.fetchFields = this.fetchFields + this.columns[i].field + ','
+        this.columns[i]['params'] = {
+          dataSource: [],
+        }
+        if (this.columns[i].dataSource) {
+          this.columns[i]['params'].dataSource = this.columns[i].dataSource
+        }
+        if (!this.columns[i].width) {
+          this.columns[i]['width'] = 100
+        }
+        if (this.columns[i].isCheckbox === true) {
+          this.columns[i]['type'] = 'checkbox'
+        }
+        if (!this.columns[i].controlType) {
+          this.columns[i].controlType = 'text'
+        }
+        // 设置字段的过滤插槽
+        if (this.columns[i].filter) {
+          this.columns[i]['filterMultiple'] = false
+
+          switch (this.columns[i].controlType) {
+            case 'checkbox':
+              this.columns[i]['slots'] = {
+                filter: `checkbox_filter`,
+              }
+              break
+            case 'select':
+              this.columns[i]['slots'] = {
+                filter: `select_filter`,
+              }
+              this.columns[i]['filters'] = [
+                {
+                  data: [],
+                },
+              ]
+              break
+            default:
+              this.columns[i]['slots'] = {
+                filter: `text_filter`,
+              }
+              this.columns[i]['filters'] = [
+                {
+                  data: '',
+                },
+              ]
+              break
+          }
+        }
+        // 默认排序
+        if (this.columns[i].defaultSort) {
+          this.defaultSort.push({
+            field: this.columns[i].field,
+            order: this.columns[i].defaultSort,
+          })
+          this.sorts.push([this.columns[i].field, this.columns[i].defaultSort])
+        }
+        this.internalColumns.push(this.columns[i])
+        if (this.columns[i].filter === true) {
+          this.filterCols.push(this.columns[i])
+        }
+      }
+      this.$refs.pupupGridView.refreshColumn()
+    },
     gridRowStyle(scope) {
       if (scope.row.sysRepeat === true) {
         return 'row--pending'

package/packages/utils/api.js

@@ -102,7 +102,7 @@ export function objectAuditLogApi(data) {
 export function userResetApi(data) {
   return request({
     url: store.getters.umsUrl + '/v1/user/userReset',
-    method: 'git',
+    method: 'get',
     params: data
   })
 }