cloud-web-corejs 1.0.54-dev.371 → 1.0.54-dev.372

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.371",
+  "version": "1.0.54-dev.372",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/table/vxeFilter/mixin.js

@@ -194,35 +194,43 @@ modules = {
           this.resetFilterEvent();
           return;
         }
+
         data.vals = vals;
         option.data.hasFilter = true;
         $panel.changeOption(evnt, true, option);
         $panel.confirmFilter();
 
-        let checkStrictly = $table.$options.propsData?.checkboxConfig?.checkStrictly;
-        $table.setAllCheckboxRow(false);
-        // $table.clearCheckboxRow();
-        // debugger
-        // var originOption = $grid.originOption;
-        /* if(checkStrictly){
-
-        }else{
-
-        } */
-
+        let checkStrictly =
+          $table.$options.propsData?.checkboxConfig?.checkStrictly;
+        // $table.setAllCheckboxRow(false);
+        this.clearTableCheckboxRow($table);
+      },
+      clearTableCheckboxRow($table) {
+        let originOption = $table.$xegrid?.originOption;
+        if (originOption) {
+          let target = originOption.vue;
+          if (
+            target.defaultTableRefName === originOption.tableRef &&
+            target._clearChecked
+          ) {
+            target._clearChecked();
+          } else {
+            $table.clearCheckboxRow();
+          }
+          originOption.onFilter && originOption.onFilter();
+        } else {
+          $table.clearCheckboxRow();
+        }
       },
       resetFilterEvent() {
         const { $panel, $table } = this.params;
-        let checkStrictly = $table.$options.propsData?.checkboxConfig?.checkStrictly;
+        let checkStrictly =
+          $table.$options.propsData?.checkboxConfig?.checkStrictly;
         this.option.data.hasFilter = false;
         $panel.resetFilter();
-        $table.setAllCheckboxRow(false);
-        // $table.clearCheckboxRow();
-        /* if(checkStrictly){
-
-        }else{
+        // $table.setAllCheckboxRow(false);
 
-        } */
+        this.clearTableCheckboxRow($table);
       },
     },
   },

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -113,6 +113,11 @@ export default {
         onCellDblclick: (param) => {
           this.checkWithSubmit(param);
         },
+        otherConfig: {
+          onFilter: () => {
+            this.checkRows = [];
+          },
+        },
         config: {
           checkboxConfig: {
             checkStrictly: true,

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -1051,6 +1051,7 @@ modules = {
         searchColumns: searchColumns,
         isQueryAllPage,
         vform: true,
+        ...(dataTableConfig.otherConfig || {}),
         config: {
           height: height,
           showFooter,

package/src/mixins/selectDialog/index.js

@@ -12,7 +12,8 @@ tMixins = {
   data() {
     return {
       checkRows: [],
-      fieldKey: 'id'
+      fieldKey: 'id',
+      defaultTableRefName: "table-m1"
     }
   },
   methods: {
@@ -31,6 +32,10 @@ tMixins = {
       if (this.$attrs.fieldKey) {
         this.fieldKey = this.$attrs.fieldKey;
       }
+
+      if (this.$attrs.tableRef) {
+        this.defaultTableRefName = this.$attrs.tableRef;
+      }
       let checkRows;
       if (this.selectMulti) {
         checkRows = this.rows || [];
@@ -48,13 +53,11 @@ tMixins = {
       }
     },
     addDataTable(obj) {
-      debugger
       let fieldKey = this.fieldKey;
       let selectMulti = this.selectMulti;
       let row = obj.row;
       let that = this;
       let $table1 = obj.$table;
-      let $table2 = this.$refs['table-m2'];
 
       if (selectMulti) {
         let rows = this.checkRows;
@@ -108,7 +111,7 @@ tMixins = {
       let selectMulti = this.selectMulti;
       let row = this.checkRows[index];
       var rowid = row[fieldKey];
-      let $grid1 = this.$refs['table-m1'];
+      let $grid1 = this.$refs[this.defaultTableRefName];
 
       // let rows = $grid1.getTableData().fullData;
       let rows = $grid1.getTableData().visibleData;
@@ -162,10 +165,13 @@ tMixins = {
       })
     },
     clearChecked() {
-      let $grid1 = this.$refs['table-m1'];
+      let $grid1 = this.$refs[this.defaultTableRefName];
       $grid1.clearCheckboxRow();
       this.checkRows = [];
     },
+    _clearChecked() {
+      this.clearChecked();
+    },
     findTreeRowById(rows, rowid) {
       let fieldKey = this.fieldKey;
       for (let i = 0; i < rows.length; i++) {
@@ -197,7 +203,7 @@ tMixins = {
       return newRows;
     },
     searchEvent(option) {
-      let target = "table-m1";
+      let target = this.defaultTableRefName;
       let formKey = "formData";
       if (option && !option.preventDefault) {
         if (option.target) {
@@ -210,7 +216,7 @@ tMixins = {
       this.$refs[target].commitProxy('reload');
     },
     resetEvent(option) {
-      let target = "table-m1";
+      let target = this.defaultTableRefName;
       let formKey = "formData";
       if (option && !option.preventDefault) {
         if (option.target) {

package/src/views/user/wf/wf_transfer_setting/edit.vue

@@ -118,6 +118,7 @@
       :visiable.sync="showUserDialog1"
       @confirm="confirmUserDialog1"
       :multi="false"
+      :param="{ enabled: null }"
     />
     <userDialog
       v-if="showUserDialog2"

package/src/views/user/wf/wf_transfer_setting/list.vue

@@ -112,6 +112,7 @@
       :visiable.sync="showUserDialog1"
       @confirm="confirmUserDialog1"
       :multi="false"
+      :param="{ enabled: null }"
     />
     <userDialog
       v-if="showUserDialog2"