cloud-web-corejs 1.0.54-dev.691 → 1.0.54-dev.693

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.691",
+  "version": "1.0.54-dev.693",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/api/user.js

@@ -119,6 +119,14 @@ export function getLoginConfig(option) {
   });
 }
 
+export function getLogicParamValue(option) {
+  return request({
+    url: USER_PREFIX + "/logic_param/getParamValue",
+    method: "post",
+    ...option,
+  });
+}
+
 export function getIdmLoginUrl(option) {
   return request({
     url: USER_PREFIX + "/auth/idmLoginUrl",

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

@@ -1,148 +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}`;
-}
+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}`;
+}