cloud-web-corejs 1.0.54-dev.78 → 1.0.54-dev.781

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/smart-vue-i18n/index.js

@@ -1,5 +1,6 @@
 import {deepAssign, get} from './utils'
-import {extendDeeply} from "../../../../utils/index.js";
+import xeUtils from "xe-utils";
+import {extendDeeply} from "@base/utils/index.js";
 
 
 const install = (Vue, options) => {

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

@@ -0,0 +1,155 @@
+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;
+
+  if (!iconClass && !required) {
+    return col;
+  }
+
+  const buildIcon = (h) => {
+    const icon = h("i", { class: ["vxe-cell-help-icon", iconClass] });
+    if (!tooltip) {
+      return icon;
+    }
+    return h(
+      "el-tooltip",
+      {
+        props: {
+          content: tooltip,
+          effect: "dark",
+          placement: "top",
+          popperClass: "label-tooltip-pre-line",
+        },
+      },
+      [icon]
+    );
+  };
+
+  if (iconClass && position === "front" && !required) {
+    col.titlePrefix = {
+      icon: iconClass,
+      ...buildVxeTitlePrefixTooltip(tooltip),
+    };
+    return col;
+  }
+
+  if (required && !iconClass) {
+    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 (iconClass && position === "front") {
+      nodes.push(buildIcon(h));
+    }
+    nodes.push(h("span", { class: "vxe-cell--title" }, title));
+    if (iconClass && position === "rear") {
+      nodes.push(buildIcon(h));
+    }
+    return nodes;
+  };
+
+  return col;
+}
+
+export function enrichTableColumnsWithLabelIcon(columns, tableColumns) {
+  const configMap = buildColumnConfigMap(tableColumns || []);
+  return enrichColumnList(columns, configMap);
+}