doway-coms 1.6.41 → 1.6.43

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1263,6 +1263,9 @@ export default {
       // expList = vm.getExpTags(filterList)
       // return expList
     },
+    getSorts() {
+      return this.defaultSort.map(item=> [item.field,item.order]);
+    },
     filterChange({ column, property, values, datas, filterList, $event }) {
       let vm = this;
       //如果不是远程筛选 就不emit了
@@ -1709,7 +1712,7 @@ export default {
           tableCollectColumn,
           (p) => p.field === loopCol.field
         ).item;
-        tempCol.visible = loopCol.visible;
+        tempCol.visible = loopCol.params.show;
         tempCol.width = loopCol.width;
         // tempCol.width = colWidth;
         //设置顺序

package/packages/BaseToolStatus/src/index.vue

@@ -24,7 +24,7 @@
               v-if="!status.notButton"
               class="status-primary"
               :class="
-                status.value === formRow.status
+                 status.value === (workFlowStatus?workFlowStatus:formRow.status)
                   ? 'current-status'
                   : 'inactive-status'
               "
@@ -80,6 +80,11 @@
         },
         deep: true
       },
+      workFlowStatus: {
+        // 对象信息
+        type: String,
+        default: ''
+      },
       objectName: {
         // 对象信息
         type: String,