cloud-web-corejs 1.0.54-dev.688 → 1.0.54-dev.689

package/src/components/xform/form-render/container-item/dynamicFieldMixin.js

@@ -1,4 +1,10 @@
 import { generateId } from "../../../../components/xform/utils/util";
+import {
+  buildDynamicSchemaRequestData,
+  getDynamicSchemaOption,
+  normalizeDynamicFieldKey,
+  resolveDynamicSchemaResponse,
+} from "../../utils/dynamicSchemaUtil";
 
 /**
  * 表格布局容器(table/h5-table)专用混入。
@@ -75,20 +81,21 @@ const dynamicFieldMixin = {
       if (
         this.designState
         || !options.dynamicSchemaEnabled
-        || !options.dynamicSchemaScriptCode
+        || !getDynamicSchemaOption(options, "scriptCode")
         || !this.supportsRowLayout()
       ) {
         return Promise.resolve();
       }
-      const extra = this.handleCustomEvent(options.dynamicSchemaScriptParam) || {};
+      const requestData = buildDynamicSchemaRequestData(
+        this.formModel,
+        getDynamicSchemaOption(options, "scriptParam"),
+        this.handleCustomEvent.bind(this)
+      );
       return new Promise((resolve) => {
         this.formHttp({
-          scriptCode: options.dynamicSchemaScriptCode,
+          scriptCode: getDynamicSchemaOption(options, "scriptCode"),
           isLoading: false,
-          data: {
-            formData: this.formModel,
-            ...extra,
-          },
+          data: requestData,
           success: (res) => {
             const defs = this.resolveSchemaDefs(res);
             this.buildDynamicRows(defs);
@@ -101,30 +108,11 @@ const dynamicFieldMixin = {
     },
 
     resolveSchemaDefs(res) {
-      const options = this.widget.options;
-      let defs = [];
-      if (options.dynamicSchemaConvert) {
-        const result = this.handleCustomEvent(
-          options.dynamicSchemaConvert,
-          ["res"],
-          [res]
-        );
-        if (Array.isArray(result)) {
-          defs = result;
-        } else if (result && Array.isArray(result.fields)) {
-          defs = result.fields;
-        }
-      } else {
-        const objx = res && res.objx;
-        if (Array.isArray(objx)) {
-          defs = objx;
-        } else if (objx && Array.isArray(objx.fields)) {
-          defs = objx.fields;
-        } else if (objx && Array.isArray(objx.columns)) {
-          defs = objx.columns;
-        }
-      }
-      return defs || [];
+      return resolveDynamicSchemaResponse(
+        res,
+        getDynamicSchemaOption(this.widget.options, "convert"),
+        this.handleCustomEvent.bind(this)
+      );
     },
 
     buildDynamicRows(defs) {
@@ -269,13 +257,18 @@ const dynamicFieldMixin = {
       const type = def.type || "input";
       const template = formRef.getFieldWidgetByType(type);
       if (!template) return null;
-      const key = def.keyName || def.field || def.name;
+      const key = normalizeDynamicFieldKey(def);
       if (!key) return null;
       const widget = formRef.copyNewFieldWidget(template);
       widget.options.name = key;
       widget.options.keyName = key;
       widget.options.keyNameEnabled = true;
       if (def.label !== undefined) widget.options.label = def.label;
+      if (def.options && typeof def.options === "object") {
+        Object.keys(def.options).forEach((k) => {
+          widget.options[k] = def.options[k];
+        });
+      }
       if (def.required !== undefined) widget.options.required = !!def.required;
       if (def.readonly !== undefined) widget.options.readonly = !!def.readonly;
       if (def.disabled !== undefined) widget.options.disabled = !!def.disabled;
@@ -289,11 +282,6 @@ const dynamicFieldMixin = {
       if (Array.isArray(def.optionItems) && "optionItems" in widget.options) {
         widget.options.optionItems = def.optionItems;
       }
-      if (def.options && typeof def.options === "object") {
-        Object.keys(def.options).forEach((k) => {
-          widget.options[k] = def.options[k];
-        });
-      }
       if (def.tableField !== undefined) {
         widget.tableField = def.tableField;
       } else if (

package/src/components/xform/form-render/container-item/list-h5-item.vue

@@ -746,6 +746,7 @@ import {
   assembleAxiosConfig,
   generateId,
   getReportGlobalMap,
+  isVabsearchMultiWidget,
 } from "../../../../components/xform/utils/util";
 import * as formatUtil from "../../../../components/xform/utils/format";
 import { extendDeeply } from "../../../../utils/index.js";
@@ -1601,7 +1602,10 @@ export default {
           obj.rowIndex +
           "." +
           obj.column.field;
-        if (this.isVabsearchFlagWidget(widget)) {
+        if (
+          this.isVabsearchFlagWidget(widget) &&
+          !isVabsearchMultiWidget(widget)
+        ) {
           let vabSearchName = obj.column.params.widget.options.vabSearchName;
           propName =
             this.getFieldKeyName(widget) +

package/src/components/xform/form-render/indexMixin.js

@@ -23,6 +23,10 @@ import {
   traverseAllWidgetsNew,
   columnFormatMap,
   getColumnWidgetOptions,
+  applyColumnMetaToFieldWidget,
+  applyColumnMetaToColumnRow,
+  isArrayValueWidgetType,
+  isEmptyArrayFieldValue,
 } from "../../../components/xform/utils/util";
 import {
   containers,
@@ -583,6 +587,8 @@ modules = {
             if (!t.widget) {
               let fieldWidget = this.getColumnWidget(t, false);
               t.widget = fieldWidget;
+            } else {
+              applyColumnMetaToFieldWidget(t.widget, t, false);
             }
             if (t.widget) t.widget.columnType = t.formatS;
           }
@@ -591,6 +597,8 @@ modules = {
             if (!t.editWidget) {
               let fieldWidget = this.getColumnWidget(t, true);
               t.editWidget = fieldWidget;
+            } else {
+              applyColumnMetaToFieldWidget(t.editWidget, t, true);
             }
             if (t.editWidget) t.editWidget.columnType = t.editFormatS;
           }
@@ -653,6 +661,44 @@ modules = {
 
       this.wfModifyEnabled = hasModifyItem;
     },
+    hanldeCommonWidgetForTableColumns(tableColumns) {
+      if (!tableColumns || !tableColumns.length) return;
+      let wfParam = this.wfParam || {};
+      let wfInfo = wfParam?.wfInfo || {};
+      let taskDefinitionKey = wfInfo?.taskDefinitionKey || wfInfo?.nodeCode;
+      let toModify = wfInfo?.toModify || false;
+      let widgetEditOnWf = this.widgetEditOnWf;
+      if (widgetEditOnWf === undefined) {
+        widgetEditOnWf = this.hanldeWfWidgetNew0();
+        this.widgetEditOnWf = widgetEditOnWf;
+      }
+
+      const processWidget = (widget) => {
+        if (!widget) return;
+        this.handleWidgetShowRule(widget);
+        if (!wfParam.hasWf || widgetEditOnWf) return;
+        this.hanldeWfWidgetNew1(widget);
+        if (wfInfo.taskStep === "9999") {
+          this.hanldeWfWidgetItemNew(widget);
+        } else if (toModify && taskDefinitionKey) {
+          this.hanldeWfWidgetItemNew(widget);
+        }
+      };
+
+      const columnLoopDo = (column) => {
+        if (column.children && column.children.length) {
+          column.children.forEach(columnLoopDo);
+          return;
+        }
+        processWidget(column.widget);
+        processWidget(column.editWidget);
+        if (column.widgetList && column.widgetList.length) {
+          traverseAllWidgetsNew(column.widgetList, processWidget);
+        }
+      };
+
+      tableColumns.forEach(columnLoopDo);
+    },
     getIsSaveAtWfAgree() {
       //流程通过的时候是否可以执行保存
       let wfParam = this.wfParam || {};
@@ -1830,9 +1876,16 @@ modules = {
         });
       return (
         this.$refs["renderForm"].validate(function (t) {
-          t
-            ? i(e.formDataModel)
-            : i(e.formDataModel, e.i18nt("render.hint.validationFailed"));
+          if (t) {
+            const extraError = e.runExtraFormValidations();
+            if (extraError) {
+              i(e.formDataModel, extraError);
+              return;
+            }
+            i(e.formDataModel);
+          } else {
+            i(e.formDataModel, e.i18nt("render.hint.validationFailed"));
+          }
         }),
         n
       );
@@ -1945,8 +1998,22 @@ modules = {
       this.$refs.renderForm.clearValidate(e);
     },
     validateForm: function (e) {
-      this.$refs["renderForm"].$baseValidate(function (t) {
-        e(t);
+      this.$refs["renderForm"].$baseValidate((valid) => {
+        if (!valid) {
+          e(valid);
+          return;
+        }
+        const extraError = this.runExtraFormValidations();
+        if (extraError) {
+          this.$message({
+            message: extraError,
+            type: "error",
+            duration: 2000,
+          });
+          e(false);
+          return;
+        }
+        e(true);
       });
     },
     validateFields: function () {},
@@ -2180,6 +2247,87 @@ modules = {
       let o = widget.options.name;
       return (widget.options.keyNameEnabled && widget.options.keyName) || o;
     },
+    validateDataTableDatasetRequired() {
+      let error = null;
+      const refList = this.widgetRefList || {};
+      Object.keys(refList).forEach((name) => {
+        if (error) {
+          return;
+        }
+        const ref = refList[name];
+        if (ref && typeof ref.validateDatasetRequired === "function") {
+          error = ref.validateDatasetRequired();
+        }
+      });
+      return error;
+    },
+    validateDataTableCellsRequired() {
+      let error = null;
+      const refList = this.widgetRefList || {};
+      Object.keys(refList).forEach((name) => {
+        if (error) {
+          return;
+        }
+        const ref = refList[name];
+        if (ref && typeof ref.validateCellsRequired === "function") {
+          error = ref.validateCellsRequired();
+        }
+      });
+      return error;
+    },
+    validateArrayValueFieldsRequired() {
+      let error = null;
+      const refList = this.widgetRefList || {};
+      const renderForm = this.$refs.renderForm;
+      Object.keys(refList).forEach((name) => {
+        if (error) {
+          return;
+        }
+        const ref = refList[name];
+        if (!ref || ref.designState || !ref.field) {
+          return;
+        }
+        const field = ref.field;
+        if (
+          !field.formItemFlag ||
+          field.options.hidden ||
+          !field.options.required
+        ) {
+          return;
+        }
+        if (!isArrayValueWidgetType(field.type, field.options)) {
+          return;
+        }
+        const actualValue =
+          typeof ref.getCurrentValue === "function"
+            ? ref.getCurrentValue()
+            : undefined;
+        if (
+          isEmptyArrayFieldValue(actualValue, field.type, field.options)
+        ) {
+          error = ref.getRequiredHintMsg
+            ? ref.getRequiredHintMsg()
+            : this.$t2("必填项不能为空", "system.message.required");
+          const prop =
+            typeof ref.getPropName === "function" ? ref.getPropName() : null;
+          if (prop && renderForm) {
+            renderForm.validateField(prop, () => {});
+          }
+        }
+      });
+      return error;
+    },
+    runExtraFormValidations() {
+      const arrayError = this.validateArrayValueFieldsRequired();
+      if (arrayError) {
+        return arrayError;
+      }
+      const cellsError = this.validateDataTableCellsRequired();
+      if (cellsError) {
+        return cellsError;
+      }
+      return this.validateDataTableDatasetRequired();
+    },
     isVabsearchFlagWidget(widget) {
       let type = widget?.type;
       return (
@@ -2757,6 +2905,7 @@ modules = {
       if (!type) return null;
       if (isEdit) {
         if (row.editWidget) {
+          applyColumnMetaToFieldWidget(row.editWidget, row, true);
           return row.editWidget;
         }
         const editWidgetOptions = getColumnWidgetOptions(row, true);
@@ -2765,10 +2914,12 @@ modules = {
             this.getFieldWidgetByType(type)
           );
           fieldWidget.options = editWidgetOptions;
+          applyColumnMetaToFieldWidget(fieldWidget, row, true);
           return fieldWidget;
         }
       } else {
         if (row.widget) {
+          applyColumnMetaToFieldWidget(row.widget, row, false);
           return row.widget;
         }
         const widgetOptions = getColumnWidgetOptions(row);
@@ -2777,6 +2928,7 @@ modules = {
             this.getFieldWidgetByType(type)
           );
           fieldWidget.options = widgetOptions;
+          applyColumnMetaToFieldWidget(fieldWidget, row, false);
           return fieldWidget;
         }
       }
@@ -2794,7 +2946,12 @@ modules = {
         );
 
         if (columnSelectedWidget.options.hasOwnProperty("required")) {
-          columnSelectedWidget.options.required = row.required || false;
+          const widgetOptions = isEdit
+            ? getColumnWidgetOptions(row, true)
+            : getColumnWidgetOptions(row);
+          columnSelectedWidget.options.required = !!(
+            row.required || widgetOptions?.required
+          );
         }
 
         if ("editDelete" === formatS) {
@@ -2885,6 +3042,18 @@ modules = {
     validate(callback) {
       this.$refs["renderForm"].$baseValidate(
         (valid, obj) => {
+          if (valid) {
+            const extraError = this.runExtraFormValidations();
+            if (extraError) {
+              this.$message({
+                message: extraError,
+                type: "error",
+                duration: 2000,
+              });
+              callback && callback(false);
+              return;
+            }
+          }
           if (!valid) {
             let message = null;
             let keys = Object.keys(obj);

package/src/components/xform/lang/en-US.js

@@ -34,6 +34,7 @@ export default {
           "vf-drawer": "Drawer",
           input: "Input",
           textarea: "Textarea",
+          "script-input": "Script Input",
           number: "InputNumber",
           radio: "Radio",
           checkbox: "Checkbox",

package/src/components/xform/lang/zh-CN.js

@@ -39,6 +39,7 @@ export default {
       input: "单行输入",
       "input-batch": "批量输入",
       textarea: "多行输入",
+      "script-input": "脚本输入框",
       number: "计数器",
       radio: "单选项",
       checkbox: "多选项",