amis-ui 6.13.0 → 6.14.0-beta.1

package/lib/components/formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */
 
@@ -217,7 +217,7 @@ var FormulaPlugin = /** @class */ (function () {
                 variableMode: false
             });
             traverseAst(ast, function (ast) {
-                var _a, _b;
+                var _a, _b, _c;
                 if (highlightMode === 'expression') {
                     if (ast.type === 'script') {
                         _this.markText({
@@ -270,7 +270,7 @@ var FormulaPlugin = /** @class */ (function () {
                             var vars = variable.children || [];
                             var _loop_1 = function (i, len) {
                                 var item = (_a = list[i]) === null || _a === void 0 ? void 0 : _a.key;
-                                // 只能识别这种固定下标的情况
+                                // 支持 identifier 和 literal 类型的属性访问
                                 if ((item === null || item === void 0 ? void 0 : item.type) === 'identifier') {
                                     var variable_1 = (_b = amisCore.findTree(vars, function (v) { return v.value === path_1 + item.name; })) !== null && _b !== void 0 ? _b : amisCore.findTree(vars, function (v) { return v.value === item.name; } // 兼容不带路径的情况
                                     );
@@ -289,6 +289,79 @@ var FormulaPlugin = /** @class */ (function () {
                                         return "break";
                                     }
                                 }
+                                else if (((item === null || item === void 0 ? void 0 : item.type) === 'literal' &&
+                                    typeof item.value === 'string') ||
+                                    (item === null || item === void 0 ? void 0 : item.type) === 'string') {
+                                    // 支持字符串字面量属性访问，如 data['username']
+                                    var propName_1 = item.value;
+                                    var variable_2 = (_c = amisCore.findTree(vars, function (v) { return v.value === path_1 + propName_1; })) !== null && _c !== void 0 ? _c : amisCore.findTree(vars, function (v) { return v.value === propName_1; } // 兼容不带路径的情况
+                                    );
+                                    if (variable_2) {
+                                        _this.markText({
+                                            line: item.start.line - 1,
+                                            ch: item.start.column - 1
+                                        }, {
+                                            line: item.end.line - 1,
+                                            ch: item.end.column - 1
+                                        }, variable_2.label, 'cm-field', propName_1);
+                                        path_1 += propName_1 + '.';
+                                        vars = variable_2.children || [];
+                                    }
+                                    else {
+                                        // 对于数组访问的情况，如 data[0]，尝试查找数组元素的类型定义
+                                        if (typeof item.value === 'number' ||
+                                            /^\d+$/.test(propName_1)) {
+                                            // 数字索引，查找数组项的定义
+                                            var arrayItemVar = amisCore.findTree(vars, function (v) { return v.isMember === true; });
+                                            if (arrayItemVar) {
+                                                // 继续使用数组项的子属性
+                                                vars = arrayItemVar.children || [];
+                                                path_1 = host_1.name + '[' + item.value + '].';
+                                                return "continue";
+                                            }
+                                            else {
+                                                // 兼容没有 isMember 标记的数组配置
+                                                // 对于数组类型的变量，其children就是数组元素的属性
+                                                if (vars && vars.length > 0) {
+                                                    path_1 = host_1.name + '[' + item.value + '].';
+                                                    return "continue";
+                                                }
+                                                else {
+                                                    return "break";
+                                                }
+                                            }
+                                        }
+                                        else {
+                                            return "break";
+                                        }
+                                    }
+                                }
+                                else if ((item === null || item === void 0 ? void 0 : item.type) === 'literal' &&
+                                    typeof item.value === 'number') {
+                                    // 支持数字索引访问，如 data[0]
+                                    // 查找数组项的定义
+                                    var arrayItemVar = amisCore.findTree(vars, function (v) { return v.isMember === true; });
+                                    if (arrayItemVar) {
+                                        // 继续使用数组项的子属性
+                                        vars = arrayItemVar.children || [arrayItemVar];
+                                        path_1 = host_1.name + '[' + item.value + '].';
+                                        return "continue";
+                                    }
+                                    else {
+                                        // 兼容没有 isMember 标记的数组配置
+                                        // 对于数组类型的变量，其children就是数组元素的属性
+                                        if (vars && vars.length > 0) {
+                                            path_1 = host_1.name + '[' + item.value + '].';
+                                            return "continue";
+                                        }
+                                        else {
+                                            return "break";
+                                        }
+                                    }
+                                }
+                                else {
+                                    return "break";
+                                }
                             };
                             for (var i = 0, len = list.length; i < len; i++) {
                                 var state_1 = _loop_1(i, len);

package/lib/components/icons.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */
 

package/lib/components/json-schema/Array.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */
 

package/lib/components/json-schema/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */
 

package/lib/components/json-schema/Object.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */
 
@@ -28,7 +28,7 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 function InputJSONSchemaObject(props, ref) {
     var _a, _b;
-    var cx = props.classnames, value = props.value, onChange = props.onChange, disabled = props.disabled, __ = props.translate, renderKey = props.renderKey, collapsable = props.collapsable, renderValue = props.renderValue, mobileUI = props.mobileUI, className = props.className, addButtonText = props.addButtonText;
+    var cx = props.classnames, value = props.value, onChange = props.onChange, disabled = props.disabled, __ = props.translate, renderKey = props.renderKey, collapsable = props.collapsable, renderValue = props.renderValue, mobileUI = props.mobileUI, className = props.className, addButtonText = props.addButtonText, autoCreateMembers = props.autoCreateMembers, popOverContainer = props.popOverContainer;
     var buildMembers = React__default["default"].useCallback(function (schema, value) {
         var e_1, _a;
         var _b;
@@ -37,14 +37,20 @@ function InputJSONSchemaObject(props, ref) {
         Object.keys(schema.properties || {}).forEach(function (key) {
             var _a;
             var child = schema.properties[key];
-            members.push({
+            var memeber = {
                 key: amisCore.guid(),
                 name: key,
                 nameMutable: !required.includes(key),
                 required: required.includes(key),
                 schema: child,
                 value: (_a = value === null || value === void 0 ? void 0 : value[key]) !== null && _a !== void 0 ? _a : child.default
-            });
+            };
+            // 如果关闭了自动创建成员，则无值的时候不展开
+            if (autoCreateMembers === false &&
+                typeof memeber.value === 'undefined') {
+                return;
+            }
+            members.push(memeber);
         });
         var keys = Object.keys(value || {});
         var _loop_1 = function (key) {
@@ -88,7 +94,7 @@ function InputJSONSchemaObject(props, ref) {
             });
         }
         return members;
-    }, []);
+    }, [autoCreateMembers]);
     var _c = tslib.__read(React__default["default"].useState([]), 2), members = _c[0], _setMembers = _c[1];
     var membersRef = React__default["default"].useRef();
     membersRef.current = members;
@@ -96,7 +102,7 @@ function InputJSONSchemaObject(props, ref) {
         _setMembers(members);
         membersRef.current = members;
     };
-    var _d = tslib.__read(React__default["default"].useState(collapsable ? true : false), 2), collapsed = _d[0], setCollapsed = _d[1];
+    var _d = tslib.__read(React__default["default"].useState(!!collapsable), 2), collapsed = _d[0], setCollapsed = _d[1];
     var toggleCollapsed = function () {
         setCollapsed(!collapsed);
     };
@@ -162,7 +168,7 @@ function InputJSONSchemaObject(props, ref) {
         var members = buildMembers(props.schema, props.value);
         setMembers(members);
         emitChange();
-    }, [JSON.stringify(props.schema)]);
+    }, [JSON.stringify(props.schema), buildMembers]);
     React__default["default"].useEffect(function () {
         var e_2, _a;
         var _b;
@@ -260,7 +266,7 @@ function InputJSONSchemaObject(props, ref) {
                 return (_J$X_("div", { key: member.key, className: cx('JSONSchemaMember') },
                     _J$X_("div", { className: cx('JSONSchemaMember-key', {
                             'is-mobile': mobileUI
-                        }) }, member.nameMutable ? (_J$X_(React__default["default"].Fragment, null, renderKey ? (renderKey(member.name, onMemberKeyChange.bind(null, member), member.schema, props)) : filtedOptions.length ? (allowInput ? (_J$X_(InputBoxWithSuggestion["default"], { value: member.name, hasError: member.invalid === 'key', onChange: onMemberKeyChange.bind(null, member), clearable: false, placeholder: __('JSONSchema.key'), options: filtedOptions, mobileUI: mobileUI })) : (_J$X_(Select["default"], { simpleValue: true, block: true, value: member.name, hasError: member.invalid === 'key', onChange: onMemberKeyChange.bind(null, member), clearable: false, placeholder: __('JSONSchema.key'), options: filtedOptions, mobileUI: mobileUI }))) : (_J$X_(InputBox["default"], { value: member.name, hasError: member.invalid === 'key', onChange: onMemberKeyChange.bind(null, member), clearable: false, placeholder: __('JSONSchema.key'), mobileUI: mobileUI })))) : (_J$X_("span", null,
+                        }) }, member.nameMutable ? (_J$X_(React__default["default"].Fragment, null, renderKey ? (renderKey(member.name, onMemberKeyChange.bind(null, member), member.schema, props)) : filtedOptions.length ? (allowInput ? (_J$X_(InputBoxWithSuggestion["default"], { value: member.name, hasError: member.invalid === 'key', onChange: onMemberKeyChange.bind(null, member), clearable: false, placeholder: __('JSONSchema.key'), options: filtedOptions, mobileUI: mobileUI, popOverContainer: popOverContainer })) : (_J$X_(Select["default"], { simpleValue: true, block: true, value: member.name, hasError: member.invalid === 'key', onChange: onMemberKeyChange.bind(null, member), clearable: false, placeholder: __('JSONSchema.key'), options: filtedOptions, mobileUI: mobileUI }))) : (_J$X_(InputBox["default"], { value: member.name, hasError: member.invalid === 'key', onChange: onMemberKeyChange.bind(null, member), clearable: false, placeholder: __('JSONSchema.key'), mobileUI: mobileUI })))) : (_J$X_("span", null,
                         member.required ? (_J$X_("span", { className: cx("Form-star") }, "*")) : null,
                         ((_a = member.schema) === null || _a === void 0 ? void 0 : _a.title) || member.name))),
                     _J$X_("div", { className: cx('JSONSchemaMember-value') },

package/lib/components/json-schema/index.d.ts

@@ -16,6 +16,8 @@ export interface InputJSONSchemaItemProps extends ThemeProps, LocaleProps {
     required?: boolean;
     addButtonText?: string;
     formula?: FormulaPickerProps;
+    popOverContainer?: any;
+    autoCreateMembers?: boolean;
 }
 export interface InputJSONSchemaProps extends Omit<InputJSONSchemaItemProps, 'schema'> {
     schema?: any;

package/lib/components/json-schema/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */
 

package/lib/components/menu/MenuContext.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */
 

package/lib/components/menu/MenuItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */
 

package/lib/components/menu/PanelMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */
 

package/lib/components/menu/SubMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.13.0
+ * amis-ui v6.14.0-beta.1
  * Copyright 2018-2025 fex
  */