@openli1115/lowcode-edit-pro-table 1.0.59 → 1.0.61

package/es/components/ProCascaderSelect/index.js

@@ -1,17 +1,55 @@
 import _CascaderSelect from "@alifd/next/es/cascader-select";
 import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["screen_structure", "screen_structure_field", "screen_inner_id", "range_inner_table", "dataSource", "disableEdit", "readOnly", "disabled", "value", "onChange", "defaultValue"];
+function _createForOfIteratorHelperLoose(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (t) return (t = t.call(r)).next.bind(t); if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var o = 0; return function () { return o >= r.length ? { done: !0 } : { done: !1, value: r[o++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { resolveProScreenBinding } from "../utils";
 import { useProBoundValue } from "../../context/useProBoundValue";
 import { FORM_EMPTY_ARRAY } from "../../context/useComponentContext";
-var createElement = window.React.createElement;
+var _window$React = window.React,
+  createElement = _window$React.createElement,
+  useCallback = _window$React.useCallback;
+
+/**
+ * 按路径在树形 dataSource 上逐级匹配，取出每一层的 label（2 级、3 级…任意多级，长度由 pathValues 决定）。
+ */
+function resolvePathLabels(dataSource, pathValues) {
+  var labels = [];
+  if (!Array.isArray(dataSource) || pathValues.length === 0) return labels;
+  var level = dataSource;
+  var _loop = function _loop() {
+    var pv = _step.value;
+    var node = level.find(function (n) {
+      return String(n === null || n === void 0 ? void 0 : n.value) === String(pv);
+    });
+    if (!node) return 1; // break
+    labels.push(node.label != null ? String(node.label) : String(pv));
+    var next = node.children;
+    level = Array.isArray(next) ? next : [];
+  };
+  for (var _iterator = _createForOfIteratorHelperLoose(pathValues), _step; !(_step = _iterator()).done;) {
+    if (_loop()) break;
+  }
+  return labels;
+}
 function normalizeCascaderPath(v) {
-  if (Array.isArray(v)) return v.slice();
+  if (Array.isArray(v)) {
+    return v.filter(function (x) {
+      return x != null && x !== '';
+    }).map(function (x) {
+      return String(x);
+    });
+  }
+  if (typeof v === 'number' && !Number.isNaN(v)) {
+    /** 表单里有时是数字 id（2977），Fusion dataSource 已 string 化，需对齐 */
+    return [String(v)];
+  }
   if (typeof v === 'string' && v.trim()) {
     try {
       var parsed = JSON.parse(v);
-      return Array.isArray(parsed) ? parsed.slice() : [];
+      return Array.isArray(parsed) ? parsed.map(function (x) {
+        return String(x);
+      }) : [];
     } catch (_unused) {
       /** 历史或单值存成非 JSON 字符串时，当作单选叶子 value */
       return [v];
@@ -26,16 +64,26 @@ function normalizeCascaderPath(v) {
  */
 function cascaderChangeToPath(newValue, extra) {
   if (newValue == null) return [];
-  if (Array.isArray(newValue)) return newValue.slice();
+  /** 多选或已是完整路径数组时直接规范化（多级路径长度不限） */
+  if (Array.isArray(newValue)) {
+    return newValue.map(function (x) {
+      return x == null ? '' : String(x);
+    }).filter(function (x) {
+      return x !== '';
+    });
+  }
   var nodes = extra === null || extra === void 0 ? void 0 : extra.selectedPath;
   if (Array.isArray(nodes) && nodes.length > 0) {
     return nodes.map(function (n) {
-      return n != null && 'value' in n ? n.value : n;
+      if (n != null && typeof n === 'object' && 'value' in n) {
+        return String(n.value);
+      }
+      return n == null ? '' : String(n);
     }).filter(function (x) {
-      return x != null && x !== '';
+      return x !== '';
     });
   }
-  return [newValue];
+  return [String(newValue)];
 }
 var ProCascaderSelect = function ProCascaderSelect(props) {
   var screen_structure = props.screen_structure,
@@ -48,8 +96,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     disabledProp = props.disabled,
     _schemaValue = props.value,
     schemaOnChange = props.onChange,
-    defaultValue = props.defaultValue,
-    restProps = _objectWithoutPropertiesLoose(props, _excluded);
+    defaultValue = props.defaultValue;
   var _resolveProScreenBind = resolveProScreenBinding({
       screen_structure: screen_structure,
       screen_structure_field: screen_structure_field,
@@ -68,14 +115,31 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(next, structureName, structureField);
   };
   var displayValue = normalizeCascaderPath(value);
+
+  /**
+   * Fusion 单选 getSingleData 对数组 value 只会用 value[0] 查节点，输入框文案不完整。
+   * 表单存全路径 [省,市,区,...] 任意多级时，用 dataSource 拼「一级 / 二级 / …」。
+   */
+  var schemaDisplayRender = props.displayRender;
+  var pathDisplayRender = useCallback(function (labels, data) {
+    var fullLabels = resolvePathLabels(dataSource, normalizeCascaderPath(value));
+    if (fullLabels.length > 0) {
+      return fullLabels.join(' / ');
+    }
+    if (typeof schemaDisplayRender === 'function') {
+      return schemaDisplayRender(labels, data);
+    }
+    return (labels && labels.length ? labels.join(' / ') : '') || ((data === null || data === void 0 ? void 0 : data.label) != null ? String(data.label) : '');
+  }, [dataSource, value, schemaDisplayRender]);
   return /*#__PURE__*/React.createElement("span", {
     className: "field-wrapper " + (disableEdit ? 'disable-edit' : 'enable-edit')
-  }, /*#__PURE__*/React.createElement(_CascaderSelect, _extends({}, restProps, {
+  }, /*#__PURE__*/React.createElement(_CascaderSelect, _extends({}, props, {
     readOnly: disableEdit ? true : readOnlyProp,
     disabled: disabledProp,
     dataSource: dataSource,
     value: displayValue,
-    onChange: handleChange
+    onChange: handleChange,
+    displayRender: pathDisplayRender
   })));
 };
 export default ProCascaderSelect;

package/lib/components/ProCascaderSelect/index.js

@@ -5,18 +5,56 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _cascaderSelect = _interopRequireDefault(require("@alifd/next/lib/cascader-select"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _utils = require("../utils");
 var _useProBoundValue2 = require("../../context/useProBoundValue");
 var _useComponentContext = require("../../context/useComponentContext");
-var _excluded = ["screen_structure", "screen_structure_field", "screen_inner_id", "range_inner_table", "dataSource", "disableEdit", "readOnly", "disabled", "value", "onChange", "defaultValue"];
-var createElement = window.React.createElement;
+function _createForOfIteratorHelperLoose(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (t) return (t = t.call(r)).next.bind(t); if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var o = 0; return function () { return o >= r.length ? { done: !0 } : { done: !1, value: r[o++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+var _window$React = window.React,
+  createElement = _window$React.createElement,
+  useCallback = _window$React.useCallback;
+
+/**
+ * 按路径在树形 dataSource 上逐级匹配，取出每一层的 label（2 级、3 级…任意多级，长度由 pathValues 决定）。
+ */
+function resolvePathLabels(dataSource, pathValues) {
+  var labels = [];
+  if (!Array.isArray(dataSource) || pathValues.length === 0) return labels;
+  var level = dataSource;
+  var _loop = function _loop() {
+    var pv = _step.value;
+    var node = level.find(function (n) {
+      return String(n === null || n === void 0 ? void 0 : n.value) === String(pv);
+    });
+    if (!node) return 1; // break
+    labels.push(node.label != null ? String(node.label) : String(pv));
+    var next = node.children;
+    level = Array.isArray(next) ? next : [];
+  };
+  for (var _iterator = _createForOfIteratorHelperLoose(pathValues), _step; !(_step = _iterator()).done;) {
+    if (_loop()) break;
+  }
+  return labels;
+}
 function normalizeCascaderPath(v) {
-  if (Array.isArray(v)) return v.slice();
+  if (Array.isArray(v)) {
+    return v.filter(function (x) {
+      return x != null && x !== '';
+    }).map(function (x) {
+      return String(x);
+    });
+  }
+  if (typeof v === 'number' && !Number.isNaN(v)) {
+    /** 表单里有时是数字 id（2977），Fusion dataSource 已 string 化，需对齐 */
+    return [String(v)];
+  }
   if (typeof v === 'string' && v.trim()) {
     try {
       var parsed = JSON.parse(v);
-      return Array.isArray(parsed) ? parsed.slice() : [];
+      return Array.isArray(parsed) ? parsed.map(function (x) {
+        return String(x);
+      }) : [];
     } catch (_unused) {
       /** 历史或单值存成非 JSON 字符串时，当作单选叶子 value */
       return [v];
@@ -31,16 +69,26 @@ function normalizeCascaderPath(v) {
  */
 function cascaderChangeToPath(newValue, extra) {
   if (newValue == null) return [];
-  if (Array.isArray(newValue)) return newValue.slice();
+  /** 多选或已是完整路径数组时直接规范化（多级路径长度不限） */
+  if (Array.isArray(newValue)) {
+    return newValue.map(function (x) {
+      return x == null ? '' : String(x);
+    }).filter(function (x) {
+      return x !== '';
+    });
+  }
   var nodes = extra === null || extra === void 0 ? void 0 : extra.selectedPath;
   if (Array.isArray(nodes) && nodes.length > 0) {
     return nodes.map(function (n) {
-      return n != null && 'value' in n ? n.value : n;
+      if (n != null && typeof n === 'object' && 'value' in n) {
+        return String(n.value);
+      }
+      return n == null ? '' : String(n);
     }).filter(function (x) {
-      return x != null && x !== '';
+      return x !== '';
     });
   }
-  return [newValue];
+  return [String(newValue)];
 }
 var ProCascaderSelect = function ProCascaderSelect(props) {
   var screen_structure = props.screen_structure,
@@ -53,8 +101,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     disabledProp = props.disabled,
     _schemaValue = props.value,
     schemaOnChange = props.onChange,
-    defaultValue = props.defaultValue,
-    restProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
+    defaultValue = props.defaultValue;
   var _resolveProScreenBind = (0, _utils.resolveProScreenBinding)({
       screen_structure: screen_structure,
       screen_structure_field: screen_structure_field,
@@ -73,14 +120,31 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(next, structureName, structureField);
   };
   var displayValue = normalizeCascaderPath(value);
+
+  /**
+   * Fusion 单选 getSingleData 对数组 value 只会用 value[0] 查节点，输入框文案不完整。
+   * 表单存全路径 [省,市,区,...] 任意多级时，用 dataSource 拼「一级 / 二级 / …」。
+   */
+  var schemaDisplayRender = props.displayRender;
+  var pathDisplayRender = useCallback(function (labels, data) {
+    var fullLabels = resolvePathLabels(dataSource, normalizeCascaderPath(value));
+    if (fullLabels.length > 0) {
+      return fullLabels.join(' / ');
+    }
+    if (typeof schemaDisplayRender === 'function') {
+      return schemaDisplayRender(labels, data);
+    }
+    return (labels && labels.length ? labels.join(' / ') : '') || ((data === null || data === void 0 ? void 0 : data.label) != null ? String(data.label) : '');
+  }, [dataSource, value, schemaDisplayRender]);
   return /*#__PURE__*/React.createElement("span", {
     className: "field-wrapper " + (disableEdit ? 'disable-edit' : 'enable-edit')
-  }, /*#__PURE__*/React.createElement(_cascaderSelect["default"], (0, _extends2["default"])({}, restProps, {
+  }, /*#__PURE__*/React.createElement(_cascaderSelect["default"], (0, _extends2["default"])({}, props, {
     readOnly: disableEdit ? true : readOnlyProp,
     disabled: disabledProp,
     dataSource: dataSource,
     value: displayValue,
-    onChange: handleChange
+    onChange: handleChange,
+    displayRender: pathDisplayRender
   })));
 };
 var _default = exports["default"] = ProCascaderSelect;

package/lowcode_es/meta.js

@@ -101,7 +101,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = '@openli1115/lowcode-edit-pro-table';
   }
   if (version === void 0) {
-    version = '1.0.59';
+    version = '1.0.61';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/meta.js

@@ -106,7 +106,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = '@openli1115/lowcode-edit-pro-table';
   }
   if (version === void 0) {
-    version = '1.0.59';
+    version = '1.0.61';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openli1115/lowcode-edit-pro-table",
-  "version": "1.0.59",
+  "version": "1.0.61",
   "description": "@openli1115/lowcode-edit-pro-table",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -101,10 +101,10 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.59/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.61/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.59/build/index.html"
+  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.61/build/index.html"
 }