@openli1115/lowcode-edit-pro-table 1.0.96 → 1.0.98

package/es/components/ProCascaderSelect/index.js

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 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 { get } from 'lodash';
+import { get, isEqual } from 'lodash';
 import { resolveProScreenBinding } from "../utils";
 import { getFormContext } from "../../context/FormProvider";
 import { FORM_EMPTY_ARRAY } from "../../context/useComponentContext";
@@ -13,7 +13,8 @@ var _window$React = window.React,
   useEffect = _window$React.useEffect,
   useMemo = _window$React.useMemo,
   useContext = _window$React.useContext,
-  useState = _window$React.useState;
+  useState = _window$React.useState,
+  useRef = _window$React.useRef;
 
 /** 与预览 previewFlowDebug 一致：window.__PREVIEW_FLOW_LOG__ === false 时静音 */
 function previewFlowCascader(tag, detail) {
@@ -169,19 +170,43 @@ function normalizeCascaderPath(v, dataSource) {
     return tryExpandByLeaf(toStr(v), [toStr(v)]);
   }
   if (typeof v === 'string' && v.trim()) {
+    var trimmed = v.trim();
+    /** JSON.parse("2976") 会得到数字 2976，若误判为非数组并 return []，级联路径永远为空 */
+    if (trimmed.startsWith('[')) {
+      try {
+        var parsed = JSON.parse(trimmed);
+        if (!Array.isArray(parsed)) return [];
+        var _path = parsed.map(function (x) {
+          return toStr(x);
+        });
+        if (_path.length === 0) return [];
+        if (isValidPathInTree(dataSource, _path)) return _path;
+        return tryExpandByLeaf(_path[_path.length - 1], _path);
+      } catch (_unused) {
+        return tryExpandByLeaf(v, [v]);
+      }
+    }
     try {
-      var parsed = JSON.parse(v);
-      if (!Array.isArray(parsed)) return [];
-      var _path = parsed.map(function (x) {
-        return toStr(x);
-      });
-      if (_path.length === 0) return [];
-      if (isValidPathInTree(dataSource, _path)) return _path;
-      return tryExpandByLeaf(_path[_path.length - 1], _path);
-    } catch (_unused) {
-      /** 历史或接口单值回填时，当作叶子值反查完整路径 */
-      return tryExpandByLeaf(v, [v]);
+      var _parsed = JSON.parse(trimmed);
+      if (Array.isArray(_parsed)) {
+        var _path2 = _parsed.map(function (x) {
+          return toStr(x);
+        });
+        if (_path2.length === 0) return [];
+        if (isValidPathInTree(dataSource, _path2)) return _path2;
+        return tryExpandByLeaf(_path2[_path2.length - 1], _path2);
+      }
+      if (typeof _parsed === 'number' && !Number.isNaN(_parsed)) {
+        var leaf = toStr(_parsed);
+        return tryExpandByLeaf(leaf, [leaf]);
+      }
+      if (typeof _parsed === 'string' && _parsed.trim()) {
+        return tryExpandByLeaf(_parsed, [_parsed]);
+      }
+    } catch (_unused2) {
+      /** 非 JSON 或单值 id 字符串 */
     }
+    return tryExpandByLeaf(trimmed, [trimmed]);
   }
   return [];
 }
@@ -345,6 +370,34 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     var raw = Array.isArray(dataSource) ? dataSource : Array.isArray(options) ? options : [];
     return mapToFusionCascaderTree(raw);
   }, [dataSource, options]);
+
+  /**
+   * 屏幕结构（customType 3）等：接口常回标量如 current_status: "2976"；级联需要完整路径 ['父','子']。
+   * 在 dataSource（children 树）就绪后，用 normalizeCascaderPath 反查并写回表单，避免初始化只存叶子、展示依赖异步树。
+   * structureName / structureField 来自 schema，不硬编码。
+   */
+  var pathPersistAttemptsRef = useRef(new Set());
+  useEffect(function () {
+    pathPersistAttemptsRef.current.clear();
+  }, [fieldPath, cascaderOptions]);
+  useEffect(function () {
+    if (!fieldPath) return;
+    if (cascaderOptions.length === 0) return;
+    var expanded = normalizeCascaderPath(value, cascaderOptions);
+    if (!Array.isArray(expanded) || expanded.length === 0) return;
+    if (isEqual(value, expanded)) return;
+    var attemptKey = JSON.stringify(value) + "\u2192" + JSON.stringify(expanded);
+    if (pathPersistAttemptsRef.current.has(attemptKey)) return;
+    pathPersistAttemptsRef.current.add(attemptKey);
+    commit(expanded);
+    previewFlowCascader('persistScalarOrPartialToPath', {
+      fieldPath: fieldPath,
+      structureName: structureName,
+      structureField: structureField,
+      from: typeof value === 'object' ? JSON.stringify(value).slice(0, 160) : String(value).slice(0, 80),
+      expanded: expanded
+    });
+  }, [fieldPath, value, cascaderOptions, commit, structureName, structureField]);
   var handleChange = function handleChange(newValue, _data, extra) {
     var next = cascaderChangeToPath(newValue, extra);
     previewFlowCascader('onChange', {
@@ -375,7 +428,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
         if (Array.isArray(parsed) && parsed.length > 0) {
           return toStr(parsed[parsed.length - 1]);
         }
-      } catch (_unused2) {
+      } catch (_unused3) {
         return value;
       }
       return value;

package/lib/components/ProCascaderSelect/index.js

@@ -18,7 +18,8 @@ var _window$React = window.React,
   useEffect = _window$React.useEffect,
   useMemo = _window$React.useMemo,
   useContext = _window$React.useContext,
-  useState = _window$React.useState;
+  useState = _window$React.useState,
+  useRef = _window$React.useRef;
 
 /** 与预览 previewFlowDebug 一致：window.__PREVIEW_FLOW_LOG__ === false 时静音 */
 function previewFlowCascader(tag, detail) {
@@ -174,19 +175,43 @@ function normalizeCascaderPath(v, dataSource) {
     return tryExpandByLeaf(toStr(v), [toStr(v)]);
   }
   if (typeof v === 'string' && v.trim()) {
+    var trimmed = v.trim();
+    /** JSON.parse("2976") 会得到数字 2976，若误判为非数组并 return []，级联路径永远为空 */
+    if (trimmed.startsWith('[')) {
+      try {
+        var parsed = JSON.parse(trimmed);
+        if (!Array.isArray(parsed)) return [];
+        var _path = parsed.map(function (x) {
+          return toStr(x);
+        });
+        if (_path.length === 0) return [];
+        if (isValidPathInTree(dataSource, _path)) return _path;
+        return tryExpandByLeaf(_path[_path.length - 1], _path);
+      } catch (_unused) {
+        return tryExpandByLeaf(v, [v]);
+      }
+    }
     try {
-      var parsed = JSON.parse(v);
-      if (!Array.isArray(parsed)) return [];
-      var _path = parsed.map(function (x) {
-        return toStr(x);
-      });
-      if (_path.length === 0) return [];
-      if (isValidPathInTree(dataSource, _path)) return _path;
-      return tryExpandByLeaf(_path[_path.length - 1], _path);
-    } catch (_unused) {
-      /** 历史或接口单值回填时，当作叶子值反查完整路径 */
-      return tryExpandByLeaf(v, [v]);
+      var _parsed = JSON.parse(trimmed);
+      if (Array.isArray(_parsed)) {
+        var _path2 = _parsed.map(function (x) {
+          return toStr(x);
+        });
+        if (_path2.length === 0) return [];
+        if (isValidPathInTree(dataSource, _path2)) return _path2;
+        return tryExpandByLeaf(_path2[_path2.length - 1], _path2);
+      }
+      if (typeof _parsed === 'number' && !Number.isNaN(_parsed)) {
+        var leaf = toStr(_parsed);
+        return tryExpandByLeaf(leaf, [leaf]);
+      }
+      if (typeof _parsed === 'string' && _parsed.trim()) {
+        return tryExpandByLeaf(_parsed, [_parsed]);
+      }
+    } catch (_unused2) {
+      /** 非 JSON 或单值 id 字符串 */
     }
+    return tryExpandByLeaf(trimmed, [trimmed]);
   }
   return [];
 }
@@ -350,6 +375,34 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     var raw = Array.isArray(dataSource) ? dataSource : Array.isArray(options) ? options : [];
     return mapToFusionCascaderTree(raw);
   }, [dataSource, options]);
+
+  /**
+   * 屏幕结构（customType 3）等：接口常回标量如 current_status: "2976"；级联需要完整路径 ['父','子']。
+   * 在 dataSource（children 树）就绪后，用 normalizeCascaderPath 反查并写回表单，避免初始化只存叶子、展示依赖异步树。
+   * structureName / structureField 来自 schema，不硬编码。
+   */
+  var pathPersistAttemptsRef = useRef(new Set());
+  useEffect(function () {
+    pathPersistAttemptsRef.current.clear();
+  }, [fieldPath, cascaderOptions]);
+  useEffect(function () {
+    if (!fieldPath) return;
+    if (cascaderOptions.length === 0) return;
+    var expanded = normalizeCascaderPath(value, cascaderOptions);
+    if (!Array.isArray(expanded) || expanded.length === 0) return;
+    if ((0, _lodash.isEqual)(value, expanded)) return;
+    var attemptKey = JSON.stringify(value) + "\u2192" + JSON.stringify(expanded);
+    if (pathPersistAttemptsRef.current.has(attemptKey)) return;
+    pathPersistAttemptsRef.current.add(attemptKey);
+    commit(expanded);
+    previewFlowCascader('persistScalarOrPartialToPath', {
+      fieldPath: fieldPath,
+      structureName: structureName,
+      structureField: structureField,
+      from: typeof value === 'object' ? JSON.stringify(value).slice(0, 160) : String(value).slice(0, 80),
+      expanded: expanded
+    });
+  }, [fieldPath, value, cascaderOptions, commit, structureName, structureField]);
   var handleChange = function handleChange(newValue, _data, extra) {
     var next = cascaderChangeToPath(newValue, extra);
     previewFlowCascader('onChange', {
@@ -380,7 +433,7 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
         if (Array.isArray(parsed) && parsed.length > 0) {
           return toStr(parsed[parsed.length - 1]);
         }
-      } catch (_unused2) {
+      } catch (_unused3) {
         return value;
       }
       return value;

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

package/package.json

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