cloud-web-corejs 1.0.245 → 1.0.247

package/src/components/xform/utils/sfc-generator.js

@@ -389,12 +389,12 @@ export function buildFieldWidget(widget, formConfig) {
   let customLabelDom =
 `<template #label><span class="custom-label">${wop.labelIconPosition === 'front' ?
   (!!wop.labelTooltip ?
-      `<el-tooltip content="${wop.labelTooltip}" effect="light"><i class="${wop.labelIconClass}"></i></el-tooltip>${wop.label}` :
+      `<el-tooltip content="${wop.labelTooltip}" effect="light" popper-class="label-tooltip-pre-line"><i class="${wop.labelIconClass}"></i></el-tooltip>${wop.label}` :
       `<i class="${wop.labelIconClass}"></i>${wop.label}`
   )
   :
   (!!wop.labelTooltip ?
-      `${wop.label}<el-tooltip content="${wop.labelTooltip}" effect="light"><i class="${wop.labelIconClass}"></i></el-tooltip>` :
+      `${wop.label}<el-tooltip content="${wop.labelTooltip}" effect="light" popper-class="label-tooltip-pre-line"><i class="${wop.labelIconClass}"></i></el-tooltip>` :
       `${wop.label}<i class="${wop.labelIconClass}"></i>`
   )
 }

package/src/components/xform/utils/tableColumnHelper.js

@@ -0,0 +1,156 @@
+function buildColumnConfigMap(tableColumns, map = {}) {
+  if (!tableColumns || !tableColumns.length) {
+    return map;
+  }
+  tableColumns.forEach((col) => {
+    if (col.prop) {
+      map[col.prop] = col;
+    }
+    if (col.columnId) {
+      map[`__id__${col.columnId}`] = col;
+    }
+    if (col.children && col.children.length) {
+      buildColumnConfigMap(col.children, map);
+    }
+  });
+  return map;
+}
+
+function enrichColumnList(columns, configMap) {
+  if (!columns || !columns.length) {
+    return columns;
+  }
+  return columns.map((col) => {
+    const newCol = Object.assign({}, col);
+    if (col.slots) {
+      newCol.slots = Object.assign({}, col.slots);
+    }
+    const field = col.field;
+    const columnId = col.params && col.params.columnId;
+    const config =
+      (field && configMap[field]) ||
+      (columnId && configMap[`__id__${columnId}`]);
+    if (config) {
+      applyColumnLabelIcon(newCol, config);
+    }
+    if (col.children && col.children.length) {
+      newCol.children = enrichColumnList(col.children, configMap);
+    }
+    return newCol;
+  });
+}
+
+/**
+ * Apply data-table column header icon config to vxe-table column definition.
+ */
+export function resolveColumnRequiredFlag(columnConfig) {
+  if (!columnConfig) {
+    return false;
+  }
+  if (columnConfig.required) {
+    return true;
+  }
+  if (columnConfig.editWidget?.options?.required) {
+    return true;
+  }
+  if (columnConfig.widget?.options?.required) {
+    return true;
+  }
+  const widgetOptions =
+    columnConfig.widgetOptions ?? columnConfig.columnOption;
+  const editWidgetOptions =
+    columnConfig.editWidgetOptions ?? columnConfig.editColumnOption;
+  return !!(widgetOptions?.required || editWidgetOptions?.required);
+}
+
+function buildVxeTitlePrefixTooltip(tooltip) {
+  if (!tooltip) {
+    return {};
+  }
+  if (/\r?\n/.test(tooltip)) {
+    return {
+      content: tooltip
+        .replace(/&/g, "&")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/\r\n/g, "\n")
+        .replace(/\n/g, "<br/>"),
+      useHTML: true,
+    };
+  }
+  return { content: tooltip };
+}
+
+export function applyColumnLabelIcon(col, columnConfig) {
+  if (!col || !columnConfig) {
+    return col;
+  }
+
+  const iconClass = columnConfig.labelIconClass;
+  const position = columnConfig.labelIconPosition || "rear";
+  const tooltip = columnConfig.labelTooltip;
+  const required = resolveColumnRequiredFlag(columnConfig);
+  const title = col.title;
+  const displayIconClass = iconClass || (tooltip ? "el-icon-info" : null);
+
+  if (!displayIconClass && !required) {
+    return col;
+  }
+
+  const buildIcon = (h) => {
+    const icon = h("i", { class: ["vxe-cell-help-icon", displayIconClass] });
+    if (!tooltip) {
+      return icon;
+    }
+    return h(
+      "el-tooltip",
+      {
+        props: {
+          content: tooltip,
+          effect: "dark",
+          placement: "top",
+          popperClass: "label-tooltip-pre-line",
+        },
+      },
+      [icon]
+    );
+  };
+
+  if (displayIconClass && position === "front" && !required) {
+    col.titlePrefix = {
+      icon: displayIconClass,
+      ...buildVxeTitlePrefixTooltip(tooltip),
+    };
+    return col;
+  }
+
+  if (required && !displayIconClass) {
+    col.titlePrefix = { icon: "vxe-cell--required-icon" };
+    return col;
+  }
+
+  col.slots = col.slots || {};
+  delete col.titlePrefix;
+
+  col.slots.header = (params, h) => {
+    const nodes = [];
+    if (required) {
+      nodes.push(h("i", { class: "vxe-cell--required-icon" }));
+    }
+    if (displayIconClass && position === "front") {
+      nodes.push(buildIcon(h));
+    }
+    nodes.push(h("span", { class: "vxe-cell--title" }, title));
+    if (displayIconClass && position === "rear") {
+      nodes.push(buildIcon(h));
+    }
+    return nodes;
+  };
+
+  return col;
+}
+
+export function enrichTableColumnsWithLabelIcon(columns, tableColumns) {
+  const configMap = buildColumnConfigMap(tableColumns || []);
+  return enrichColumnList(columns, configMap);
+}

package/src/components/xform/utils/util.js

@@ -11,10 +11,100 @@ export function isNull(value) {
   return value === null || value === undefined;
 }
 
+export function isNilOrEmptyStr(value) {
+  return value === null || value === undefined || value === "";
+}
+
 export function isNotNull(value) {
   return value !== null && value !== undefined;
 }
 
+const ATTACHMENT_WIDGET_TYPES = ["vabUpload", "baseAttachment", "vabUpload2"];
+
+const PROJECT_TAG_WIDGET_TYPES = [
+  "project-tag",
+  "user-project-tag",
+  "saleOrg-project-tag",
+];
+
+const VABSEARCH_WIDGET_TYPES = ["vabsearch", "singerSearch", "multiSearch"];
+
+export function isAttachmentWidgetType(type) {
+  return ATTACHMENT_WIDGET_TYPES.includes(type);
+}
+
+export function isVabsearchWidgetType(type) {
+  return VABSEARCH_WIDGET_TYPES.includes(type);
+}
+
+export function isVabsearchMultiWidget(widget) {
+  if (!widget) {
+    return false;
+  }
+  const type = widget.type;
+  if (type === "multiSearch") {
+    return true;
+  }
+  if (!isVabsearchWidgetType(type)) {
+    return false;
+  }
+  const options = widget.options || {};
+  return !!(
+    options.multipleChoices || options.searchDialogConfig?.multipleChoices
+  );
+}
+
+/** 绑定值为数组的字段组件（含附件） */
+export function isArrayValueWidgetType(type, options = {}) {
+  if (isAttachmentWidgetType(type)) {
+    return true;
+  }
+  if (type === "checkbox") {
+    return true;
+  }
+  if (type === "select" && options.multiple) {
+    return true;
+  }
+  if (type === "time-range" || type === "date-range") {
+    return true;
+  }
+  if (type === "date" && options.type === "dates") {
+    return true;
+  }
+  if (PROJECT_TAG_WIDGET_TYPES.includes(type)) {
+    return true;
+  }
+  if (type === "multiSearch") {
+    return true;
+  }
+  if (
+    type === "vabsearch" &&
+    (options.multipleChoices || options.searchDialogConfig?.multipleChoices)
+  ) {
+    return true;
+  }
+  return false;
+}
+
+/** 数组类字段值是否为空（用于必填校验） */
+export function isEmptyArrayFieldValue(value, type, options = {}) {
+  if (value === null || value === undefined) {
+    return true;
+  }
+  if (type === "time-range" || type === "date-range") {
+    if (!Array.isArray(value) || value.length === 0) {
+      return true;
+    }
+    return value.every(
+      (item) => item === null || item === undefined || item === ""
+    );
+  }
+  if (!Array.isArray(value)) {
+    return true;
+  }
+  return value.length === 0;
+}
+
 export function isEmptyStr(str) {
   //return (str === undefined) || (!str) || (!/[^\s]/.test(str));
   return (
@@ -34,7 +124,7 @@ export const createUUID = function () {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
     .replace(/[xy]/g, function (c) {
       var r = (Math.random() * 16) | 0,
-        v = c == "x" ? r : (r & 0x3) | 0x8;
+        v = c === "x" ? r : (r & 0x3) | 0x8;
       return v.toString(16);
     })
     .replaceAll("-", "");
@@ -303,7 +393,7 @@ export function traverseAllWidgetsNew(widgetList, callback) {
   loopHandleWidget(widgetList, (widget, parentWidget) => {
     if (callback) {
       callback(widget, parentWidget);
-      if (widget.type == "data-table") {
+      if (widget.type === "data-table") {
         for (let item of widget.options.tableColumns) {
           columnLoopDo(item, parentWidget);
         }
@@ -696,8 +786,59 @@ export const columnFormatMap = {
   radio: "radio",
   dropdown: "dropdown",
   textarea: "textarea",
+  editScriptInput: "script-input",
 };
 
+/** 列 widget 扩展选项：动态列 widgetOptions；设计器静态列 columnOption */
+export function getColumnWidgetOptions(row, isEdit = false) {
+  if (!row) {
+    return undefined;
+  }
+  if (isEdit) {
+    return row.editWidgetOptions ?? row.editColumnOption;
+  }
+  return row.widgetOptions ?? row.columnOption;
+}
+
+/** 将列级 label / keyName / required 同步到列内 field widget（动态列 label 在列顶层） */
+export function applyColumnMetaToFieldWidget(fieldWidget, row, isEdit = false) {
+  if (!fieldWidget || !row) {
+    return fieldWidget;
+  }
+  const widgetOptions = getColumnWidgetOptions(row, isEdit);
+  if (fieldWidget.options.hasOwnProperty("required")) {
+    fieldWidget.options.required = !!(row.required || widgetOptions?.required);
+  }
+  if (!fieldWidget.options.label && row.label) {
+    fieldWidget.options.label = row.label;
+  }
+  if (row.prop) {
+    if (fieldWidget.options.hasOwnProperty("keyName")) {
+      fieldWidget.options.keyName = row.prop;
+      fieldWidget.options.keyNameEnabled = true;
+    } else if (!fieldWidget.options.name) {
+      fieldWidget.options.name = row.prop;
+    }
+  }
+  if (fieldWidget.type !== "button" && fieldWidget.type !== "a-link") {
+    fieldWidget.options.labelHidden = true;
+  }
+  return fieldWidget;
+}
+
+/** 同步列 widget / editWidget 的列级元数据（含 labelHidden） */
+export function applyColumnMetaToColumnRow(row) {
+  if (!row) {
+    return;
+  }
+  if (row.widget) {
+    applyColumnMetaToFieldWidget(row.widget, row, false);
+  }
+  if (row.editWidget) {
+    applyColumnMetaToFieldWidget(row.editWidget, row, true);
+  }
+}
+
 export function getFieldWidgetById(widgetList, fieldId, staticWidgetsIncluded) {
   if (!widgetList) {
     return null;
@@ -707,7 +848,7 @@ export function getFieldWidgetById(widgetList, fieldId, staticWidgetsIncluded) {
   let handlerFn = (widget) => {
     if (widget.id === fieldId) {
       foundWidget = widget;
-    } else if (widget.type == "data-table") {
+    } else if (widget.type === "data-table") {
       for (let column of widget.options.tableColumns) {
         if (column?.widget?.id + "" === fieldId) {
           foundWidget = column.widget;
@@ -788,7 +929,7 @@ export function getQueryParam(variable) {
   let vars = query.split("&");
   for (let i = 0; i < vars.length; i++) {
     let pair = vars[i].split("=");
-    if (pair[0] == variable) {
+    if (pair[0] === variable) {
       return pair[1];
     }
   }
@@ -865,6 +1006,13 @@ export function getDefaultFormConfig() {
     otherTabList: [],
     customListTabLabel: null,
     globalConfig: null,
+    // 表单级动态字段规则：按本地规则/后台脚本动态控制整个表单内任意字段/容器的显隐/必填/只读/禁用/取值
+    dynamicFieldEnabled: false,
+    dynamicFieldSourceType: "local",
+    dynamicFieldRules: [],
+    dynamicFieldScriptCode: null,
+    dynamicFieldScriptParam: null,
+    dynamicFieldTriggerFields: [],
   };
 }
 
@@ -933,20 +1081,6 @@ export function assembleAxiosConfig(arrayObj, DSV, VFR) {
     });
   }
   return result;
-
-  /* return !arrayObj || arrayObj.length <= 0 || (arrayObj.map((function(ai) {
-         "String" === ai.type ? result[ai.name] = String(ai.value)
-         : "Number" === ai.type ? result[ai
-             .name] = Number(ai.value)
-         : "Boolean" === ai.type ? "false" === ai.value
-           .toLowerCase() || "0" === ai.value ? result[ai.name] = !1 : "true" === ai.value.toLowerCase() ||
-           "1" === ai.value ? result[ai.name] = !0 : result[ai.name] = null
-         : "Variable" === ai.type ? (result[ai.name] = eval(ai.value))
-         : "FormData" === ai.type &&  (result[ai.name] = VFR.formData[ai.value])
-       })),
-       console.log("test DSV: ", DSV),
-       console.log("test VFR: ", VFR)),
-     result */
 }
 
 export function buildRequestConfig(dataSource, DSV, VFR, isSandbox) {
@@ -969,25 +1103,9 @@ export function buildRequestConfig(dataSource, DSV, VFR, isSandbox) {
   let doms = VFR.getWidgetRef(DSV.widgetName);
   let extraAccessData = doms.extraAccessData || {};
 
-  /* if(dataSource.requestaccessType == "SQL"){
-    data.conditions = conditions;
-    Object.assign(data.conditions,extraAccessData);
-  }else{
-    data = conditions;
-    Object.assign(data,extraAccessData);
-  } */
-
   data.accessCode = requestAccess.accessCode;
   data.conditions = conditions;
   Object.assign(data.conditions, extraAccessData);
-  /*
-  if(requestAccess.accessReturnType === 0){
-    data.conditions = conditions;
-    Object.assign(data.conditions,extraAccessData);
-  }else{
-    data = conditions;
-    Object.assign(data,extraAccessData);
-  } */
 
   config.data = data;
   var chFn = new Function(
@@ -1024,13 +1142,6 @@ export function _runDataSourceRequest() {
         t.errorHandlerCode
       ));
 
-    /*
-     axios.request(l).then(() => {
-     	r.call(null, s, o, i, n)
-     }).catch((error) => {
-     	d.call(null, error, o, i, a, n)
-     }) */
-
     return new Promise((resolve, reject) => {
       request({
         ...l,
@@ -1043,44 +1154,8 @@ export function _runDataSourceRequest() {
         },
       });
     });
-
-    /* return s = e.sent,
-    r = new Function("result","isSandbox","DSV","VFR",t.dataHandlerCode),
-    e.abrupt("return", r.call(null, s, o, i, n));
-
-    d = new Function("error","isSandbox","DSV","$message","VFR",t.errorHandlerCode),
-    d.call(null, null, o, i, a, n), */
   };
   return _runDataSourceRequestN.apply(this, arguments);
-  /* return _runDataSourceRequest = Object(D_dev2021_variant_form_pro_node_modules_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_0__["a"])(regeneratorRuntime.mark((function e(t, i, n, o, a) {
-      var l, s, r, d;
-      return regeneratorRuntime.wrap((function(e) {
-          while (1)
-              switch (e.prev = e.next) {
-              case 0:
-                  return e.prev = 0,
-                  l = buildRequestConfig(t, i, n, o),
-                  e.next = 4,
-                  axios__WEBPACK_IMPORTED_MODULE_11___default.a.request(l);
-              case 4:
-                  return s = e.sent,
-                  r = new Function("result","isSandbox","DSV","VFR",t.dataHandlerCode),
-                  e.abrupt("return", r.call(null, s, o, i, n));
-              case 9:
-                  e.prev = 9,
-                  e.t0 = e["catch"](0),
-                  d = new Function("error","isSandbox","DSV","$message","VFR",t.errorHandlerCode),
-                  d.call(null, e.t0, o, i, a, n),
-                  console.error(e.t0);
-              case 14:
-              case "end":
-                  return e.stop()
-              }
-      }
-      ), e, null, [[0, 9]])
-  }
-  ))),
-  _runDataSourceRequest.apply(this, arguments) */
 }
 
 export function getDSByName(e, t) {