@openli1115/lowcode-edit-pro-table 1.0.91 → 1.0.93

package/es/components/ProCascaderSelect/index.js

@@ -198,11 +198,50 @@ function cascaderChangeToPath(newValue, extra) {
   return [String(newValue)];
 }
 
+/**
+ * 范围内表回填形状：
+ * - customType 4：`structure.data` 为 `[{ low, high, sign, option, ... }]` → 取 `data[0].field`
+ * - 对象型：`structure.data` 为 `{ low: ... }` → 取 `data.field`
+ * - 扁平：`structure.field`（与 previewUtils expandInnerTableRangeEcho 一致）
+ */
+function readRangeInnerEchoValue(values, structureName, structureField, flatPath) {
+  var dataBagPath = structureName ? structureName + ".data" : '';
+  var pathsTryFirst = [structureName && structureField ? structureName + ".data[0]." + structureField : '', structureName && structureField ? structureName + ".data." + structureField : '', flatPath].filter(Boolean);
+  for (var _iterator4 = _createForOfIteratorHelperLoose(pathsTryFirst), _step4; !(_step4 = _iterator4()).done;) {
+    var p = _step4.value;
+    var _v2 = get(values, p);
+    if (_v2 !== undefined && _v2 !== null) return _v2;
+  }
+  if (structureField && dataBagPath) {
+    var bag = get(values, dataBagPath);
+    if (Array.isArray(bag) && bag[0] && typeof bag[0] === 'object' && structureField in bag[0]) {
+      var v = bag[0][structureField];
+      if (v !== undefined && v !== null) return v;
+    }
+    if (bag && typeof bag === 'object' && !Array.isArray(bag) && structureField in bag) {
+      var _v = bag[structureField];
+      if (_v !== undefined && _v !== null) return _v;
+    }
+  }
+  return FORM_EMPTY_ARRAY;
+}
+function resolveRangeInnerWritePath(values, structureName, structureField, flatPath) {
+  if (!structureName || !structureField) return flatPath;
+  var dataBag = get(values, structureName + ".data");
+  if (Array.isArray(dataBag)) {
+    return structureName + ".data[0]." + structureField;
+  }
+  if (dataBag && typeof dataBag === 'object' && !Array.isArray(dataBag)) {
+    return structureName + ".data." + structureField;
+  }
+  return flatPath;
+}
+
 /**
  * 与 ProInput 一致写入扁平路径 `structure.field`；读取时兼容接口把字段挂在 `structure.data.field`
  * 或多包一层对象的情况（与 previewUtils normalizeType3 一致）。
  */
-function useCascaderBoundValue(fieldPath, structureName, structureField, unboundInit) {
+function useCascaderBoundValue(fieldPath, structureName, structureField, unboundInit, rangeInnerTable) {
   var FormCtx = getFormContext();
   var formContext = useContext(FormCtx);
   var _useState = useState(function () {
@@ -216,32 +255,40 @@ function useCascaderBoundValue(fieldPath, structureName, structureField, unbound
   var ctxValue = useMemo(function () {
     if (!bound || !(formContext !== null && formContext !== void 0 && formContext.initialized)) return FORM_EMPTY_ARRAY;
     var values = formContext.values;
-    if (fieldPath && has(values, fieldPath)) {
-      var v = get(values, fieldPath);
+    var tryRead = function tryRead(p) {
+      if (!p || !has(values, p)) return FORM_EMPTY_ARRAY;
+      var v = get(values, p);
       if (v !== undefined && v !== null) return v;
+      return FORM_EMPTY_ARRAY;
+    };
+    if (rangeInnerTable && structureName && structureField) {
+      var fromRange = readRangeInnerEchoValue(values, structureName, structureField, fieldPath);
+      if (fromRange !== FORM_EMPTY_ARRAY) return fromRange;
     }
-    if (nestedFieldPath && has(values, nestedFieldPath)) {
-      var _v = get(values, nestedFieldPath);
-      if (_v !== undefined && _v !== null) return _v;
-    }
+    var fromFlat = fieldPath ? tryRead(fieldPath) : FORM_EMPTY_ARRAY;
+    if (fromFlat !== FORM_EMPTY_ARRAY) return fromFlat;
+    var fromNested = nestedFieldPath ? tryRead(nestedFieldPath) : FORM_EMPTY_ARRAY;
+    if (fromNested !== FORM_EMPTY_ARRAY) return fromNested;
     if (structureField && dataBagPath && has(values, dataBagPath)) {
       var bag = get(values, dataBagPath);
       if (bag && typeof bag === 'object' && !Array.isArray(bag) && structureField in bag) {
-        var _v2 = bag[structureField];
-        if (_v2 !== undefined && _v2 !== null) return _v2;
+        var v = bag[structureField];
+        if (v !== undefined && v !== null) return v;
       }
     }
     return FORM_EMPTY_ARRAY;
-  }, [bound, fieldPath, nestedFieldPath, dataBagPath, structureField, formContext]);
+  }, [bound, fieldPath, nestedFieldPath, dataBagPath, structureField, rangeInnerTable, structureName, formContext]);
   var value = bound ? ctxValue : localValue;
   var commit = useCallback(function (next) {
     if (bound) {
       if (!(formContext !== null && formContext !== void 0 && formContext.setFieldValue)) return;
-      formContext.setFieldValue(fieldPath, next);
+      var vals = formContext.values || {};
+      var path = rangeInnerTable && structureName && structureField ? resolveRangeInnerWritePath(vals, structureName, structureField, fieldPath) : fieldPath;
+      formContext.setFieldValue(path, next);
     } else {
       setLocalValue(next);
     }
-  }, [bound, fieldPath, formContext]);
+  }, [bound, fieldPath, formContext, rangeInnerTable, structureName, structureField]);
   return {
     value: value,
     commit: commit
@@ -270,8 +317,9 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     structureName = _resolveProScreenBind.structureName,
     structureField = _resolveProScreenBind.structureField,
     fieldPath = _resolveProScreenBind.fieldPath;
+  var rangeInnerTable = Boolean(range_inner_table && String(range_inner_table).trim());
   var unboundInit = defaultValue != null && Array.isArray(defaultValue) ? defaultValue.slice() : FORM_EMPTY_ARRAY;
-  var _useCascaderBoundValu = useCascaderBoundValue(fieldPath, structureName || '', structureField || '', unboundInit),
+  var _useCascaderBoundValu = useCascaderBoundValue(fieldPath, structureName || '', structureField || '', unboundInit, rangeInnerTable),
     value = _useCascaderBoundValu.value,
     commit = _useCascaderBoundValu.commit;
   // 优先 dataSource，兼容部分 schema 透传为 options；并转为 Fusion 可索引的树形

package/lib/components/ProCascaderSelect/index.js

@@ -203,11 +203,50 @@ function cascaderChangeToPath(newValue, extra) {
   return [String(newValue)];
 }
 
+/**
+ * 范围内表回填形状：
+ * - customType 4：`structure.data` 为 `[{ low, high, sign, option, ... }]` → 取 `data[0].field`
+ * - 对象型：`structure.data` 为 `{ low: ... }` → 取 `data.field`
+ * - 扁平：`structure.field`（与 previewUtils expandInnerTableRangeEcho 一致）
+ */
+function readRangeInnerEchoValue(values, structureName, structureField, flatPath) {
+  var dataBagPath = structureName ? structureName + ".data" : '';
+  var pathsTryFirst = [structureName && structureField ? structureName + ".data[0]." + structureField : '', structureName && structureField ? structureName + ".data." + structureField : '', flatPath].filter(Boolean);
+  for (var _iterator4 = _createForOfIteratorHelperLoose(pathsTryFirst), _step4; !(_step4 = _iterator4()).done;) {
+    var p = _step4.value;
+    var _v2 = (0, _lodash.get)(values, p);
+    if (_v2 !== undefined && _v2 !== null) return _v2;
+  }
+  if (structureField && dataBagPath) {
+    var bag = (0, _lodash.get)(values, dataBagPath);
+    if (Array.isArray(bag) && bag[0] && typeof bag[0] === 'object' && structureField in bag[0]) {
+      var v = bag[0][structureField];
+      if (v !== undefined && v !== null) return v;
+    }
+    if (bag && typeof bag === 'object' && !Array.isArray(bag) && structureField in bag) {
+      var _v = bag[structureField];
+      if (_v !== undefined && _v !== null) return _v;
+    }
+  }
+  return _useComponentContext.FORM_EMPTY_ARRAY;
+}
+function resolveRangeInnerWritePath(values, structureName, structureField, flatPath) {
+  if (!structureName || !structureField) return flatPath;
+  var dataBag = (0, _lodash.get)(values, structureName + ".data");
+  if (Array.isArray(dataBag)) {
+    return structureName + ".data[0]." + structureField;
+  }
+  if (dataBag && typeof dataBag === 'object' && !Array.isArray(dataBag)) {
+    return structureName + ".data." + structureField;
+  }
+  return flatPath;
+}
+
 /**
  * 与 ProInput 一致写入扁平路径 `structure.field`；读取时兼容接口把字段挂在 `structure.data.field`
  * 或多包一层对象的情况（与 previewUtils normalizeType3 一致）。
  */
-function useCascaderBoundValue(fieldPath, structureName, structureField, unboundInit) {
+function useCascaderBoundValue(fieldPath, structureName, structureField, unboundInit, rangeInnerTable) {
   var FormCtx = (0, _FormProvider.getFormContext)();
   var formContext = useContext(FormCtx);
   var _useState = useState(function () {
@@ -221,32 +260,40 @@ function useCascaderBoundValue(fieldPath, structureName, structureField, unbound
   var ctxValue = useMemo(function () {
     if (!bound || !(formContext !== null && formContext !== void 0 && formContext.initialized)) return _useComponentContext.FORM_EMPTY_ARRAY;
     var values = formContext.values;
-    if (fieldPath && (0, _lodash.has)(values, fieldPath)) {
-      var v = (0, _lodash.get)(values, fieldPath);
+    var tryRead = function tryRead(p) {
+      if (!p || !(0, _lodash.has)(values, p)) return _useComponentContext.FORM_EMPTY_ARRAY;
+      var v = (0, _lodash.get)(values, p);
       if (v !== undefined && v !== null) return v;
+      return _useComponentContext.FORM_EMPTY_ARRAY;
+    };
+    if (rangeInnerTable && structureName && structureField) {
+      var fromRange = readRangeInnerEchoValue(values, structureName, structureField, fieldPath);
+      if (fromRange !== _useComponentContext.FORM_EMPTY_ARRAY) return fromRange;
     }
-    if (nestedFieldPath && (0, _lodash.has)(values, nestedFieldPath)) {
-      var _v = (0, _lodash.get)(values, nestedFieldPath);
-      if (_v !== undefined && _v !== null) return _v;
-    }
+    var fromFlat = fieldPath ? tryRead(fieldPath) : _useComponentContext.FORM_EMPTY_ARRAY;
+    if (fromFlat !== _useComponentContext.FORM_EMPTY_ARRAY) return fromFlat;
+    var fromNested = nestedFieldPath ? tryRead(nestedFieldPath) : _useComponentContext.FORM_EMPTY_ARRAY;
+    if (fromNested !== _useComponentContext.FORM_EMPTY_ARRAY) return fromNested;
     if (structureField && dataBagPath && (0, _lodash.has)(values, dataBagPath)) {
       var bag = (0, _lodash.get)(values, dataBagPath);
       if (bag && typeof bag === 'object' && !Array.isArray(bag) && structureField in bag) {
-        var _v2 = bag[structureField];
-        if (_v2 !== undefined && _v2 !== null) return _v2;
+        var v = bag[structureField];
+        if (v !== undefined && v !== null) return v;
       }
     }
     return _useComponentContext.FORM_EMPTY_ARRAY;
-  }, [bound, fieldPath, nestedFieldPath, dataBagPath, structureField, formContext]);
+  }, [bound, fieldPath, nestedFieldPath, dataBagPath, structureField, rangeInnerTable, structureName, formContext]);
   var value = bound ? ctxValue : localValue;
   var commit = useCallback(function (next) {
     if (bound) {
       if (!(formContext !== null && formContext !== void 0 && formContext.setFieldValue)) return;
-      formContext.setFieldValue(fieldPath, next);
+      var vals = formContext.values || {};
+      var path = rangeInnerTable && structureName && structureField ? resolveRangeInnerWritePath(vals, structureName, structureField, fieldPath) : fieldPath;
+      formContext.setFieldValue(path, next);
     } else {
       setLocalValue(next);
     }
-  }, [bound, fieldPath, formContext]);
+  }, [bound, fieldPath, formContext, rangeInnerTable, structureName, structureField]);
   return {
     value: value,
     commit: commit
@@ -275,8 +322,9 @@ var ProCascaderSelect = function ProCascaderSelect(props) {
     structureName = _resolveProScreenBind.structureName,
     structureField = _resolveProScreenBind.structureField,
     fieldPath = _resolveProScreenBind.fieldPath;
+  var rangeInnerTable = Boolean(range_inner_table && String(range_inner_table).trim());
   var unboundInit = defaultValue != null && Array.isArray(defaultValue) ? defaultValue.slice() : _useComponentContext.FORM_EMPTY_ARRAY;
-  var _useCascaderBoundValu = useCascaderBoundValue(fieldPath, structureName || '', structureField || '', unboundInit),
+  var _useCascaderBoundValu = useCascaderBoundValue(fieldPath, structureName || '', structureField || '', unboundInit, rangeInnerTable),
     value = _useCascaderBoundValu.value,
     commit = _useCascaderBoundValu.commit;
   // 优先 dataSource，兼容部分 schema 透传为 options；并转为 Fusion 可索引的树形

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

package/package.json

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