amis-editor 5.4.1 → 5.6.0-beta.0

package/lib/plugin/Form/CodeEditor.d.ts

@@ -1,6 +1,7 @@
 import { BasePlugin } from 'amis-editor-core';
 import { RendererPluginEvent, RendererPluginAction } from 'amis-editor-core';
 export declare class CodeEditorControlPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;

package/lib/plugin/Form/CodeEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -50,9 +50,15 @@ var CodeEditorControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'string',
-            title: i18nRuntime.i18n("efa3ddc1e26ed5d8cf7d9855cc7bd42e")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18nRuntime.i18n("ed85c3f659acc9e89bcf6f0dbaa02a62")
+              }
+            }
           }
         }
       }]
@@ -63,9 +69,15 @@ var CodeEditorControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'string',
-            title: i18nRuntime.i18n("efa3ddc1e26ed5d8cf7d9855cc7bd42e")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18nRuntime.i18n("ed85c3f659acc9e89bcf6f0dbaa02a62")
+              }
+            }
           }
         }
       }]
@@ -76,9 +88,15 @@ var CodeEditorControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'string',
-            title: i18nRuntime.i18n("efa3ddc1e26ed5d8cf7d9855cc7bd42e")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18nRuntime.i18n("ed85c3f659acc9e89bcf6f0dbaa02a62")
+              }
+            }
           }
         }
       }]
@@ -179,6 +197,7 @@ var CodeEditorControlPlugin = /** @class */function (_super) {
     props.disabled = true;
     return props;
   };
+  CodeEditorControlPlugin.id = 'CodeEditorControlPlugin';
   return CodeEditorControlPlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(CodeEditorControlPlugin);

package/lib/plugin/Form/Combo.d.ts

@@ -1,5 +1,6 @@
 import { BasePlugin, RendererPluginEvent, RendererPluginAction, RegionConfig, EditorNodeType, EditorManager, DSBuilderManager } from 'amis-editor-core';
 export declare class ComboControlPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;
@@ -49,5 +50,6 @@ export declare class ComboControlPlugin extends BasePlugin {
     constructor(manager: EditorManager);
     panelBodyCreator: (context: BaseEventContext) => any;
     filterProps(props: any): any;
+    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType, parent?: EditorNodeType): Promise<any>;
     getAvailableContextFields(scopeNode: EditorNodeType, target: EditorNodeType, region?: EditorNodeType): Promise<any>;
 }

package/lib/plugin/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -87,9 +87,15 @@ var ComboControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("aacd80d2c978abae7b955510a938788c")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18nRuntime.i18n("e26f6832d586f9e73d2361573bf5273f")
+              }
+            }
           }
         }
       }]
@@ -100,17 +106,23 @@ var ComboControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.key': {
-            type: 'string',
-            title: i18nRuntime.i18n("0410242a74850f010a9a8061bc0cd891")
-          },
-          'event.data.value': {
-            type: 'string',
-            title: i18nRuntime.i18n("74333901ae9ad27a93487dc850e45609")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("28e5fd494ea37a09fd2ad36d0f98bacc")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              key: {
+                type: 'string',
+                title: i18nRuntime.i18n("91190195405845950230616929d852cf")
+              },
+              value: {
+                type: 'string',
+                title: i18nRuntime.i18n("e26f6832d586f9e73d2361573bf5273f")
+              },
+              item: {
+                type: 'object',
+                title: i18nRuntime.i18n("28e5fd494ea37a09fd2ad36d0f98bacc")
+              }
+            }
           }
         }
       }]
@@ -121,17 +133,23 @@ var ComboControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.key': {
-            type: 'string',
-            title: i18nRuntime.i18n("b04c6cf9cb1212b9c173ddfeec129028")
-          },
-          'event.data.value': {
-            type: 'string',
-            title: i18nRuntime.i18n("74333901ae9ad27a93487dc850e45609")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18nRuntime.i18n("046de1a6cb21ff83af74958342c0db64")
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              key: {
+                type: 'string',
+                title: i18nRuntime.i18n("b04c6cf9cb1212b9c173ddfeec129028")
+              },
+              value: {
+                type: 'string',
+                title: i18nRuntime.i18n("e26f6832d586f9e73d2361573bf5273f")
+              },
+              item: {
+                type: 'object',
+                title: i18nRuntime.i18n("046de1a6cb21ff83af74958342c0db64")
+              }
+            }
           }
         }
       }]
@@ -171,7 +189,6 @@ var ComboControlPlugin = /** @class */function (_super) {
         }, amisEditorCore.getSchemaTpl('formulaControl', {
           name: 'val',
           variables: '${variables}',
-          variableMode: 'tabs',
           inputMode: 'input-group'
         })]
       })
@@ -482,28 +499,100 @@ var ComboControlPlugin = /** @class */function (_super) {
     }
     return props;
   };
+  ComboControlPlugin.prototype.buildDataSchemas = function (node, region, trigger, parent) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var itemsSchema, items, parentScopeId, isColumnChild, scopeId, pool, current, schema, _k, _l, scopeId, scope;
+      return tslib.__generator(this, function (_m) {
+        switch (_m.label) {
+          case 0:
+            itemsSchema = {
+              $id: "".concat(node.id, "-").concat(node.type, "-tableRows"),
+              type: 'object',
+              properties: {}
+            };
+            items = (_a = node.children) === null || _a === void 0 ? void 0 : _a.find(function (child) {
+              return child.isRegion && child.region === 'items';
+            });
+            parentScopeId = "".concat(parent === null || parent === void 0 ? void 0 : parent.id, "-").concat(parent === null || parent === void 0 ? void 0 : parent.type).concat(((_b = node.parent) === null || _b === void 0 ? void 0 : _b.type) === 'cell' ? '-currentRow' : '');
+            isColumnChild = false;
+            if (trigger) {
+              isColumnChild = amisCore.someTree(items.children, function (item) {
+                return item.id === (trigger === null || trigger === void 0 ? void 0 : trigger.id);
+              });
+              if (isColumnChild) {
+                scopeId = "".concat(node.id, "-").concat(node.type, "-currentRow");
+                if (this.manager.dataSchema.getScope(scopeId)) {
+                  this.manager.dataSchema.removeScope(scopeId);
+                }
+                if (this.manager.dataSchema.getScope(parentScopeId)) {
+                  this.manager.dataSchema.switchTo(parentScopeId);
+                }
+                this.manager.dataSchema.addScope([], scopeId);
+                this.manager.dataSchema.current.tag = i18nRuntime.i18n("bf2a4fd8ecd654982e2d466f10f54d3f");
+                this.manager.dataSchema.current.group = i18nRuntime.i18n("813a5158d9f7171d20e7df340c5b48f9");
+              }
+            }
+            pool = items.children.concat();
+            _m.label = 1;
+          case 1:
+            if (!pool.length) return [3 /*break*/, 4];
+            current = pool.shift();
+            schema = current.schema;
+            if (!schema.name) return [3 /*break*/, 3];
+            _k = itemsSchema.properties;
+            _l = schema.name;
+            return [4 /*yield*/, (_d = (_c = current.info.plugin).buildDataSchemas) === null || _d === void 0 ? void 0 : _d.call(_c, current, region, trigger, node)];
+          case 2:
+            _k[_l] = _m.sent();
+            _m.label = 3;
+          case 3:
+            return [3 /*break*/, 1];
+          case 4:
+            if (isColumnChild) {
+              scopeId = "".concat(node.id, "-").concat(node.type, "-currentRow");
+              scope = this.manager.dataSchema.getScope(scopeId);
+              scope === null || scope === void 0 ? void 0 : scope.addSchema(itemsSchema);
+            }
+            if ((_e = node.schema) === null || _e === void 0 ? void 0 : _e.multiple) {
+              return [2 /*return*/, {
+                $id: 'combo',
+                type: 'array',
+                title: ((_f = node.schema) === null || _f === void 0 ? void 0 : _f.label) || ((_g = node.schema) === null || _g === void 0 ? void 0 : _g.name),
+                items: itemsSchema
+              }];
+            }
+            return [2 /*return*/, tslib.__assign(tslib.__assign({}, itemsSchema), {
+              title: ((_h = node.schema) === null || _h === void 0 ? void 0 : _h.label) || ((_j = node.schema) === null || _j === void 0 ? void 0 : _j.name)
+            })];
+        }
+      });
+    });
+  };
   ComboControlPlugin.prototype.getAvailableContextFields = function (scopeNode, target, region) {
     var _a, _b;
     return tslib.__awaiter(this, void 0, void 0, function () {
       var scope, builder;
       return tslib.__generator(this, function (_c) {
-        if (target.parent.isRegion && target.parent.region === 'items') {
+        if (target.type === scopeNode.type || target.parent.isRegion && target.parent.region === 'items') {
           scope = scopeNode.parent.parent;
           builder = this.dsBuilderManager.resolveBuilderBySchema(scope.schema, 'api');
-          if (builder && scope.schema.api) {
-            return [2 /*return*/, builder.getAvailableContextFileds({
-              schema: scope.schema,
-              sourceKey: 'api',
-              feat: (_b = (_a = scope.schema) === null || _a === void 0 ? void 0 : _a.feat) !== null && _b !== void 0 ? _b : 'List',
-              scopeNode: scopeNode
-            }, target)];
-          }
+        }
+        if (builder && scope.schema.api) {
+          return [2 /*return*/, builder.getAvailableContextFileds({
+            schema: scope.schema,
+            sourceKey: 'api',
+            feat: (_b = (_a = scope.schema) === null || _a === void 0 ? void 0 : _a.feat) !== null && _b !== void 0 ? _b : 'List',
+            scopeNode: scopeNode
+          }, /** ID相同为本体，否则为子项 */
+          (target === null || target === void 0 ? void 0 : target.id) === (scopeNode === null || scopeNode === void 0 ? void 0 : scopeNode.id) ? scopeNode : target)];
         }
         return [2 /*return*/];
       });
     });
   };
 
+  ComboControlPlugin.id = 'ComboControlPlugin';
   return ComboControlPlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(ComboControlPlugin);

package/lib/plugin/Form/ConditionBuilder.d.ts

@@ -1,5 +1,6 @@
 import { BasePlugin, BasicSubRenderInfo, RendererEventContext, ScaffoldForm, SubRendererInfo } from 'amis-editor-core';
 export declare class ConditionBilderPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;

package/lib/plugin/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -9,12 +9,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
-var _ = require('lodash');
+var isObject = require('lodash/isObject');
+var isString = require('lodash/isString');
 var defaultConfig = require('amis-ui/lib/components/condition-builder/config');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
+var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
 var defaultConfig__default = /*#__PURE__*/_interopDefaultLegacy(defaultConfig);
 
 var ConditionBilderPlugin = /** @class */function (_super) {
@@ -210,12 +213,12 @@ var ConditionBilderPlugin = /** @class */function (_super) {
                   joinValues: false,
                   extractValue: true,
                   options: (_c = defaultConfig__default["default"].types[data.type]) === null || _c === void 0 ? void 0 : _c.operators.map(function (item) {
-                    if (_.isObject(item) && item.label && item.value) {
+                    if (isObject__default["default"](item) && item.label && item.value) {
                       return {
                         label: item.label,
                         value: item.value
                       } || [];
-                    } else if (_.isString(item)) {
+                    } else if (isString__default["default"](item)) {
                       return {
                         label: defaultConfig.OperationMap[item],
                         value: item
@@ -260,6 +263,7 @@ var ConditionBilderPlugin = /** @class */function (_super) {
       };
     }
   };
+  ConditionBilderPlugin.id = 'ConditionBilderPlugin';
   return ConditionBilderPlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(ConditionBilderPlugin);

package/lib/plugin/Form/Control.d.ts

@@ -1,5 +1,6 @@
 import { BasePlugin, RegionConfig } from 'amis-editor-core';
 export declare class ControlPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;

package/lib/plugin/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -71,16 +71,17 @@ var ControlPlugin = /** @class */function (_super) {
                 return _this.manager.showRendererPanel(i18nRuntime.i18n("55b45c73ae417c4dead67905b1550e85"));
               },
               level: "danger",
-              tooltip: "\u63D2\u5165\u4E00\u4E2A\u65B0\u7684\u5143\u7D20",
+              tooltip: i18nRuntime.i18n("a00f44e570f896de5490cba9d2462951"),
               size: "sm",
               block: true
-            }, "\u65B0\u589E\u5143\u7D20")
+            }, i18nRuntime.i18n("a9a8efb2541ee6f89ea7b83e610ebf7f"))
           }, amisEditorCore.getSchemaTpl('labelRemark'), amisEditorCore.getSchemaTpl('remark'), amisEditorCore.getSchemaTpl('placeholder'), amisEditorCore.getSchemaTpl('description')]
         }
       });
     };
     return _this;
   }
+  ControlPlugin.id = 'ControlPlugin';
   return ControlPlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(ControlPlugin);

package/lib/plugin/Form/DiffEditor.d.ts

@@ -1,6 +1,7 @@
 import { BasePlugin } from 'amis-editor-core';
 import { RendererPluginEvent, RendererPluginAction } from 'amis-editor-core';
 export declare class DiffEditorControlPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;

package/lib/plugin/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -51,9 +51,15 @@ var DiffEditorControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'string',
-            title: i18nRuntime.i18n("efa3ddc1e26ed5d8cf7d9855cc7bd42e")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18nRuntime.i18n("ed85c3f659acc9e89bcf6f0dbaa02a62")
+              }
+            }
           }
         }
       }]
@@ -64,9 +70,15 @@ var DiffEditorControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'string',
-            title: i18nRuntime.i18n("efa3ddc1e26ed5d8cf7d9855cc7bd42e")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18nRuntime.i18n("ed85c3f659acc9e89bcf6f0dbaa02a62")
+              }
+            }
           }
         }
       }]
@@ -77,9 +89,15 @@ var DiffEditorControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'string',
-            title: i18nRuntime.i18n("efa3ddc1e26ed5d8cf7d9855cc7bd42e")
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18nRuntime.i18n("ed85c3f659acc9e89bcf6f0dbaa02a62")
+              }
+            }
           }
         }
       }]
@@ -186,6 +204,7 @@ var DiffEditorControlPlugin = /** @class */function (_super) {
     props.disabled = true;
     return props;
   };
+  DiffEditorControlPlugin.id = 'DiffEditorControlPlugin';
   return DiffEditorControlPlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(DiffEditorControlPlugin);

package/lib/plugin/Form/FieldSet.d.ts

@@ -1,5 +1,6 @@
 import { BasePlugin, RegionConfig } from 'amis-editor-core';
 export declare class FieldSetControlPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;

package/lib/plugin/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -114,7 +114,7 @@ var FieldSetControlPlugin = /** @class */function (_super) {
             // this.manager.showInsertPanel('body', context.id);
             _this.manager.showRendererPanel(i18nRuntime.i18n("55b45c73ae417c4dead67905b1550e85"), i18nRuntime.i18n("12b54e3fdccdbb5588785fce5534edbd"));
           }
-        }, "\u6DFB\u52A0\u5B50\u8868\u5355\u9879")
+        }, i18nRuntime.i18n("1297c46c0ea697a0041c3899b15d69c6"))
       }, amisEditorCore.getSchemaTpl('subFormItemMode'), amisEditorCore.getSchemaTpl('subFormHorizontalMode'), amisEditorCore.getSchemaTpl('subFormHorizontal')];
     };
     return _this;
@@ -123,6 +123,7 @@ var FieldSetControlPlugin = /** @class */function (_super) {
     props.collapsed = false;
     return props;
   };
+  FieldSetControlPlugin.id = 'FieldSetControlPlugin';
   return FieldSetControlPlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(FieldSetControlPlugin);

package/lib/plugin/Form/Form.d.ts

@@ -1,7 +1,9 @@
 import { BasePlugin, ChangeEventContext, PluginEvent, RegionConfig, ScaffoldForm } from 'amis-editor-core';
 import { EditorNodeType } from 'amis-editor-core';
 import { RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
+import { RendererConfig, Schema } from 'amis-core';
 export declare class FormPlugin extends BasePlugin {
+    static id: string;
     rendererName: string;
     $schema: string;
     name: string;
@@ -37,6 +39,10 @@ export declare class FormPlugin extends BasePlugin {
     actions: RendererPluginAction[];
     panelBodyCreator: (context: BaseEventContext) => any[];
     afterUpdate(event: PluginEvent<ChangeEventContext>): void;
-    buildDataSchemas(node: EditorNodeType, region: EditorNodeType): Promise<any>;
+    buildDataSchemas(node: EditorNodeType, region: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
     rendererBeforeDispatchEvent(node: EditorNodeType, e: any, data: any): void;
+    /**
+     * 为了让 form 的按钮可以点击编辑
+     */
+    patchSchema(schema: Schema, info: RendererConfig, props: any): any;
 }