amis-editor 5.4.1 → 5.6.0-beta.0

package/esm/plugin/Form/Combo.js

@@ -1,11 +1,11 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
 import { __extends, __assign, __awaiter, __generator } from 'tslib';
 import { getSchemaTpl, getI18nEnabled, tipedLabel, defaultValue, DSBuilderManager, mockValue, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
-import { setVariable } from 'amis-core';
+import { setVariable, someTree } from 'amis-core';
 import { ValidatorTag } from '../../validator.js';
 import { getArgsWrapper, getEventControlConfig } from '../../renderer/event-control/helper.js';
 import { i18n } from 'i18n-runtime';
@@ -83,9 +83,15 @@ var ComboControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
+          data: {
             type: 'object',
-            title: i18n("aacd80d2c978abae7b955510a938788c")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18n("e26f6832d586f9e73d2361573bf5273f")
+              }
+            }
           }
         }
       }]
@@ -96,17 +102,23 @@ var ComboControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.key': {
-            type: 'string',
-            title: i18n("0410242a74850f010a9a8061bc0cd891")
-          },
-          'event.data.value': {
-            type: 'string',
-            title: i18n("74333901ae9ad27a93487dc850e45609")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("28e5fd494ea37a09fd2ad36d0f98bacc")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              key: {
+                type: 'string',
+                title: i18n("91190195405845950230616929d852cf")
+              },
+              value: {
+                type: 'string',
+                title: i18n("e26f6832d586f9e73d2361573bf5273f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("28e5fd494ea37a09fd2ad36d0f98bacc")
+              }
+            }
           }
         }
       }]
@@ -117,17 +129,23 @@ var ComboControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.key': {
-            type: 'string',
-            title: i18n("b04c6cf9cb1212b9c173ddfeec129028")
-          },
-          'event.data.value': {
-            type: 'string',
-            title: i18n("74333901ae9ad27a93487dc850e45609")
-          },
-          'event.data.item': {
+          data: {
             type: 'object',
-            title: i18n("046de1a6cb21ff83af74958342c0db64")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              key: {
+                type: 'string',
+                title: i18n("b04c6cf9cb1212b9c173ddfeec129028")
+              },
+              value: {
+                type: 'string',
+                title: i18n("e26f6832d586f9e73d2361573bf5273f")
+              },
+              item: {
+                type: 'object',
+                title: i18n("046de1a6cb21ff83af74958342c0db64")
+              }
+            }
           }
         }
       }]
@@ -167,7 +185,6 @@ var ComboControlPlugin = /** @class */function (_super) {
         }, getSchemaTpl('formulaControl', {
           name: 'val',
           variables: '${variables}',
-          variableMode: 'tabs',
           inputMode: 'input-group'
         })]
       })
@@ -478,28 +495,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 __awaiter(this, void 0, void 0, function () {
+      var itemsSchema, items, parentScopeId, isColumnChild, scopeId, pool, current, schema, _k, _l, scopeId, scope;
+      return __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 = 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 = i18n("bf2a4fd8ecd654982e2d466f10f54d3f");
+                this.manager.dataSchema.current.group = 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*/, __assign(__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 __awaiter(this, void 0, void 0, function () {
       var scope, builder;
       return __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;
 }(BasePlugin);
 registerEditorPlugin(ComboControlPlugin);

package/esm/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/esm/plugin/Form/ConditionBuilder.js

@@ -1,11 +1,12 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
 import { __extends } from 'tslib';
 import { getSchemaTpl, getI18nEnabled, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
-import { isObject, isString } from 'lodash';
+import isObject from 'lodash/isObject';
+import isString from 'lodash/isString';
 import defaultConfig, { OperationMap } from 'amis-ui/lib/components/condition-builder/config';
 import { i18n } from 'i18n-runtime';
 
@@ -252,6 +253,7 @@ var ConditionBilderPlugin = /** @class */function (_super) {
       };
     }
   };
+  ConditionBilderPlugin.id = 'ConditionBilderPlugin';
   return ConditionBilderPlugin;
 }(BasePlugin);
 registerEditorPlugin(ConditionBilderPlugin);

package/esm/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/esm/plugin/Form/Control.js

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

package/esm/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/esm/plugin/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -47,9 +47,15 @@ var DiffEditorControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'string',
-            title: i18n("efa3ddc1e26ed5d8cf7d9855cc7bd42e")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18n("ed85c3f659acc9e89bcf6f0dbaa02a62")
+              }
+            }
           }
         }
       }]
@@ -60,9 +66,15 @@ var DiffEditorControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'string',
-            title: i18n("efa3ddc1e26ed5d8cf7d9855cc7bd42e")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18n("ed85c3f659acc9e89bcf6f0dbaa02a62")
+              }
+            }
           }
         }
       }]
@@ -73,9 +85,15 @@ var DiffEditorControlPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.value': {
-            type: 'string',
-            title: i18n("efa3ddc1e26ed5d8cf7d9855cc7bd42e")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: {
+                type: 'string',
+                title: i18n("ed85c3f659acc9e89bcf6f0dbaa02a62")
+              }
+            }
           }
         }
       }]
@@ -182,6 +200,7 @@ var DiffEditorControlPlugin = /** @class */function (_super) {
     props.disabled = true;
     return props;
   };
+  DiffEditorControlPlugin.id = 'DiffEditorControlPlugin';
   return DiffEditorControlPlugin;
 }(BasePlugin);
 registerEditorPlugin(DiffEditorControlPlugin);

package/esm/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/esm/plugin/Form/FieldSet.js

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

package/esm/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;
 }