amis-editor 5.2.3-beta.16 → 5.2.3

package/lib/plugin/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

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

@@ -5,6 +5,7 @@ export declare class FormulaControlPlugin extends BasePlugin {
     $schema: string;
     name: string;
     isBaseComponent: boolean;
+    disabledRendererPlugin: boolean;
     icon: string;
     pluginIcon: string;
     description: string;

package/lib/plugin/Form/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -41,6 +41,12 @@ var FormulaControlPlugin = /** @class */function (_super) {
       writable: true,
       value: true
     });
+    Object.defineProperty(_this, "disabledRendererPlugin", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: true
+    });
     Object.defineProperty(_this, "icon", {
       enumerable: true,
       configurable: true,

package/lib/plugin/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/Hidden.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputArray.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

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

@@ -14,6 +14,9 @@ export declare class CityControlPlugin extends BasePlugin {
         type: string;
         label: string;
         name: string;
+        allowCity: boolean;
+        allowDistrict: boolean;
+        extractValue: boolean;
     };
     previewSchema: any;
     notRenderFormZone: boolean;

package/lib/plugin/Form/InputCity.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -9,10 +9,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
+var cloneDeep = require('lodash/cloneDeep');
 var validator = require('../../validator.js');
 var helper = require('../../renderer/event-control/helper.js');
 var i18nRuntime = require('i18n-runtime');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
+
 var CityControlPlugin = /** @class */function (_super) {
   tslib.__extends(CityControlPlugin, _super);
   function CityControlPlugin() {
@@ -80,7 +85,10 @@ var CityControlPlugin = /** @class */function (_super) {
       value: {
         type: 'input-city',
         label: i18nRuntime.i18n("ba6a6f2cdb46e8f80fbfd4fed20eafac"),
-        name: 'city'
+        name: 'city',
+        allowCity: true,
+        allowDistrict: true,
+        extractValue: true
       }
     });
     Object.defineProperty(_this, "previewSchema", {
@@ -169,19 +177,45 @@ var CityControlPlugin = /** @class */function (_super) {
               rendererSchema: context === null || context === void 0 ? void 0 : context.schema,
               rendererWrapper: true,
               mode: 'vertical' // 改成上下展示模式
+            }), {
+              name: 'extractValue',
+              label: i18nRuntime.i18n("db0258df1ddbd88749b335aecdc8425e"),
+              type: 'button-group-select',
+              size: 'sm',
+              options: [{
+                label: '行政编码',
+                value: true
+              }, {
+                label: '对象结构',
+                value: false
+              }]
+            }, amisEditorCore.getSchemaTpl('switch', {
+              name: 'allowCity',
+              label: '可选城市',
+              pipeIn: amisEditorCore.defaultValue(true),
+              onChange: function (value, oldValue, item, form) {
+                if (!value) {
+                  var schema = cloneDeep__default["default"](form.data);
+                  form.setValueByName('allowDistrict', undefined);
+                  form.setValueByName('value', schema.extractValue ? '' : {});
+                }
+              }
             }), amisEditorCore.getSchemaTpl('switch', {
               name: 'allowDistrict',
-              label: i18nRuntime.i18n("9633e6be5ecb44fbd69b3e8328cc8430"),
-              pipeIn: amisEditorCore.defaultValue(true)
-            }), amisEditorCore.getSchemaTpl('switch', {
-              name: 'allowCity',
-              label: i18nRuntime.i18n("eec86dd33ae6186937da563fcde3555e"),
-              pipeIn: amisEditorCore.defaultValue(true)
+              label: i18nRuntime.i18n("1f1ca9df5fa3648c718ad04649888943"),
+              visibleOn: 'data.allowCity',
+              pipeIn: amisEditorCore.defaultValue(true),
+              onChange: function (value, oldValue, item, form) {
+                if (!value) {
+                  var schema = cloneDeep__default["default"](form.data);
+                  form.setValueByName('value', schema.extractValue ? '' : {});
+                }
+              }
             }), amisEditorCore.getSchemaTpl('switch', {
               name: 'searchable',
-              label: i18nRuntime.i18n("95892a76bc26c2db31087c9914e442b4"),
+              label: i18nRuntime.i18n("af9cbd3988196fc104af4fed9461e152"),
               pipeIn: amisEditorCore.defaultValue(false)
-            })]
+            }), amisEditorCore.getSchemaTpl('labelRemark'), amisEditorCore.getSchemaTpl('remark'), amisEditorCore.getSchemaTpl('description')]
           }, amisEditorCore.getSchemaTpl('status', {
             isFormItem: true
           }), amisEditorCore.getSchemaTpl('validation', {

package/lib/plugin/Form/InputColor.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputDate.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -391,7 +391,7 @@ var DateControlPlugin = /** @class */function (_super) {
             size: 'md',
             label: i18nRuntime.i18n("f0789e79d48f135e5d870753f7a85d05"),
             mode: 'row',
-            value: false,
+            pipeIn: amisEditorCore.defaultValue(false),
             options: [{
               label: i18nRuntime.i18n("a553741d5ebb9c80d7d2a63b202cf4b8"),
               value: false

package/lib/plugin/Form/InputDateRange.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -397,7 +397,7 @@ var DateRangeControlPlugin = /** @class */function (_super) {
             size: 'md',
             label: i18nRuntime.i18n("f0789e79d48f135e5d870753f7a85d05"),
             mode: 'row',
-            value: false,
+            pipeIn: amisEditorCore.defaultValue(false),
             options: [{
               label: i18nRuntime.i18n("a553741d5ebb9c80d7d2a63b202cf4b8"),
               value: false

package/lib/plugin/Form/InputDateTime.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputDateTimeRange.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputEmail.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputFile.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,4 +1,4 @@
-import { BasePlugin } from 'amis-editor-core';
+import { BasePlugin, BaseEventContext } from 'amis-editor-core';
 export declare class InputGroupControlPlugin extends BasePlugin {
     rendererName: string;
     $schema: string;
@@ -29,5 +29,14 @@ export declare class InputGroupControlPlugin extends BasePlugin {
     };
     previewSchema: any;
     panelTitle: string;
-    panelBody: any[][];
+    regions: {
+        key: string;
+        label: string;
+        preferTag: string;
+        renderMethod: string;
+        matchRegion: (elem: JSX.Element) => boolean;
+    }[];
+    notRenderFormZone: boolean;
+    panelJustify: boolean;
+    panelBodyCreator: (context: BaseEventContext) => any;
 }

package/lib/plugin/Form/InputGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -8,15 +8,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var React = require('react');
-var amis = require('amis');
 var amisEditorCore = require('amis-editor-core');
+var validator = require('../../validator.js');
 var i18nRuntime = require('i18n-runtime');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-
 var InputGroupControlPlugin = /** @class */function (_super) {
   tslib.__extends(InputGroupControlPlugin, _super);
   function InputGroupControlPlugin() {
@@ -114,44 +109,59 @@ var InputGroupControlPlugin = /** @class */function (_super) {
       writable: true,
       value: i18nRuntime.i18n("ff10d1d90be63fbcdc7377435bf18f96")
     });
-    Object.defineProperty(_this, "panelBody", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: [[amisEditorCore.getSchemaTpl('layout:originPosition', {
-        value: 'left-top'
-      }), {
-        name: 'body',
-        type: 'combo',
-        // label: '子按钮',
-        multiple: true,
-        addable: false,
-        draggable: true,
-        draggableTip: i18nRuntime.i18n("6651fec0511e3593d3438a113dff23d6"),
-        editable: false,
-        visibleOn: 'this.body && this.body.length',
-        items: [{
-          type: 'tpl',
-          inline: false,
-          className: 'p-t-xs',
-          tpl: '<%= data.label %><% if (data.icon) { %><i class="<%= data.icon %>"/><% }%>'
-        }]
-      }, {
-        children: React__default["default"].createElement(amis.Button, {
-          className: "m-b",
-          // TODO：需要限制一下 body 的类型，之前是这些 'text', 'url', 'email', 'password', 'select', 'date', 'time', 'date-time', 'date-range', 'formula', 'color', 'city', 'icon', 'plain', 'tpl', 'button', 'submit', 'reset'
-          onClick: function () {
-            // this.manager.showInsertPanel('body')
-            _this.manager.showRendererPanel(i18nRuntime.i18n("55b45c73ae417c4dead67905b1550e85")); // '请从左侧组件面板中点击添加表单项'
-          },
-          level: "danger",
-          tooltip: "\u63D2\u5165\u4E00\u4E2A\u65B0\u7684\u5143\u7D20",
-          size: "sm",
-          block: true
-        }, "\u65B0\u589E\u5143\u7D20")
-      }, amisEditorCore.getSchemaTpl('formItemName', {
-        required: true
-      })]]
+    Object.defineProperty(_this, "regions", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: [{
+        key: 'body',
+        label: i18nRuntime.i18n("132a78bdf68d6d17bde00aa807bbf032"),
+        preferTag: i18nRuntime.i18n("132a78bdf68d6d17bde00aa807bbf032"),
+        renderMethod: 'render',
+        matchRegion: function (elem) {
+          return !!elem;
+        }
+      }]
+    });
+    Object.defineProperty(_this, "notRenderFormZone", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: true
+    });
+    Object.defineProperty(_this, "panelJustify", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: true
+    });
+    Object.defineProperty(_this, "panelBodyCreator", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: function (context) {
+        return amisEditorCore.getSchemaTpl('tabs', [{
+          title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
+          body: amisEditorCore.getSchemaTpl('collapseGroup', [{
+            title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
+            body: [amisEditorCore.getSchemaTpl('label'), amisEditorCore.getSchemaTpl('labelRemark'), amisEditorCore.getSchemaTpl('remark'), amisEditorCore.getSchemaTpl('description')]
+          }, amisEditorCore.getSchemaTpl('status', {
+            isFormItem: true
+          }), amisEditorCore.getSchemaTpl('validation', {
+            tag: validator.ValidatorTag.MultiSelect
+          })])
+        }, {
+          title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
+          body: [amisEditorCore.getSchemaTpl('collapseGroup', [amisEditorCore.getSchemaTpl('style:formItem', {
+            renderer: context.info.renderer,
+            schema: [amisEditorCore.getSchemaTpl('switch', {
+              label: i18nRuntime.i18n("2fb0853874c2cc8cc42f0c7520af662a"),
+              name: 'inline',
+              pipeIn: amisEditorCore.defaultValue(false)
+            })]
+          }), amisEditorCore.getSchemaTpl('style:classNames')])]
+        }]);
+      }
     });
     return _this;
   }

package/lib/plugin/Form/InputImage.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputKV.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputMonth.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputMonthRange.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
 var validator = require('../../validator.js');
 var helper = require('../../renderer/event-control/helper.js');
+var mobxStateTree = require('mobx-state-tree');
 var i18nRuntime = require('i18n-runtime');
 
 var NumberControlPlugin = /** @class */function (_super) {
@@ -192,6 +193,7 @@ var NumberControlPlugin = /** @class */function (_super) {
       configurable: true,
       writable: true,
       value: function (context) {
+        var i18nEnabled = mobxStateTree.getEnv(window.editorStore).i18nEnabled;
         return amisEditorCore.getSchemaTpl('tabs', [{
           title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
           body: amisEditorCore.getSchemaTpl('collapseGroup', [{
@@ -237,7 +239,35 @@ var NumberControlPlugin = /** @class */function (_super) {
               label: amisEditorCore.tipedLabel(i18nRuntime.i18n("e284e64008fd8b066da04bca335d032a"), i18nRuntime.i18n("b317cbf67c94f986fc44cf4cbc2280c6")),
               min: 1,
               max: 100
-            }, amisEditorCore.getSchemaTpl('prefix'), amisEditorCore.getSchemaTpl('suffix'), amisEditorCore.getSchemaTpl('unitOptions'), amisEditorCore.getSchemaTpl('labelRemark'), amisEditorCore.getSchemaTpl('remark'), amisEditorCore.getSchemaTpl('placeholder'), amisEditorCore.getSchemaTpl('description'), amisEditorCore.getSchemaTpl('autoFillApi')]
+            }, amisEditorCore.getSchemaTpl('prefix'), amisEditorCore.getSchemaTpl('suffix'), amisEditorCore.getSchemaTpl('combo-container', {
+              type: 'combo',
+              label: i18nRuntime.i18n("7915dcc78c28ed3cda8fc949a86e4806"),
+              mode: 'normal',
+              name: 'unitOptions',
+              flat: true,
+              items: [{
+                placeholder: i18nRuntime.i18n("7915dcc78c28ed3cda8fc949a86e4806"),
+                type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+                name: 'text'
+              }],
+              draggable: false,
+              multiple: true,
+              pipeIn: function (value) {
+                if (!amisEditorCore.isObject(value)) {
+                  return Array.isArray(value) ? value : [];
+                }
+                var res = value.map(function (item) {
+                  return item.value;
+                });
+                return res;
+              },
+              pipeOut: function (value) {
+                if (!value.length) {
+                  return undefined;
+                }
+                return value;
+              }
+            }), amisEditorCore.getSchemaTpl('labelRemark'), amisEditorCore.getSchemaTpl('remark'), amisEditorCore.getSchemaTpl('placeholder'), amisEditorCore.getSchemaTpl('description'), amisEditorCore.getSchemaTpl('autoFillApi')]
           }, amisEditorCore.getSchemaTpl('status', {
             isFormItem: true
           }), amisEditorCore.getSchemaTpl('validation', {

package/lib/plugin/Form/InputPassword.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputQuarter.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputQuarterRange.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
 var validator = require('../../validator.js');
 var helper = require('../../renderer/event-control/helper.js');
+var mobxStateTree = require('mobx-state-tree');
 var i18nRuntime = require('i18n-runtime');
 
 var RateControlPlugin = /** @class */function (_super) {
@@ -165,6 +166,7 @@ var RateControlPlugin = /** @class */function (_super) {
       configurable: true,
       writable: true,
       value: function (context) {
+        var i18nEnabled = mobxStateTree.getEnv(window.editorStore).i18nEnabled;
         return amisEditorCore.getSchemaTpl('tabs', [{
           title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
           body: amisEditorCore.getSchemaTpl('collapseGroup', [{
@@ -203,7 +205,26 @@ var RateControlPlugin = /** @class */function (_super) {
               name: 'half',
               label: i18nRuntime.i18n("fa6f66437097fe23c948f4f9b78ecec0"),
               value: false
-            }), amisEditorCore.getSchemaTpl('labelRemark'), amisEditorCore.getSchemaTpl('remark'), amisEditorCore.getSchemaTpl('texts', {
+            }), amisEditorCore.getSchemaTpl('labelRemark'), amisEditorCore.getSchemaTpl('remark'), amisEditorCore.getSchemaTpl('combo-container', {
+              type: 'combo',
+              label: i18nRuntime.i18n("3bdd08adab6ea90b9164b20a0e4151ac"),
+              mode: 'normal',
+              name: 'texts',
+              items: [{
+                placeholder: 'Key',
+                type: 'input-number',
+                unique: true,
+                name: 'key',
+                columnClassName: 'w-xs flex-none',
+                min: 0,
+                step: 1,
+                max: 10,
+                precision: 0
+              }, {
+                placeholder: i18nRuntime.i18n("1a10cd6599219eafb615b34234cfc0b5"),
+                type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+                name: 'value'
+              }],
               draggable: false,
               multiple: true,
               pipeIn: function (value) {

package/lib/plugin/Form/InputRepeat.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputRichText.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 

package/lib/plugin/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */