amis-editor 5.6.0-beta.0 → 5.6.1

package/lib/plugin/Form/Checkbox.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -9,10 +10,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
+var amis = require('amis');
 var validator = require('../../validator.js');
 var helper = require('../../renderer/event-control/helper.js');
+var omit = require('lodash/omit');
 var i18nRuntime = require('i18n-runtime');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
+
 amisEditorCore.setSchemaTpl('option', {
   name: 'option',
   type: 'input-text',
@@ -108,30 +115,65 @@ var CheckboxControlPlugin = /** @class */function (_super) {
                 label: i18nRuntime.i18n("53235c46364db079356d57da5870f967"),
                 name: 'trueValue',
                 pipeIn: amisEditorCore.defaultValue(true),
-                pipeOut: amisEditorCore.valuePipeOut
+                pipeOut: amisEditorCore.valuePipeOut,
+                onChange: function (value, oldValue, model, form) {
+                  var _a;
+                  var defaultValue = (_a = form === null || form === void 0 ? void 0 : form.data) === null || _a === void 0 ? void 0 : _a.value;
+                  if (amis.isPureVariable(defaultValue)) {
+                    return;
+                  }
+                  if (oldValue === defaultValue) {
+                    form.setValues({
+                      value: value
+                    });
+                  }
+                }
               }, {
                 type: 'input-text',
                 label: i18nRuntime.i18n("56f3150f1713a5e5c6e7c55fb0b79b75"),
                 name: 'falseValue',
                 pipeIn: amisEditorCore.defaultValue(false),
-                pipeOut: amisEditorCore.valuePipeOut
+                pipeOut: amisEditorCore.valuePipeOut,
+                onChange: function (value, oldValue, model, form) {
+                  var _a = (form === null || form === void 0 ? void 0 : form.data) || {},
+                    defaultValue = _a.value,
+                    trueValue = _a.trueValue;
+                  if (amis.isPureVariable(defaultValue)) {
+                    return;
+                  }
+                  if (trueValue !== defaultValue) {
+                    form.setValues({
+                      value: value
+                    });
+                  }
+                }
               }]
             }
           }, amisEditorCore.getSchemaTpl('valueFormula', {
-            rendererSchema: tslib.__assign(tslib.__assign({}, context === null || context === void 0 ? void 0 : context.schema), {
+            rendererSchema: tslib.__assign(tslib.__assign({}, omit__default["default"](context === null || context === void 0 ? void 0 : context.schema, ['trueValue', 'falseValue'])), {
               type: 'switch'
             }),
             needDeleteProps: ['option'],
             label: i18nRuntime.i18n("7c7a88eb1bb4b40206c6c680bd8995a8"),
             rendererWrapper: true,
-            valueType: 'boolean'
-            // pipeIn: (value: any, data: any) => {
-            //   return value === (data?.data?.trueValue ?? true);
-            // },
-            // pipeOut: (value: any, origin: any, data: any) => {
-            //   const {trueValue = true, falseValue = false} = data;
-            //   return value ? trueValue : falseValue;
-            // }
+            valueType: 'boolean',
+            pipeIn: function (value, data) {
+              var _a, _b;
+              if (amis.isPureVariable(value)) {
+                return value;
+              }
+              return value === ((_b = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.trueValue) !== null && _b !== void 0 ? _b : true);
+            },
+            pipeOut: function (value, origin, data) {
+              if (amis.isPureVariable(value)) {
+                return value;
+              }
+              var _a = data.trueValue,
+                trueValue = _a === void 0 ? true : _a,
+                _b = data.falseValue,
+                falseValue = _b === void 0 ? false : _b;
+              return value ? trueValue : falseValue;
+            }
           }), amisEditorCore.getSchemaTpl('labelRemark'), amisEditorCore.getSchemaTpl('remark'), amisEditorCore.getSchemaTpl('description'), amisEditorCore.getSchemaTpl('autoFillApi', {
             trigger: 'change'
           })]
@@ -172,3 +214,4 @@ var CheckboxControlPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(CheckboxControlPlugin);
 
 exports.CheckboxControlPlugin = CheckboxControlPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Form/Checkboxes.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -129,7 +130,9 @@ var CheckboxesControlPlugin = /** @class */function (_super) {
               name: 'checkAllText'
             }]
           }], amisEditorCore.getSchemaTpl('valueFormula', {
-            rendererSchema: context === null || context === void 0 ? void 0 : context.schema,
+            rendererSchema: function (schema) {
+              return schema;
+            },
             useSelectMode: true,
             visibleOn: 'this.options && this.options.length > 0'
           }), amisEditorCore.getSchemaTpl('joinValues', {
@@ -143,25 +146,14 @@ var CheckboxesControlPlugin = /** @class */function (_super) {
           title: i18nRuntime.i18n("ea15ae2b7fba76c83eec6d0986d15197"),
           body: [amisEditorCore.getSchemaTpl('optionControlV2', {
             multiple: true
-          }), amisEditorCore.getSchemaTpl('creatable', {
-            formType: 'extend',
-            hiddenOnDefault: true,
-            form: {
-              body: [amisEditorCore.getSchemaTpl('createBtnLabel'), amisEditorCore.getSchemaTpl('addApi')]
-            }
-          }), amisEditorCore.getSchemaTpl('editable', {
-            formType: 'extend',
-            hiddenOnDefault: true,
-            form: {
-              body: [amisEditorCore.getSchemaTpl('editApi')]
-            }
-          }), amisEditorCore.getSchemaTpl('removable', {
-            formType: 'extend',
-            hiddenOnDefault: true,
-            form: {
-              body: [amisEditorCore.getSchemaTpl('deleteApi')]
-            }
-          })]
+          }), /** 新增选项 */
+          amisEditorCore.getSchemaTpl('optionAddControl', {
+            manager: _this.manager
+          }), /** 编辑选项 */
+          amisEditorCore.getSchemaTpl('optionEditControl', {
+            manager: _this.manager
+          }), /** 删除选项 */
+          amisEditorCore.getSchemaTpl('optionDeleteControl')]
         }, amisEditorCore.getSchemaTpl('status', {
           isFormItem: true
         }), amisEditorCore.getSchemaTpl('validation', {
@@ -183,41 +175,39 @@ var CheckboxesControlPlugin = /** @class */function (_super) {
     return _this;
   }
   CheckboxesControlPlugin.prototype.buildDataSchemas = function (node, region) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-    var type = util.resolveOptionType((_a = node.schema) === null || _a === void 0 ? void 0 : _a.options);
+    var _a;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    var type = util.resolveOptionType((_b = node.schema) === null || _b === void 0 ? void 0 : _b.options);
     // todo:异步数据case
     var dataSchema = {
       type: type,
-      title: ((_b = node.schema) === null || _b === void 0 ? void 0 : _b.label) || ((_c = node.schema) === null || _c === void 0 ? void 0 : _c.name),
-      originalValue: (_d = node.schema) === null || _d === void 0 ? void 0 : _d.value // 记录原始值，循环引用检测需要
+      title: ((_c = node.schema) === null || _c === void 0 ? void 0 : _c.label) || ((_d = node.schema) === null || _d === void 0 ? void 0 : _d.name),
+      originalValue: (_e = node.schema) === null || _e === void 0 ? void 0 : _e.value // 记录原始值，循环引用检测需要
     };
 
-    if (((_e = node.schema) === null || _e === void 0 ? void 0 : _e.joinValues) === false) {
+    if (((_f = node.schema) === null || _f === void 0 ? void 0 : _f.joinValues) === false) {
       dataSchema = tslib.__assign(tslib.__assign({}, dataSchema), {
         type: 'object',
-        title: ((_f = node.schema) === null || _f === void 0 ? void 0 : _f.label) || ((_g = node.schema) === null || _g === void 0 ? void 0 : _g.name),
-        properties: {
-          label: {
-            type: 'string',
-            title: i18nRuntime.i18n("97d07614380da93d257f9fbf81aa56fb")
-          },
-          value: {
-            type: type,
-            title: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d")
-          }
-        }
+        title: ((_g = node.schema) === null || _g === void 0 ? void 0 : _g.label) || ((_h = node.schema) === null || _h === void 0 ? void 0 : _h.name),
+        properties: (_a = {}, _a[((_j = node.schema) === null || _j === void 0 ? void 0 : _j.labelField) || 'label'] = {
+          type: 'string',
+          title: i18nRuntime.i18n("97d07614380da93d257f9fbf81aa56fb")
+        }, _a[((_k = node.schema) === null || _k === void 0 ? void 0 : _k.valueField) || 'value'] = {
+          type: type,
+          title: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d")
+        }, _a)
       });
     }
-    if ((_h = node.schema) === null || _h === void 0 ? void 0 : _h.multiple) {
-      if ((_j = node.schema) === null || _j === void 0 ? void 0 : _j.extractValue) {
+    if ((_l = node.schema) === null || _l === void 0 ? void 0 : _l.multiple) {
+      if ((_m = node.schema) === null || _m === void 0 ? void 0 : _m.extractValue) {
         dataSchema = {
           type: 'array',
-          title: ((_k = node.schema) === null || _k === void 0 ? void 0 : _k.label) || ((_l = node.schema) === null || _l === void 0 ? void 0 : _l.name)
+          title: ((_o = node.schema) === null || _o === void 0 ? void 0 : _o.label) || ((_p = node.schema) === null || _p === void 0 ? void 0 : _p.name)
         };
-      } else if (((_m = node.schema) === null || _m === void 0 ? void 0 : _m.joinValues) === false) {
+      } else if (((_q = node.schema) === null || _q === void 0 ? void 0 : _q.joinValues) === false) {
         dataSchema = {
           type: 'array',
-          title: ((_o = node.schema) === null || _o === void 0 ? void 0 : _o.label) || ((_p = node.schema) === null || _p === void 0 ? void 0 : _p.name),
+          title: ((_r = node.schema) === null || _r === void 0 ? void 0 : _r.label) || ((_s = node.schema) === null || _s === void 0 ? void 0 : _s.name),
           items: {
             type: 'object',
             title: i18nRuntime.i18n("ab5dea29793d933fa7b5487a7309df6a"),
@@ -235,3 +225,4 @@ var CheckboxesControlPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(CheckboxesControlPlugin);
 
 exports.CheckboxesControlPlugin = CheckboxesControlPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Form/CodeEditor.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -203,3 +204,4 @@ var CodeEditorControlPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(CodeEditorControlPlugin);
 
 exports.CodeEditorControlPlugin = CodeEditorControlPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,4 +1,5 @@
-import { BasePlugin, RendererPluginEvent, RendererPluginAction, RegionConfig, EditorNodeType, EditorManager, DSBuilderManager } from 'amis-editor-core';
+import { BasePlugin, RendererPluginEvent, RendererPluginAction, RegionConfig, EditorNodeType, EditorManager } from 'amis-editor-core';
+import { DSBuilderManager } from '../../builder/DSBuilderManager';
 export declare class ComboControlPlugin extends BasePlugin {
     static id: string;
     rendererName: string;
@@ -46,7 +47,7 @@ export declare class ComboControlPlugin extends BasePlugin {
     panelTitle: string;
     notRenderFormZone: boolean;
     panelJustify: boolean;
-    dsBuilderManager: DSBuilderManager;
+    dsManager: DSBuilderManager;
     constructor(manager: EditorManager);
     panelBodyCreator: (context: BaseEventContext) => any;
     filterProps(props: any): any;

package/lib/plugin/Form/Combo.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -8,8 +9,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var amisEditorCore = require('amis-editor-core');
 var amisCore = require('amis-core');
+var amisEditorCore = require('amis-editor-core');
+var DSBuilderManager = require('../../builder/DSBuilderManager.js');
 var validator = require('../../validator.js');
 var helper = require('../../renderer/event-control/helper.js');
 var i18nRuntime = require('i18n-runtime');
@@ -482,7 +484,7 @@ var ComboControlPlugin = /** @class */function (_super) {
         }, helper.getEventControlConfig(_this.manager, context)))]
       }]);
     };
-    _this.dsBuilderManager = new amisEditorCore.DSBuilderManager('combo', 'api');
+    _this.dsManager = new DSBuilderManager.DSBuilderManager(manager);
     return _this;
   }
   ComboControlPlugin.prototype.filterProps = function (props) {
@@ -576,10 +578,10 @@ var ComboControlPlugin = /** @class */function (_super) {
       return tslib.__generator(this, function (_c) {
         if (target.type === scopeNode.type || target.parent.isRegion && target.parent.region === 'items') {
           scope = scopeNode.parent.parent;
-          builder = this.dsBuilderManager.resolveBuilderBySchema(scope.schema, 'api');
+          builder = this.dsManager.getBuilderBySchema(scope.schema);
         }
         if (builder && scope.schema.api) {
-          return [2 /*return*/, builder.getAvailableContextFileds({
+          return [2 /*return*/, builder.getAvailableContextFields({
             schema: scope.schema,
             sourceKey: 'api',
             feat: (_b = (_a = scope.schema) === null || _a === void 0 ? void 0 : _a.feat) !== null && _b !== void 0 ? _b : 'List',
@@ -598,3 +600,4 @@ var ComboControlPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(ComboControlPlugin);
 
 exports.ComboControlPlugin = ComboControlPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Form/ConditionBuilder.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -269,3 +270,4 @@ var ConditionBilderPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(ConditionBilderPlugin);
 
 exports.ConditionBilderPlugin = ConditionBilderPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Form/Control.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -87,3 +88,4 @@ var ControlPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(ControlPlugin);
 
 exports.ControlPlugin = ControlPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Form/DiffEditor.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -210,3 +211,4 @@ var DiffEditorControlPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(DiffEditorControlPlugin);
 
 exports.DiffEditorControlPlugin = DiffEditorControlPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Form/FieldSet.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -129,3 +130,4 @@ var FieldSetControlPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(FieldSetControlPlugin);
 
 exports.FieldSetControlPlugin = FieldSetControlPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,18 +1,29 @@
-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';
+import { BasePlugin, ChangeEventContext, BaseEventContext, PluginEvent, EditorManager, RendererPluginAction, RendererPluginEvent, EditorNodeType, ScaffoldForm, RegionConfig } from 'amis-editor-core';
+import { DSFeatureType, DSBuilderManager } from '../../builder';
+import type { FormSchema } from 'amis/lib/Schema';
+import type { Schema, RendererConfig } from 'amis-core';
+export type FormPluginFeat = Extract<DSFeatureType, 'Insert' | 'Edit' | 'BulkEdit' | 'View'>;
+export interface ExtendFormSchema extends FormSchema {
+    feat?: FormPluginFeat;
+    dsType?: string;
+}
+/** 动态注册的控件 */
+export type FormDynamicControls = Partial<Record<string, (context: BaseEventContext) => any>>;
 export declare class FormPlugin extends BasePlugin {
     static id: string;
-    rendererName: string;
-    $schema: string;
     name: string;
+    panelTitle: string;
+    rendererName: string;
     isBaseComponent: boolean;
     description: string;
     docLink: string;
+    $schema: string;
     tags: string[];
+    order: number;
     icon: string;
     pluginIcon: string;
+    panelIcon: string;
+    panelJustify: boolean;
     scaffold: {
         type: string;
         title: string;
@@ -32,12 +43,24 @@ export declare class FormPlugin extends BasePlugin {
             type: string;
         }[];
     };
-    get scaffoldForm(): ScaffoldForm;
     regions: Array<RegionConfig>;
-    panelTitle: string;
     events: RendererPluginEvent[];
     actions: RendererPluginAction[];
+    Features: Array<{
+        label: string;
+        value: DSFeatureType;
+        disabled?: boolean;
+    }>;
+    dsManager: DSBuilderManager;
+    protected _dynamicControls: FormDynamicControls;
+    constructor(manager: EditorManager);
+    /** 表单脚手架 */
+    get scaffoldForm(): ScaffoldForm;
+    get dynamicControls(): FormDynamicControls;
+    set dynamicControls(controls: FormDynamicControls);
     panelBodyCreator: (context: BaseEventContext) => any[];
+    /** 重新构建 API */
+    panelFormPipeOut: (schema: any) => Promise<any>;
     afterUpdate(event: PluginEvent<ChangeEventContext>): void;
     buildDataSchemas(node: EditorNodeType, region: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
     rendererBeforeDispatchEvent(node: EditorNodeType, e: any, data: any): void;
@@ -45,4 +68,5 @@ export declare class FormPlugin extends BasePlugin {
      * 为了让 form 的按钮可以点击编辑
      */
     patchSchema(schema: Schema, info: RendererConfig, props: any): any;
+    getAvailableContextFields(scopeNode: EditorNodeType, target: EditorNodeType, region?: EditorNodeType): Promise<any>;
 }