amis-editor 5.7.0 → 6.0.0

package/esm/plugin/Form/NestedSelect.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
+ * amis-editor v6.0.0
+ * build time: 2023-12-29
  * Copyright 2018-2023 @fex
  */
 
@@ -8,7 +8,7 @@ import { __extends, __assign } from 'tslib';
 import { getSchemaTpl, tipedLabel, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
 import { ValidatorTag } from '../../validator.js';
 import { getEventControlConfig } from '../../renderer/event-control/helper.js';
-import { resolveOptionType } from '../../util.js';
+import { resolveOptionEventDataSchame, resolveOptionType } from '../../util.js';
 import { i18n } from 'i18n-runtime';
 
 var NestedSelectControlPlugin = /** @class */function (_super) {
@@ -100,59 +100,59 @@ var NestedSelectControlPlugin = /** @class */function (_super) {
       eventName: 'change',
       eventLabel: i18n("755955372bcc0c7ebf161a656bc389b3"),
       description: i18n("2fc76872efce1eabd3b74a3e4fd5b976"),
-      dataSchema: [{
-        type: 'object',
-        properties: {
-          data: {
-            type: 'object',
-            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
-            properties: {
-              value: {
-                type: 'string',
-                title: i18n("e48d65cda774019d9a6677354bc781f2")
+      dataSchema: function (manager) {
+        var value = resolveOptionEventDataSchame(manager).value;
+        return [{
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+              properties: {
+                value: value
               }
             }
           }
-        }
-      }]
+        }];
+      }
     }, {
       eventName: 'focus',
       eventLabel: i18n("ab0710b367acefa1d6a78e2338291e86"),
       description: i18n("4638e799b95e1b71edd55f278a6f707c"),
-      dataSchema: [{
-        type: 'object',
-        properties: {
-          data: {
-            type: 'object',
-            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
-            properties: {
-              value: {
-                type: 'string',
-                title: i18n("e48d65cda774019d9a6677354bc781f2")
+      dataSchema: function (manager) {
+        var value = resolveOptionEventDataSchame(manager).value;
+        return [{
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+              properties: {
+                value: value
               }
             }
           }
-        }
-      }]
+        }];
+      }
     }, {
       eventName: 'blur',
       eventLabel: i18n("fc96a5f1b79cb734afe08e401b6ba5e7"),
       description: i18n("c776ab86eb24f6b3db35114e43026f75"),
-      dataSchema: [{
-        type: 'object',
-        properties: {
-          data: {
-            type: 'object',
-            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
-            properties: {
-              value: {
-                type: 'string',
-                title: i18n("e48d65cda774019d9a6677354bc781f2")
+      dataSchema: function (manager) {
+        var value = resolveOptionEventDataSchame(manager).value;
+        return [{
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+              properties: {
+                value: value
               }
             }
           }
-        }
-      }]
+        }];
+      }
     }];
     // 动作定义
     _this.actions = [{
@@ -290,37 +290,37 @@ var NestedSelectControlPlugin = /** @class */function (_super) {
   }
   NestedSelectControlPlugin.prototype.buildDataSchemas = function (node, region) {
     var _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-    var type = resolveOptionType((_b = node.schema) === null || _b === void 0 ? void 0 : _b.options);
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var type = resolveOptionType(node.schema);
     // todo:异步数据case
     var dataSchema = {
       type: type,
-      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 // 记录原始值，循环引用检测需要
+      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 // 记录原始值，循环引用检测需要
     };
-    if (((_f = node.schema) === null || _f === void 0 ? void 0 : _f.joinValues) === false) {
+    if (((_e = node.schema) === null || _e === void 0 ? void 0 : _e.joinValues) === false) {
       dataSchema = __assign(__assign({}, dataSchema), {
         type: 'object',
-        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'] = {
+        title: ((_f = node.schema) === null || _f === void 0 ? void 0 : _f.label) || ((_g = node.schema) === null || _g === void 0 ? void 0 : _g.name),
+        properties: (_a = {}, _a[((_h = node.schema) === null || _h === void 0 ? void 0 : _h.labelField) || 'label'] = {
           type: 'string',
           title: i18n("97d07614380da93d257f9fbf81aa56fb")
-        }, _a[((_k = node.schema) === null || _k === void 0 ? void 0 : _k.valueField) || 'value'] = {
+        }, _a[((_j = node.schema) === null || _j === void 0 ? void 0 : _j.valueField) || 'value'] = {
           type: type,
           title: i18n("fe7509e0ed085b86f07e3e9975cc5b3d")
         }, _a)
       });
     }
-    if ((_l = node.schema) === null || _l === void 0 ? void 0 : _l.multiple) {
-      if ((_m = node.schema) === null || _m === void 0 ? void 0 : _m.extractValue) {
+    if ((_k = node.schema) === null || _k === void 0 ? void 0 : _k.multiple) {
+      if ((_l = node.schema) === null || _l === void 0 ? void 0 : _l.extractValue) {
         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: ((_m = node.schema) === null || _m === void 0 ? void 0 : _m.label) || ((_o = node.schema) === null || _o === void 0 ? void 0 : _o.name)
         };
-      } else if (((_q = node.schema) === null || _q === void 0 ? void 0 : _q.joinValues) === false) {
+      } else if (((_p = node.schema) === null || _p === void 0 ? void 0 : _p.joinValues) === false) {
         dataSchema = {
           type: 'array',
-          title: ((_r = node.schema) === null || _r === void 0 ? void 0 : _r.label) || ((_s = node.schema) === null || _s === void 0 ? void 0 : _s.name),
+          title: ((_q = node.schema) === null || _q === void 0 ? void 0 : _q.label) || ((_r = node.schema) === null || _r === void 0 ? void 0 : _r.name),
           items: {
             type: 'object',
             title: i18n("ab5dea29793d933fa7b5487a7309df6a"),
@@ -338,4 +338,4 @@ var NestedSelectControlPlugin = /** @class */function (_super) {
 registerEditorPlugin(NestedSelectControlPlugin);
 
 export { NestedSelectControlPlugin };
-window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};
+window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};

package/esm/plugin/Form/Picker.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
+ * amis-editor v6.0.0
+ * build time: 2023-12-29
  * Copyright 2018-2023 @fex
  */
 
@@ -9,8 +9,9 @@ import uniq from 'lodash/uniq';
 import get from 'lodash/get';
 import cloneDeep from 'lodash/cloneDeep';
 import { getSchemaTpl, tipedLabel, defaultValue, diff, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
+import { isPureVariable } from 'amis-core';
 import { getEventControlConfig } from '../../renderer/event-control/helper.js';
-import { resolveOptionType } from '../../util.js';
+import { resolveOptionEventDataSchame, resolveOptionType } from '../../util.js';
 import { ValidatorTag } from '../../validator.js';
 import { i18n } from 'i18n-runtime';
 
@@ -59,44 +60,47 @@ var PickerControlPlugin = /** @class */function (_super) {
       eventName: 'change',
       eventLabel: i18n("755955372bcc0c7ebf161a656bc389b3"),
       description: i18n("c75fde0e2d329ce62f55cb1a207181ae"),
-      dataSchema: [{
-        type: 'object',
-        properties: {
-          data: {
-            type: 'object',
-            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
-            properties: {
-              value: {
-                type: 'string',
-                title: i18n("e48d65cda774019d9a6677354bc781f2")
-              },
-              selectedItems: {
-                type: 'string',
-                title: i18n("b4e54cb84d448952a4aa1a17ceaa6ad3")
+      dataSchema: function (manager) {
+        var _a = resolveOptionEventDataSchame(manager),
+          value = _a.value,
+          selectedItems = _a.selectedItems;
+        return [{
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+              properties: {
+                value: value,
+                selectedItems: selectedItems
               }
             }
           }
-        }
-      }]
+        }];
+      }
     }, {
       eventName: 'itemClick',
       eventLabel: i18n("4ea280a2e54969de1d1b9bbd5b708e63"),
       description: i18n("f05520432bb87ced419a1da818c6cc9d"),
-      dataSchema: [{
-        type: 'object',
-        properties: {
-          data: {
-            type: 'object',
-            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
-            properties: {
-              item: {
-                type: 'object',
-                title: i18n("91f7b7fdf9b91073ca3519260f7a62d7")
+      dataSchema: function (manager) {
+        var itemSchema = resolveOptionEventDataSchame(manager).itemSchema;
+        return [{
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+              properties: {
+                item: {
+                  type: 'object',
+                  title: i18n("91f7b7fdf9b91073ca3519260f7a62d7"),
+                  properties: itemSchema
+                }
               }
             }
           }
-        }
-      }]
+        }];
+      }
     }];
     _this.panelJustify = true;
     _this.panelTitle = i18n("8fcbfdc1a9403f6339d81911473806da");
@@ -296,7 +300,11 @@ var PickerControlPlugin = /** @class */function (_super) {
           }, getSchemaTpl('multiple'), {
             type: 'ae-switch-more',
             formType: 'dialog',
+            name: 'overflowConfigSwitch',
             className: 'ae-switch-more-flex',
+            pipeIn: function (value) {
+              return !!value;
+            },
             label: tipedLabel(i18n("361f434f3b82973d6526efefbb538118"), i18n("deab2747ddf5310781cad655c4f7a50f")),
             form: {
               body: [{
@@ -321,7 +329,10 @@ var PickerControlPlugin = /** @class */function (_super) {
           title: i18n("ea15ae2b7fba76c83eec6d0986d15197"),
           body: [getSchemaTpl('optionControlV2'), getSchemaTpl('valueFormula', {
             mode: 'vertical',
-            rendererSchema: context === null || context === void 0 ? void 0 : context.schema,
+            rendererSchema: function (schema) {
+              return schema;
+            },
+            useSelectMode: true,
             label: tipedLabel(i18n("225f3ed00750ae78ad1e6ea42c8f5087"), "\u5F53\u5728fx\u4E2D\u914D\u7F6E\u591A\u9009\u503C\u65F6\uFF0C\u9700\u8981\u9002\u914D\u503C\u683C\u5F0F\uFF0C\u793A\u4F8B\uFF1A\n                  \u9009\u9879\u503C\u4E3A\n                  <pre>".concat(JSON.stringify([{
               label: i18n("05f87b331e1c97691776d93a6598373f"),
               value: 'A'
@@ -339,6 +350,14 @@ var PickerControlPlugin = /** @class */function (_super) {
             label: i18n("1ac065ed64b81380384a0b371d5b404f"),
             block: true,
             level: 'primary',
+            visibleOn: '!this.pickerSchema',
+            onClick: _this.editDetail.bind(_this, context.id)
+          }, {
+            type: 'button',
+            label: i18n("fb58b1b692e6cc562764f6969269f802"),
+            block: true,
+            level: 'primary',
+            visibleOn: 'this.pickerSchema',
             onClick: _this.editDetail.bind(_this, context.id)
           }]
         }, getSchemaTpl('status', {
@@ -481,13 +500,18 @@ var PickerControlPlugin = /** @class */function (_super) {
       mode: 'list'
     }, value.pickerSchema || {
       listItem: {
-        title: '${label}'
+        title: value.labelField ? '${' + value.labelField + '}' : '${label}'
       }
     }), {
-      api: value.source,
       pickerMode: true,
-      multiple: value.multiple
+      multiple: value.multiple,
+      labelField: value.labelField || 'label',
+      valueField: value.valueField || 'value'
     });
+    // 不支持上下文变量构建crud
+    if (!isPureVariable(value.source)) {
+      schema.api = value.source;
+    }
     this.manager.openSubEditor({
       title: i18n("1ac065ed64b81380384a0b371d5b404f"),
       value: schema,
@@ -509,37 +533,37 @@ var PickerControlPlugin = /** @class */function (_super) {
   };
   PickerControlPlugin.prototype.buildDataSchemas = function (node, region) {
     var _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-    var type = resolveOptionType((_b = node.schema) === null || _b === void 0 ? void 0 : _b.options);
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    var type = resolveOptionType(node.schema);
     // todo:异步数据case
     var dataSchema = {
       type: type,
-      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 // 记录原始值，循环引用检测需要
+      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 // 记录原始值，循环引用检测需要
     };
-    if (((_f = node.schema) === null || _f === void 0 ? void 0 : _f.joinValues) === false) {
+    if (((_e = node.schema) === null || _e === void 0 ? void 0 : _e.joinValues) === false) {
       dataSchema = __assign(__assign({}, dataSchema), {
         type: 'object',
-        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'] = {
+        title: ((_f = node.schema) === null || _f === void 0 ? void 0 : _f.label) || ((_g = node.schema) === null || _g === void 0 ? void 0 : _g.name),
+        properties: (_a = {}, _a[((_h = node.schema) === null || _h === void 0 ? void 0 : _h.labelField) || 'label'] = {
           type: 'string',
           title: i18n("97d07614380da93d257f9fbf81aa56fb")
-        }, _a[((_k = node.schema) === null || _k === void 0 ? void 0 : _k.valueField) || 'value'] = {
+        }, _a[((_j = node.schema) === null || _j === void 0 ? void 0 : _j.valueField) || 'value'] = {
           type: type,
           title: i18n("fe7509e0ed085b86f07e3e9975cc5b3d")
         }, _a)
       });
     }
-    if ((_l = node.schema) === null || _l === void 0 ? void 0 : _l.multiple) {
-      if ((_m = node.schema) === null || _m === void 0 ? void 0 : _m.extractValue) {
+    if ((_k = node.schema) === null || _k === void 0 ? void 0 : _k.multiple) {
+      if ((_l = node.schema) === null || _l === void 0 ? void 0 : _l.extractValue) {
         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: ((_m = node.schema) === null || _m === void 0 ? void 0 : _m.label) || ((_o = node.schema) === null || _o === void 0 ? void 0 : _o.name)
         };
-      } else if (((_q = node.schema) === null || _q === void 0 ? void 0 : _q.joinValues) === false) {
+      } else if (((_p = node.schema) === null || _p === void 0 ? void 0 : _p.joinValues) === false) {
         dataSchema = {
           type: 'array',
-          title: ((_r = node.schema) === null || _r === void 0 ? void 0 : _r.label) || ((_s = node.schema) === null || _s === void 0 ? void 0 : _s.name),
+          title: ((_q = node.schema) === null || _q === void 0 ? void 0 : _q.label) || ((_r = node.schema) === null || _r === void 0 ? void 0 : _r.name),
           items: {
             type: 'object',
             title: i18n("ab5dea29793d933fa7b5487a7309df6a"),
@@ -557,4 +581,4 @@ var PickerControlPlugin = /** @class */function (_super) {
 registerEditorPlugin(PickerControlPlugin);
 
 export { PickerControlPlugin };
-window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};
+window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};

package/esm/plugin/Form/Radios.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
+ * amis-editor v6.0.0
+ * build time: 2023-12-29
  * Copyright 2018-2023 @fex
  */
 
@@ -8,7 +8,7 @@ import { __extends, __assign } from 'tslib';
 import { getSchemaTpl, defaultValue, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
 import { ValidatorTag } from '../../validator.js';
 import { getEventControlConfig } from '../../renderer/event-control/helper.js';
-import { resolveOptionType } from '../../util.js';
+import { resolveOptionEventDataSchame, resolveOptionType } from '../../util.js';
 import { i18n } from 'i18n-runtime';
 
 var RadiosControlPlugin = /** @class */function (_super) {
@@ -54,29 +54,26 @@ var RadiosControlPlugin = /** @class */function (_super) {
       eventName: 'change',
       eventLabel: i18n("755955372bcc0c7ebf161a656bc389b3"),
       description: i18n("2fc76872efce1eabd3b74a3e4fd5b976"),
-      dataSchema: [{
-        type: 'object',
-        properties: {
-          data: {
-            type: 'object',
-            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
-            properties: {
-              value: {
-                type: 'string',
-                title: i18n("e48d65cda774019d9a6677354bc781f2")
-              },
-              selectedItems: {
-                type: 'object',
-                title: i18n("029e280e119b028bffc51424d909c07d")
-              },
-              items: {
-                type: 'array',
-                title: i18n("b2a18e08b0b0e0fd7e80554b89244aa0")
+      dataSchema: function (manager) {
+        var _a = resolveOptionEventDataSchame(manager, false),
+          value = _a.value,
+          selectedItems = _a.selectedItems,
+          items = _a.items;
+        return [{
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+              properties: {
+                value: value,
+                selectedItems: selectedItems,
+                items: items
               }
             }
           }
-        }
-      }]
+        }];
+      }
     }];
     // 动作定义
     _this.actions = [{
@@ -161,22 +158,22 @@ var RadiosControlPlugin = /** @class */function (_super) {
   }
   RadiosControlPlugin.prototype.buildDataSchemas = function (node, region) {
     var _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    var type = resolveOptionType((_b = node.schema) === null || _b === void 0 ? void 0 : _b.options);
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var type = resolveOptionType(node.schema);
     // todo:异步数据case
     var dataSchema = {
       type: type,
-      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 // 记录原始值，循环引用检测需要
+      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 // 记录原始值，循环引用检测需要
     };
-    if (((_f = node.schema) === null || _f === void 0 ? void 0 : _f.joinValues) === false) {
+    if (((_e = node.schema) === null || _e === void 0 ? void 0 : _e.joinValues) === false) {
       dataSchema = __assign(__assign({}, dataSchema), {
         type: 'object',
-        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'] = {
+        title: ((_f = node.schema) === null || _f === void 0 ? void 0 : _f.label) || ((_g = node.schema) === null || _g === void 0 ? void 0 : _g.name),
+        properties: (_a = {}, _a[((_h = node.schema) === null || _h === void 0 ? void 0 : _h.labelField) || 'label'] = {
           type: 'string',
           title: i18n("97d07614380da93d257f9fbf81aa56fb")
-        }, _a[((_k = node.schema) === null || _k === void 0 ? void 0 : _k.valueField) || 'value'] = {
+        }, _a[((_j = node.schema) === null || _j === void 0 ? void 0 : _j.valueField) || 'value'] = {
           type: type,
           title: i18n("fe7509e0ed085b86f07e3e9975cc5b3d")
         }, _a)
@@ -191,4 +188,4 @@ var RadiosControlPlugin = /** @class */function (_super) {
 registerEditorPlugin(RadiosControlPlugin);
 
 export { RadiosControlPlugin };
-window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};
+window.amisEditorVersionInfo={version:'6.0.0',buildTime:'2023-12-29'};