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

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

@@ -0,0 +1,148 @@
+import {
+  isEmptyStr,
+  isEmptyArrayFieldValue,
+  isArrayValueWidgetType,
+  isVabsearchWidgetType,
+  isVabsearchMultiWidget,
+} from "./util";
+import { resolveColumnRequiredFlag } from "./tableColumnHelper";
+
+/** 数据表格行内字段候选 key（column.prop 为权威存储字段） */
+export function getCellFieldKeys(fieldWidget, columnConfig) {
+  const keys = [];
+  const addKey = (key) => {
+    if (key && !keys.includes(key)) {
+      keys.push(key);
+    }
+  };
+
+  addKey(columnConfig?.prop);
+
+  if (!fieldWidget) {
+    return keys;
+  }
+
+  const options = fieldWidget.options || {};
+  if (
+    isVabsearchWidgetType(fieldWidget.type) &&
+    !isVabsearchMultiWidget(fieldWidget)
+  ) {
+    addKey(options.vabSearchName);
+    addKey(getWidgetFieldKey(fieldWidget));
+  } else {
+    addKey(getWidgetFieldKey(fieldWidget));
+  }
+
+  return keys;
+}
+
+export function getCellFieldKey(fieldWidget, columnConfig) {
+  const keys = getCellFieldKeys(fieldWidget, columnConfig);
+  return keys.length ? keys[0] : null;
+}
+
+export function getWidgetFieldKey(widget) {
+  if (!widget?.options) {
+    return null;
+  }
+  const o = widget.options.name;
+  return (widget.options.keyNameEnabled && widget.options.keyName) || o;
+}
+
+export function isCellFieldRequired(columnConfig, fieldWidget) {
+  if (!fieldWidget || fieldWidget.options?.hidden) {
+    return false;
+  }
+  if (fieldWidget.options?.required) {
+    return true;
+  }
+  return resolveColumnRequiredFlag(columnConfig);
+}
+
+export function shouldSkipCellValidation(fieldWidget) {
+  if (!fieldWidget) {
+    return true;
+  }
+  if (fieldWidget.options?.hidden) {
+    return true;
+  }
+  if (fieldWidget.options?.disabled) {
+    return true;
+  }
+  return false;
+}
+
+export function isEmptyCellValue(fieldWidget, value) {
+  if (!fieldWidget) {
+    return false;
+  }
+  const type = fieldWidget.type;
+  const options = fieldWidget.options || {};
+
+  if (type === "number") {
+    return value === null || value === undefined || value === "";
+  }
+
+  if (isArrayValueWidgetType(type, options)) {
+    return isEmptyArrayFieldValue(value, type, options);
+  }
+
+  if (type === "select" || type === "radio" || type === "status") {
+    if (value === null || value === undefined || value === "") {
+      return true;
+    }
+    if (typeof value === "string" && !/[^\s]/.test(value)) {
+      return true;
+    }
+    return false;
+  }
+
+  return isEmptyStr(value);
+}
+
+/** 从行数据中读取单元格值（兼容 column.prop 与 widget 字段名不一致） */
+export function getCellValueFromRow(row, fieldWidget, columnConfig) {
+  if (!row) {
+    return undefined;
+  }
+  const keys = getCellFieldKeys(fieldWidget, columnConfig);
+  if (!keys.length) {
+    return undefined;
+  }
+  let fallbackValue;
+  for (const key of keys) {
+    const value = row[key];
+    if (fallbackValue === undefined) {
+      fallbackValue = value;
+    }
+    if (!isEmptyCellValue(fieldWidget, value)) {
+      return value;
+    }
+  }
+  return fallbackValue;
+}
+
+export function isEmptyCellValueInRow(row, fieldWidget, columnConfig) {
+  return isEmptyCellValue(
+    fieldWidget,
+    getCellValueFromRow(row, fieldWidget, columnConfig)
+  );
+}
+
+export function buildCellRequiredHint(fieldWidget, columnConfig, t1Fn) {
+  const options = fieldWidget?.options || {};
+  if (options.requiredHint) {
+    return t1Fn(options.requiredHint);
+  }
+  const label = t1Fn(
+    options.label || columnConfig?.label || columnConfig?.prop || ""
+  );
+  return t1Fn("[{label}]不能为空", { label });
+}
+
+export function buildTableCellFormProp(tableFieldKeyName, rowIndex, fieldKey) {
+  if (!tableFieldKeyName || !fieldKey || rowIndex < 0) {
+    return null;
+  }
+  return `${tableFieldKeyName}.${rowIndex}.${fieldKey}`;
+}

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

@@ -43,6 +43,26 @@ function enrichColumnList(columns, configMap) {
 /**
  * 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);
+}
+
 export function applyColumnLabelIcon(col, columnConfig) {
   if (!col || !columnConfig) {
     return col;
@@ -51,7 +71,7 @@ export function applyColumnLabelIcon(col, columnConfig) {
   const iconClass = columnConfig.labelIconClass;
   const position = columnConfig.labelIconPosition || "rear";
   const tooltip = columnConfig.labelTooltip;
-  const required = !!columnConfig.required;
+  const required = resolveColumnRequiredFlag(columnConfig);
   const title = col.title;
 
   if (!iconClass && !required) {

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

@@ -19,6 +19,92 @@ 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 (
@@ -700,6 +786,7 @@ export const columnFormatMap = {
   radio: "radio",
   dropdown: "dropdown",
   textarea: "textarea",
+  editScriptInput: "script-input",
 };
 
 /** 列 widget 扩展选项：动态列 widgetOptions；设计器静态列 columnOption */
@@ -713,6 +800,45 @@ export function getColumnWidgetOptions(row, isEdit = false) {
   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;