@openli1115/lowcode-edit-pro-table 1.0.74 → 1.0.75

package/es/components/ProCascaderSelect/index.js

@@ -10,6 +10,36 @@ var _window$React = window.React,
   createElement = _window$React.createElement,
   useCallback = _window$React.useCallback,
   useMemo = _window$React.useMemo;
+function toStr(v) {
+  if (v == null) return '';
+  return String(v);
+}
+function getNodeValue(node) {
+  if (!node || typeof node !== 'object') return '';
+  // 兼容 value/id/key 等常见字段
+  if (node.value != null) return toStr(node.value);
+  if (node.id != null) return toStr(node.id);
+  if (node.key != null) return toStr(node.key);
+  return '';
+}
+function getNodeLabel(node, fallback) {
+  if (fallback === void 0) {
+    fallback = '';
+  }
+  if (!node || typeof node !== 'object') return fallback;
+  if (node.label != null) return toStr(node.label);
+  if (node.name != null) return toStr(node.name);
+  if (node.title != null) return toStr(node.title);
+  return fallback;
+}
+function getNodeChildren(node) {
+  if (!node || typeof node !== 'object') return [];
+  // 兼容 children / options / childs 等结构
+  if (Array.isArray(node.children)) return node.children;
+  if (Array.isArray(node.options)) return node.options;
+  if (Array.isArray(node.childs)) return node.childs;
+  return [];
+}
 
 /**
  * 按路径在树形 dataSource 上逐级匹配，取出每一层的 label（2 级、3 级…任意多级，长度由 pathValues 决定）。
@@ -21,12 +51,11 @@ function resolvePathLabels(dataSource, pathValues) {
   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);
+      return getNodeValue(n) === toStr(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 : [];
+    labels.push(getNodeLabel(node, toStr(pv)));
+    level = getNodeChildren(node);
   };
   for (var _iterator = _createForOfIteratorHelperLoose(pathValues), _step; !(_step = _iterator()).done;) {
     if (_loop()) break;
@@ -39,12 +68,12 @@ function isValidPathInTree(dataSource, pathValues) {
   var _loop2 = function _loop2() {
       var pv = _step2.value;
       var node = level.find(function (n) {
-        return String(n === null || n === void 0 ? void 0 : n.value) === String(pv);
+        return getNodeValue(n) === toStr(pv);
       });
       if (!node) return {
         v: false
       };
-      level = Array.isArray(node.children) ? node.children : [];
+      level = getNodeChildren(node);
     },
     _ret;
   for (var _iterator2 = _createForOfIteratorHelperLoose(pathValues), _step2; !(_step2 = _iterator2()).done;) {
@@ -62,13 +91,13 @@ function findPathByNodeValue(dataSource, targetValue, parentPath) {
   if (!Array.isArray(dataSource) || targetValue === '') return [];
   for (var _iterator3 = _createForOfIteratorHelperLoose(dataSource), _step3; !(_step3 = _iterator3()).done;) {
     var node = _step3.value;
-    var curValue = node === null || node === void 0 ? void 0 : node.value;
-    if (curValue == null) continue;
-    var nextPath = parentPath.concat(String(curValue));
-    if (String(curValue) === targetValue) {
+    var curValue = getNodeValue(node);
+    if (!curValue) continue;
+    var nextPath = parentPath.concat(curValue);
+    if (curValue === toStr(targetValue)) {
       return nextPath;
     }
-    var hit = findPathByNodeValue(node === null || node === void 0 ? void 0 : node.children, targetValue, nextPath);
+    var hit = findPathByNodeValue(getNodeChildren(node), targetValue, nextPath);
     if (hit.length > 0) return hit;
   }
   return [];
@@ -85,7 +114,7 @@ function normalizeCascaderPath(v, dataSource) {
     var path = v.filter(function (x) {
       return x != null && x !== '';
     }).map(function (x) {
-      return String(x);
+      return toStr(x);
     });
     if (path.length === 0) return [];
     if (isValidPathInTree(dataSource, path)) return path;
@@ -93,14 +122,14 @@ function normalizeCascaderPath(v, dataSource) {
   }
   if (typeof v === 'number' && !Number.isNaN(v)) {
     /** 表单里有时是数字 id（2977），需要根据 dataSource 找完整路径 */
-    return tryExpandByLeaf(String(v), [String(v)]);
+    return tryExpandByLeaf(toStr(v), [toStr(v)]);
   }
   if (typeof v === 'string' && v.trim()) {
     try {
       var parsed = JSON.parse(v);
       if (!Array.isArray(parsed)) return [];
       var _path = parsed.map(function (x) {
-        return String(x);
+        return toStr(x);
       });
       if (_path.length === 0) return [];
       if (isValidPathInTree(dataSource, _path)) return _path;
@@ -146,6 +175,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     screen_inner_id = props.screen_inner_id,
     range_inner_table = props.range_inner_table,
     dataSource = props.dataSource,
+    options = props.options,
     disableEdit = props.disableEdit,
     readOnlyProp = props.readOnly,
     disabledProp = props.disabled,
@@ -165,6 +195,12 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
   var _useProBoundValue = useProBoundValue(fieldPath, unboundInit, FORM_EMPTY_ARRAY),
     value = _useProBoundValue.value,
     commit = _useProBoundValue.commit;
+  // 优先 dataSource，兼容部分 schema 透传为 options
+  var cascaderOptions = useMemo(function () {
+    if (Array.isArray(dataSource)) return dataSource;
+    if (Array.isArray(options)) return options;
+    return [];
+  }, [dataSource, options]);
   var handleChange = function handleChange(newValue, _data, extra) {
     var next = cascaderChangeToPath(newValue, extra);
     commit(next);
@@ -173,8 +209,8 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
 
   /** 表单/接口：优先完整路径；若仅有叶子 id（如 2977）则由 dataSource 反查完整路径 */
   var displayValue = useMemo(function () {
-    return normalizeCascaderPath(value, dataSource);
-  }, [value, dataSource]);
+    return normalizeCascaderPath(value, cascaderOptions);
+  }, [value, cascaderOptions]);
 
   /**
    * Fusion 单选：官方约定受控 value 为 string[] | number[]，且实现里只对数组取 value[0] 再查节点。
@@ -194,7 +230,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
   /** dataSource 未就绪或异步时，仍用自定义文案兜底 */
   var schemaDisplayRender = props.displayRender;
   var pathDisplayRender = useCallback(function (labels, data) {
-    var fullLabels = resolvePathLabels(dataSource, displayValue);
+    var fullLabels = resolvePathLabels(cascaderOptions, displayValue);
     if (fullLabels.length > 0) {
       return fullLabels.join(' / ');
     }
@@ -202,13 +238,13 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
       return schemaDisplayRender(labels, data);
     }
     return (labels && labels.length ? labels.join(' / ') : '') || ((data === null || data === void 0 ? void 0 : data.label) != null ? String(data.label) : '');
-  }, [dataSource, displayValue, schemaDisplayRender]);
+  }, [cascaderOptions, displayValue, 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,
+    dataSource: cascaderOptions,
     value: valueForFusion,
     onChange: handleChange,
     displayRender: pathDisplayRender

package/lib/components/ProCascaderSelect/index.js

@@ -15,6 +15,36 @@ var _window$React = window.React,
   createElement = _window$React.createElement,
   useCallback = _window$React.useCallback,
   useMemo = _window$React.useMemo;
+function toStr(v) {
+  if (v == null) return '';
+  return String(v);
+}
+function getNodeValue(node) {
+  if (!node || typeof node !== 'object') return '';
+  // 兼容 value/id/key 等常见字段
+  if (node.value != null) return toStr(node.value);
+  if (node.id != null) return toStr(node.id);
+  if (node.key != null) return toStr(node.key);
+  return '';
+}
+function getNodeLabel(node, fallback) {
+  if (fallback === void 0) {
+    fallback = '';
+  }
+  if (!node || typeof node !== 'object') return fallback;
+  if (node.label != null) return toStr(node.label);
+  if (node.name != null) return toStr(node.name);
+  if (node.title != null) return toStr(node.title);
+  return fallback;
+}
+function getNodeChildren(node) {
+  if (!node || typeof node !== 'object') return [];
+  // 兼容 children / options / childs 等结构
+  if (Array.isArray(node.children)) return node.children;
+  if (Array.isArray(node.options)) return node.options;
+  if (Array.isArray(node.childs)) return node.childs;
+  return [];
+}
 
 /**
  * 按路径在树形 dataSource 上逐级匹配，取出每一层的 label（2 级、3 级…任意多级，长度由 pathValues 决定）。
@@ -26,12 +56,11 @@ function resolvePathLabels(dataSource, pathValues) {
   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);
+      return getNodeValue(n) === toStr(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 : [];
+    labels.push(getNodeLabel(node, toStr(pv)));
+    level = getNodeChildren(node);
   };
   for (var _iterator = _createForOfIteratorHelperLoose(pathValues), _step; !(_step = _iterator()).done;) {
     if (_loop()) break;
@@ -44,12 +73,12 @@ function isValidPathInTree(dataSource, pathValues) {
   var _loop2 = function _loop2() {
       var pv = _step2.value;
       var node = level.find(function (n) {
-        return String(n === null || n === void 0 ? void 0 : n.value) === String(pv);
+        return getNodeValue(n) === toStr(pv);
       });
       if (!node) return {
         v: false
       };
-      level = Array.isArray(node.children) ? node.children : [];
+      level = getNodeChildren(node);
     },
     _ret;
   for (var _iterator2 = _createForOfIteratorHelperLoose(pathValues), _step2; !(_step2 = _iterator2()).done;) {
@@ -67,13 +96,13 @@ function findPathByNodeValue(dataSource, targetValue, parentPath) {
   if (!Array.isArray(dataSource) || targetValue === '') return [];
   for (var _iterator3 = _createForOfIteratorHelperLoose(dataSource), _step3; !(_step3 = _iterator3()).done;) {
     var node = _step3.value;
-    var curValue = node === null || node === void 0 ? void 0 : node.value;
-    if (curValue == null) continue;
-    var nextPath = parentPath.concat(String(curValue));
-    if (String(curValue) === targetValue) {
+    var curValue = getNodeValue(node);
+    if (!curValue) continue;
+    var nextPath = parentPath.concat(curValue);
+    if (curValue === toStr(targetValue)) {
       return nextPath;
     }
-    var hit = findPathByNodeValue(node === null || node === void 0 ? void 0 : node.children, targetValue, nextPath);
+    var hit = findPathByNodeValue(getNodeChildren(node), targetValue, nextPath);
     if (hit.length > 0) return hit;
   }
   return [];
@@ -90,7 +119,7 @@ function normalizeCascaderPath(v, dataSource) {
     var path = v.filter(function (x) {
       return x != null && x !== '';
     }).map(function (x) {
-      return String(x);
+      return toStr(x);
     });
     if (path.length === 0) return [];
     if (isValidPathInTree(dataSource, path)) return path;
@@ -98,14 +127,14 @@ function normalizeCascaderPath(v, dataSource) {
   }
   if (typeof v === 'number' && !Number.isNaN(v)) {
     /** 表单里有时是数字 id（2977），需要根据 dataSource 找完整路径 */
-    return tryExpandByLeaf(String(v), [String(v)]);
+    return tryExpandByLeaf(toStr(v), [toStr(v)]);
   }
   if (typeof v === 'string' && v.trim()) {
     try {
       var parsed = JSON.parse(v);
       if (!Array.isArray(parsed)) return [];
       var _path = parsed.map(function (x) {
-        return String(x);
+        return toStr(x);
       });
       if (_path.length === 0) return [];
       if (isValidPathInTree(dataSource, _path)) return _path;
@@ -151,6 +180,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     screen_inner_id = props.screen_inner_id,
     range_inner_table = props.range_inner_table,
     dataSource = props.dataSource,
+    options = props.options,
     disableEdit = props.disableEdit,
     readOnlyProp = props.readOnly,
     disabledProp = props.disabled,
@@ -170,6 +200,12 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
   var _useProBoundValue = (0, _useProBoundValue2.useProBoundValue)(fieldPath, unboundInit, _useComponentContext.FORM_EMPTY_ARRAY),
     value = _useProBoundValue.value,
     commit = _useProBoundValue.commit;
+  // 优先 dataSource，兼容部分 schema 透传为 options
+  var cascaderOptions = useMemo(function () {
+    if (Array.isArray(dataSource)) return dataSource;
+    if (Array.isArray(options)) return options;
+    return [];
+  }, [dataSource, options]);
   var handleChange = function handleChange(newValue, _data, extra) {
     var next = cascaderChangeToPath(newValue, extra);
     commit(next);
@@ -178,8 +214,8 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
 
   /** 表单/接口：优先完整路径；若仅有叶子 id（如 2977）则由 dataSource 反查完整路径 */
   var displayValue = useMemo(function () {
-    return normalizeCascaderPath(value, dataSource);
-  }, [value, dataSource]);
+    return normalizeCascaderPath(value, cascaderOptions);
+  }, [value, cascaderOptions]);
 
   /**
    * Fusion 单选：官方约定受控 value 为 string[] | number[]，且实现里只对数组取 value[0] 再查节点。
@@ -199,7 +235,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
   /** dataSource 未就绪或异步时，仍用自定义文案兜底 */
   var schemaDisplayRender = props.displayRender;
   var pathDisplayRender = useCallback(function (labels, data) {
-    var fullLabels = resolvePathLabels(dataSource, displayValue);
+    var fullLabels = resolvePathLabels(cascaderOptions, displayValue);
     if (fullLabels.length > 0) {
       return fullLabels.join(' / ');
     }
@@ -207,13 +243,13 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
       return schemaDisplayRender(labels, data);
     }
     return (labels && labels.length ? labels.join(' / ') : '') || ((data === null || data === void 0 ? void 0 : data.label) != null ? String(data.label) : '');
-  }, [dataSource, displayValue, schemaDisplayRender]);
+  }, [cascaderOptions, displayValue, 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,
+    dataSource: cascaderOptions,
     value: valueForFusion,
     onChange: handleChange,
     displayRender: pathDisplayRender

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

package/package.json

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