@openli1115/lowcode-edit-pro-table 1.0.60 → 1.0.62

package/es/components/ProCascaderSelect/index.js

@@ -1,11 +1,38 @@
 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,
+  useMemo = _window$React.useMemo;
+
+/**
+ * 按路径在树形 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.filter(function (x) {
@@ -38,7 +65,14 @@ 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) {
@@ -64,7 +98,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     _schemaValue = props.value,
     schemaOnChange = props.onChange,
     defaultValue = props.defaultValue,
-    restProps = _objectWithoutPropertiesLoose(props, _excluded);
+    multiple = props.multiple;
   var _resolveProScreenBind = resolveProScreenBinding({
       screen_structure: screen_structure,
       screen_structure_field: screen_structure_field,
@@ -82,15 +116,46 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     commit(next);
     schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(next, structureName, structureField);
   };
+
+  /** 表单/接口：完整路径 string[]，如 ['2974','2975'] */
   var displayValue = normalizeCascaderPath(value);
+
+  /**
+   * Fusion 单选：官方约定受控 value 为 string[] | number[]，且实现里只对数组取 value[0] 再查节点。
+   * 若传入完整路径 [父,子]，会把「父」当成选中项，文案只有一级。
+   * 组件展示应传「叶子」单元素数组 [leaf]，内部 getLabelPath(叶子节点) 会生成多级展示。
+   * 多选仍传 Fusion 所需的多个 value（与表单存值一致）。
+   */
+  var valueForFusion = useMemo(function () {
+    var path = displayValue;
+    if (multiple) {
+      return path;
+    }
+    if (path.length === 0) return [];
+    return [path[path.length - 1]];
+  }, [displayValue, multiple]);
+
+  /** 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({}, props, {
     readOnly: disableEdit ? true : readOnlyProp,
     disabled: disabledProp,
     dataSource: dataSource,
-    value: displayValue,
-    onChange: handleChange
+    value: valueForFusion,
+    onChange: handleChange,
+    displayRender: pathDisplayRender
   })));
 };
 export default ProCascaderSelect;

package/es/context/FormProvider.js

@@ -42,15 +42,25 @@ export var FormProvider = function FormProvider(_ref) {
     values = _useState[0],
     setValues = _useState[1];
 
-  // 仅当 initialValues 引用变化时更新状态
+  /**
+   * store 每次 dispatch 都会给新的 screenStructures 引用；若内容与表单 state 实际一致仍 setValues，
+   * 会整页重渲染（含 EditProTable 几十行），Fusion Overlay/Select 在 componentDidUpdate 里反复 setPosition，
+   * 易触发 React #185（Maximum update depth exceeded），Windows 上更明显。
+   */
   useEffect(function () {
-    if (!isEqual(initialValues, initialValuesRef.current)) {
-      console.log('[FormProvider] 🔄 useEffect triggered - initialValues:', initialValues);
+    if (isEqual(initialValues, initialValuesRef.current)) {
       initialValuesRef.current = initialValues;
-      setValues(function (prev) {
-        return _extends({}, prev, initialValues);
-      });
+      return;
     }
+    console.log('[FormProvider] 🔄 useEffect triggered - initialValues:', initialValues);
+    initialValuesRef.current = initialValues;
+    setValues(function (prev) {
+      var merged = _extends({}, prev, initialValues);
+      if (isEqual(prev, merged)) {
+        return prev;
+      }
+      return merged;
+    });
   }, [initialValues]);
 
   // 优化 setFieldValue

package/lib/components/ProCascaderSelect/index.js

@@ -5,12 +5,39 @@ 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,
+  useMemo = _window$React.useMemo;
+
+/**
+ * 按路径在树形 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.filter(function (x) {
@@ -43,7 +70,14 @@ 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) {
@@ -69,7 +103,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     _schemaValue = props.value,
     schemaOnChange = props.onChange,
     defaultValue = props.defaultValue,
-    restProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
+    multiple = props.multiple;
   var _resolveProScreenBind = (0, _utils.resolveProScreenBinding)({
       screen_structure: screen_structure,
       screen_structure_field: screen_structure_field,
@@ -87,15 +121,46 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     commit(next);
     schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(next, structureName, structureField);
   };
+
+  /** 表单/接口：完整路径 string[]，如 ['2974','2975'] */
   var displayValue = normalizeCascaderPath(value);
+
+  /**
+   * Fusion 单选：官方约定受控 value 为 string[] | number[]，且实现里只对数组取 value[0] 再查节点。
+   * 若传入完整路径 [父,子]，会把「父」当成选中项，文案只有一级。
+   * 组件展示应传「叶子」单元素数组 [leaf]，内部 getLabelPath(叶子节点) 会生成多级展示。
+   * 多选仍传 Fusion 所需的多个 value（与表单存值一致）。
+   */
+  var valueForFusion = useMemo(function () {
+    var path = displayValue;
+    if (multiple) {
+      return path;
+    }
+    if (path.length === 0) return [];
+    return [path[path.length - 1]];
+  }, [displayValue, multiple]);
+
+  /** 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"])({}, props, {
     readOnly: disableEdit ? true : readOnlyProp,
     disabled: disabledProp,
     dataSource: dataSource,
-    value: displayValue,
-    onChange: handleChange
+    value: valueForFusion,
+    onChange: handleChange,
+    displayRender: pathDisplayRender
   })));
 };
 var _default = exports["default"] = ProCascaderSelect;

package/lib/context/FormProvider.js

@@ -48,15 +48,25 @@ var FormProvider = exports.FormProvider = function FormProvider(_ref) {
     values = _useState[0],
     setValues = _useState[1];
 
-  // 仅当 initialValues 引用变化时更新状态
+  /**
+   * store 每次 dispatch 都会给新的 screenStructures 引用；若内容与表单 state 实际一致仍 setValues，
+   * 会整页重渲染（含 EditProTable 几十行），Fusion Overlay/Select 在 componentDidUpdate 里反复 setPosition，
+   * 易触发 React #185（Maximum update depth exceeded），Windows 上更明显。
+   */
   useEffect(function () {
-    if (!(0, _lodash.isEqual)(initialValues, initialValuesRef.current)) {
-      console.log('[FormProvider] 🔄 useEffect triggered - initialValues:', initialValues);
+    if ((0, _lodash.isEqual)(initialValues, initialValuesRef.current)) {
       initialValuesRef.current = initialValues;
-      setValues(function (prev) {
-        return (0, _extends2["default"])({}, prev, initialValues);
-      });
+      return;
     }
+    console.log('[FormProvider] 🔄 useEffect triggered - initialValues:', initialValues);
+    initialValuesRef.current = initialValues;
+    setValues(function (prev) {
+      var merged = (0, _extends2["default"])({}, prev, initialValues);
+      if ((0, _lodash.isEqual)(prev, merged)) {
+        return prev;
+      }
+      return merged;
+    });
   }, [initialValues]);
 
   // 优化 setFieldValue

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.60';
+    version = '1.0.62';
   }
   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.60';
+    version = '1.0.62';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openli1115/lowcode-edit-pro-table",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "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.60/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.62/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.60/build/index.html"
+  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.62/build/index.html"
 }