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

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-item.vue

@@ -165,7 +165,7 @@
           :parent-widget="widget"
           :columnConfig="obj.column.params.columnConfig"
           :subFormRowIndex="obj.rowIndex"
-          :formItemProp="getColumnProp(widget, obj)"
+          :formItemProp="getColumnProp(obj)"
           :subFormRowId="obj.row._X_ROW_KEY"
           :tableParam="obj"
         >
@@ -211,7 +211,7 @@
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
         :subFormRowId="obj.row._X_ROW_KEY"
-        :formItemProp="getColumnProp(widget, obj, true)"
+        :formItemProp="getColumnProp(obj, true)"
         :tableParam="obj"
       >
         <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">

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,
@@ -1896,26 +1897,84 @@ modules = {
       return { columnSelectedWidget, columnEditFields };
     },
     getColumnProp2(fieldWidget, obj) {
+      let isQueryTable = this.widget.options.isQueryTable || false;
+      let rowWidget = this.getRowWidget(obj, fieldWidget)
+      let required = rowWidget.options.required || false;
+
       let fieldKeyName = this.getFieldKeyName(this.widget);
-      let property = this.getFieldKeyName(fieldWidget);
-      if (this.isVabsearchFlagWidget(fieldWidget)) {
-        property = fieldWidget.options.vabSearchName || property;
+      let property = this.getFieldKeyName(rowWidget);
+      if (this.isVabsearchFlagWidget(rowWidget)) {
+        property = rowWidget.options.vabSearchName || property;
       }
       let rowIndex = Math.max(obj.rowIndex, 0);
 
       let propName = fieldKeyName + "." + rowIndex + "." + property;
+      if (isQueryTable && !required) {
+        propName = "false";
+      }
       return propName;
     },
-    getColumnProp(widget, obj, isEdit) {
-      if (!widget) {
-        return "false";
+    validateCheckRow(){
+      let $grid = this.getGridTable();
+      let checkRows = $grid.getCheckboxRecords(true);
+      if(checkRows.length == 0){
+        this.$message({
+          message: '请选择要操作的行',
+          type: 'warning'
+        });
+        return false;
       }
-      /*if(isEdit){
-        return "false"
-      }*/
-      let isQueryTable = this.widget.options.isQueryTable || false;
-      if (isEdit || !isQueryTable) {
-        let sourceWidgetId = isEdit
+      const fieldsToValidate = [];
+      let tableColumns = this.widget.options.tableColumns;
+      checkRows.forEach(row => {
+        let fieldSchema = this.fieldSchemaMap[row._X_ROW_KEY];
+        tableColumns.forEach(column => {
+          if(column.widget){
+            let widget = fieldSchema[column.widget.id]
+            let required = widget.options.required || false;
+            if(required){
+              let propName = this.getColumnWidgetProp(widget, row);
+              fieldsToValidate.push(propName)
+            }
+          }
+          if(column.widgetList){
+            column.widgetList.forEach(itemWidget=>{
+              let widget = fieldSchema[itemWidget.id]
+              let required = widget.options.required || false;
+              if(required){
+                let propName = this.getColumnWidgetProp(widget, row);
+                fieldsToValidate.push(propName)
+              }
+            })
+
+          }
+        })
+      })
+      let formRef = this.getFormRef();
+      let renderForm = formRef.$refs.renderForm;
+      let hasError = false;
+      renderForm.validateField(fieldsToValidate, errors => {
+        if (!hasError && errors) {
+            this.$message.error(errors)
+            hasError = true;
+        }
+      });
+      return !hasError;
+    },
+    getColumnWidgetProp(widget, row){
+      if(!widget)return
+      let $grid = this.getGridTable();
+      let rowIndex = $grid.getRowIndex(row);
+      let fieldKeyName = this.getFieldKeyName(this.widget);
+      let property = this.getFieldKeyName(widget);
+      if (this.isVabsearchFlagWidget(widget)) {
+        property = widget.options.vabSearchName || property;
+      }
+      let propName = fieldKeyName + "." + rowIndex + "." + property;
+      return propName;
+    },
+    getColumnProp(obj, isEdit) {
+      let sourceWidgetId = isEdit
           ? obj.column.params.editWidget.id
           : obj.column.params.widget.id;
         if (!this.fieldSchemaMap[obj.row._X_ROW_KEY]) return "false";
@@ -1924,8 +1983,11 @@ modules = {
         if (!fieldWidget) {
           return "false";
         }
+      let isQueryTable = this.widget.options.isQueryTable || false;
 
-        let fieldKeyName = this.getFieldKeyName(widget);
+      let required = fieldWidget.options.required || false;
+      if (isEdit || !isQueryTable || required) {
+        let fieldKeyName = this.getFieldKeyName(this.widget);
         let rowIndex = Math.max(obj.rowIndex, 0);
 
         let property = this.getFieldKeyName(fieldWidget);
@@ -1937,18 +1999,6 @@ modules = {
           property = fieldWidget.options.vabSearchName || property;
         }
         let propName = fieldKeyName + "." + rowIndex + "." + property;
-        /* let lineWidget = !isEdit
-          ? obj.column.params.widget
-          : obj.column.params.editWidget;
-        if (!lineWidget) {
-          return "false";
-        } */
-        /* if (this.isVabsearchFlagWidget(lineWidget)) {
-          let fieldName =
-            lineWidget.options.vabSearchName ||
-            this.getFieldKeyName(lineWidget);
-          propName = fieldKeyName + "." + rowIndex + "." + fieldName;
-        } */
         return propName;
       } else {
         return "false";

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 || [];
@@ -53,7 +58,6 @@ tMixins = {
       let row = obj.row;
       let that = this;
       let $table1 = obj.$table;
-      let $table2 = this.$refs['table-m2'];
 
       if (selectMulti) {
         let rows = this.checkRows;
@@ -82,28 +86,32 @@ tMixins = {
         this.checkRows.push(obj.row);
       }
 
-      if (obj.checked) {
+      let checkStrictly = $table1.$options.propsData?.checkboxConfig?.checkStrictly;
+      if(checkStrictly){
+        if (obj.checked) {
 
-        // let ay = $table1.getTableData().fullData;
-        // let aRows = this.findAllRows(ay);
-        let aRows = $table1.getTableData().visibleData;
+          // let ay = $table1.getTableData().fullData;
+          // let aRows = this.findAllRows(ay);
+          let aRows = $table1.getTableData().visibleData;
 
-        let cRows = $table1.getCheckboxRecords();
-        if (aRows.length == cRows.length) {
-          $table1.setAllCheckboxRow(true);
+          let cRows = $table1.getCheckboxRecords();
+          if (aRows.length == cRows.length) {
+            $table1.setAllCheckboxRow(true);
+          } else {
+            $table1.setAllCheckboxRow(false);
+          }
         } else {
           $table1.setAllCheckboxRow(false);
         }
-      } else {
-        $table1.setAllCheckboxRow(false);
       }
+
     },
     clearTable1Select(index) {
       let fieldKey = this.fieldKey;
       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;
@@ -114,7 +122,10 @@ tMixins = {
         $grid1.clearCheckboxRow();
       }
       this.checkRows.splice(index, 1);
-      if (row2) $grid1.setAllCheckboxRow(false);
+      let checkStrictly = $grid1.$options.propsData?.checkboxConfig?.checkStrictly;
+      if(checkStrictly){
+        if (row2) $grid1.setAllCheckboxRow(false);
+      }
     },
     checkAll(res) {
       let fieldKey = this.fieldKey;
@@ -154,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++) {
@@ -189,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) {
@@ -202,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"