amis-editor 5.2.3-beta.12 → 5.2.3

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

@@ -29,7 +29,7 @@ export declare class ConditionBilderPlugin extends BasePlugin {
             }[];
         })[];
     };
-    scaffoldForm: ScaffoldForm;
+    get scaffoldForm(): ScaffoldForm;
     previewSchema: any;
     panelTitle: string;
     panelBodyCreator: (context: BaseEventContext) => any[];

package/esm/plugin/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.12
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -7,6 +7,7 @@ import { __extends } from 'tslib';
 import { getSchemaTpl, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
 import { isObject, isString } from 'lodash';
 import defaultConfig, { OperationMap } from 'amis-ui/lib/components/condition-builder/config';
+import { getEnv } from 'mobx-state-tree';
 import { i18n } from 'i18n-runtime';
 
 var ConditionBilderPlugin = /** @class */function (_super) {
@@ -125,11 +126,39 @@ var ConditionBilderPlugin = /** @class */function (_super) {
         }]
       }
     });
-    Object.defineProperty(_this, "scaffoldForm", {
+    Object.defineProperty(_this, "previewSchema", {
       enumerable: true,
       configurable: true,
       writable: true,
       value: {
+        type: 'form',
+        mode: 'horizontal',
+        wrapWithPanel: false,
+        body: [_this.scaffold]
+      }
+    });
+    Object.defineProperty(_this, "panelTitle", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: i18n("6e87bfe16db746db13966f0d7552b052")
+    });
+    Object.defineProperty(_this, "panelBodyCreator", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: function (context) {
+        return [getSchemaTpl('layout:originPosition', {
+          value: 'left-top'
+        }), getSchemaTpl('source')];
+      }
+    });
+    return _this;
+  }
+  Object.defineProperty(ConditionBilderPlugin.prototype, "scaffoldForm", {
+    get: function () {
+      var i18nEnabled = getEnv(window.editorStore).i18nEnabled;
+      return {
         title: i18n("6d6b4f2bbd2fd0b5faee33673d7f06ae"),
         body: [{
           type: 'combo',
@@ -170,7 +199,7 @@ var ConditionBilderPlugin = /** @class */function (_super) {
               name: 'name',
               placeholder: i18n("d314558953b3c76adb7e131aaec8bd86")
             }, {
-              type: 'input-text',
+              type: i18nEnabled ? 'input-text-i18n' : 'input-text',
               placeholder: i18n("e996419dedc2f1ffd96e7a0e808127d0"),
               name: 'label'
             }]
@@ -219,7 +248,7 @@ var ConditionBilderPlugin = /** @class */function (_super) {
           }, {
             type: 'group',
             body: [{
-              type: 'input-text',
+              type: i18nEnabled ? 'input-text-i18n' : 'input-text',
               placeholder: i18n("4c1cff4d8c05daa6ed9352a241ee628c"),
               name: 'placeholder'
             }, {
@@ -263,37 +292,11 @@ var ConditionBilderPlugin = /** @class */function (_super) {
           }]
         }],
         canRebuild: true
-      }
-    });
-    Object.defineProperty(_this, "previewSchema", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: {
-        type: 'form',
-        mode: 'horizontal',
-        wrapWithPanel: false,
-        body: [_this.scaffold]
-      }
-    });
-    Object.defineProperty(_this, "panelTitle", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: i18n("6e87bfe16db746db13966f0d7552b052")
-    });
-    Object.defineProperty(_this, "panelBodyCreator", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: function (context) {
-        return [getSchemaTpl('layout:originPosition', {
-          value: 'left-top'
-        }), getSchemaTpl('source')];
-      }
-    });
-    return _this;
-  }
+      };
+    },
+    enumerable: false,
+    configurable: true
+  });
   Object.defineProperty(ConditionBilderPlugin.prototype, "buildSubRenderers", {
     enumerable: false,
     configurable: true,

package/esm/plugin/Form/Control.js

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

package/esm/plugin/Form/DiffEditor.js

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

package/esm/plugin/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.12
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -119,12 +119,7 @@ var FieldSetControlPlugin = /** @class */function (_super) {
       value: function (context) {
         return [getSchemaTpl('layout:originPosition', {
           value: 'left-top'
-        }), {
-          label: i18n("32c65d8d7431e76029678ec7bb73a5ab"),
-          name: 'title',
-          type: 'input-text'
-          // required: true
-        }, getSchemaTpl('switch', {
+        }), getSchemaTpl('title'), getSchemaTpl('switch', {
           name: 'collapsable',
           label: i18n("ec2a8ec81d1d2588db8c7827ba99e7d3"),
           pipeIn: defaultValue(false)

package/esm/plugin/Form/Form.d.ts

@@ -31,7 +31,7 @@ export declare class FormPlugin extends BasePlugin {
             type: string;
         }[];
     };
-    scaffoldForm: ScaffoldForm;
+    get scaffoldForm(): ScaffoldForm;
     regions: Array<RegionConfig>;
     panelTitle: string;
     events: RendererPluginEvent[];

package/esm/plugin/Form/Form.js

@@ -1,74 +1,78 @@
 /**
- * amis-editor v5.2.3-beta.12
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
-import { __extends, __spreadArray, __assign, __awaiter, __generator } from 'tslib';
+import { __extends, __assign, __spreadArray, __awaiter, __generator } from 'tslib';
 import { getSchemaTpl, defaultValue, jsonToJsonSchema, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
 import { setVariable } from 'amis-core';
 import { getEventControlConfig } from '../../renderer/event-control/helper.js';
+import { getEnv } from 'mobx-state-tree';
 import { i18n } from 'i18n-runtime';
 
-var formItemOptions = [{
-  name: 'type',
-  label: i18n("cd948961f71f87ecc72b251147d96144"),
-  type: 'select',
-  required: true,
-  options: [{
-    label: i18n("0766a6467bed7f2840871a5f0638669d"),
-    value: 'input-text'
+var getFormItemOptions = function (_a) {
+  var i18nEnabled = _a.i18nEnabled;
+  return [{
+    name: 'type',
+    label: i18n("cd948961f71f87ecc72b251147d96144"),
+    type: 'select',
+    required: true,
+    options: [{
+      label: i18n("0766a6467bed7f2840871a5f0638669d"),
+      value: 'input-text'
+    }, {
+      label: i18n("15d169d28cd48c97fe751e4cc92ca926"),
+      value: 'textarea'
+    }, {
+      label: i18n("829abe5a8dcd0579a340d20636b59276"),
+      value: 'group'
+    }, {
+      label: i18n("9597dcaf432ceba92a160d61cb1ef65f"),
+      value: 'input-number'
+    }, {
+      label: i18n("9913107b19cb6012250134ff91377430"),
+      value: 'radios'
+    }, {
+      label: i18n("454e60f5759903d7d3dba58e3f9bd590"),
+      value: 'checkbox'
+    }, {
+      label: i18n("db98f889ce6bc235e66bd4b2a788d137"),
+      value: 'checkboxes'
+    }, {
+      label: i18n("006ded9fa277cf030592021f595a07d5"),
+      value: 'select'
+    }, {
+      label: i18n("a6beb974cc0b50eebd18120b8110a88b"),
+      value: 'switch'
+    }, {
+      label: i18n("4ff1e74e43a3586339251494117185ad"),
+      value: 'input-date'
+    }, {
+      label: i18n("b339aa87104709397ba68e7ebbc6e5ba"),
+      value: 'input-table'
+    }, {
+      label: i18n("481e034e6026969aae4ce7ce7c8a7b6f"),
+      value: 'input-file'
+    }, {
+      label: i18n("6bfb9bb2218ff32b6139e98bc93707c0"),
+      value: 'input-image'
+    }, {
+      label: i18n("24b6d4c0892a8f3ee2a982e3ab0afe38"),
+      value: 'input-rich-text'
+    }]
   }, {
-    label: i18n("15d169d28cd48c97fe751e4cc92ca926"),
-    value: 'textarea'
+    name: 'label',
+    label: i18n("fdf6f7f6497556de440fe434b721ee99"),
+    type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+    hiddenOn: 'data.type === "group"'
   }, {
-    label: i18n("829abe5a8dcd0579a340d20636b59276"),
-    value: 'group'
-  }, {
-    label: i18n("9597dcaf432ceba92a160d61cb1ef65f"),
-    value: 'input-number'
-  }, {
-    label: i18n("9913107b19cb6012250134ff91377430"),
-    value: 'radios'
-  }, {
-    label: i18n("454e60f5759903d7d3dba58e3f9bd590"),
-    value: 'checkbox'
-  }, {
-    label: i18n("db98f889ce6bc235e66bd4b2a788d137"),
-    value: 'checkboxes'
-  }, {
-    label: i18n("006ded9fa277cf030592021f595a07d5"),
-    value: 'select'
-  }, {
-    label: i18n("a6beb974cc0b50eebd18120b8110a88b"),
-    value: 'switch'
-  }, {
-    label: i18n("4ff1e74e43a3586339251494117185ad"),
-    value: 'input-date'
-  }, {
-    label: i18n("b339aa87104709397ba68e7ebbc6e5ba"),
-    value: 'input-table'
-  }, {
-    label: i18n("481e034e6026969aae4ce7ce7c8a7b6f"),
-    value: 'input-file'
-  }, {
-    label: i18n("6bfb9bb2218ff32b6139e98bc93707c0"),
-    value: 'input-image'
-  }, {
-    label: i18n("24b6d4c0892a8f3ee2a982e3ab0afe38"),
-    value: 'input-rich-text'
-  }]
-}, {
-  name: 'label',
-  label: i18n("fdf6f7f6497556de440fe434b721ee99"),
-  type: 'input-text',
-  hiddenOn: 'data.type === "group"'
-}, {
-  name: 'name',
-  label: i18n("712538d3e674792ec94feb9a5eb2cc0a"),
-  required: true,
-  type: 'input-text',
-  hiddenOn: 'data.type === "group"'
-}];
+    name: 'name',
+    label: i18n("712538d3e674792ec94feb9a5eb2cc0a"),
+    required: true,
+    type: 'input-text',
+    hiddenOn: 'data.type === "group"'
+  }];
+};
 // 自动为form中子元素（单选框、复选框）补上默认options
 var autoAddOptions = function (values) {
   var _a;
@@ -77,10 +81,10 @@ var autoAddOptions = function (values) {
       if (formItem.type === 'radios' || formItem.type === 'checkboxes') {
         formItem.options = [{
           label: i18n("05f87b331e1c97691776d93a6598373f"),
-          value: "A"
+          value: 'A'
         }, {
           label: i18n("f38c0a46797523b11051e35ec0f82a42"),
-          value: "B"
+          value: 'B'
         }];
       } else if (formItem.type === 'form' || formItem.type === 'group') {
         autoAddOptions(formItem);
@@ -183,53 +187,6 @@ var FormPlugin = /** @class */function (_super) {
         }]
       }
     });
-    Object.defineProperty(_this, "scaffoldForm", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: {
-        title: i18n("1b6f9adf1e6a41a18b9a76407d945618"),
-        body: [getSchemaTpl('apiControl', {
-          label: i18n("380c80efc8d38510d31f50578690b781")
-        }), {
-          name: 'mode',
-          label: i18n("ffc2c1671eb7e3f6751006cd7a9961f4"),
-          type: 'button-group-select',
-          pipeIn: defaultValue('normal', false),
-          options: [{
-            label: i18n("81f8a50d084992815ab844109b3ea27f"),
-            value: 'normal'
-          }, {
-            label: i18n("3720b9ef8053b7b8a54c7d8ace051912"),
-            value: 'horizontal'
-          }, {
-            label: i18n("2dd25b8c21efbfee4a198787810d65d8"),
-            value: 'inline'
-          }]
-        }, {
-          label: i18n("9d68944682609cb230534195ca7c62ae"),
-          type: 'combo',
-          name: 'body',
-          multiple: true,
-          draggable: true,
-          multiLine: false,
-          items: __spreadArray(__spreadArray([], formItemOptions, true), [{
-            visibleOn: 'data.type === "group"',
-            type: 'combo',
-            name: 'body',
-            label: i18n("cf993a1d9c0352215055d180aca60b97"),
-            multiple: true,
-            draggable: true,
-            multiLine: true,
-            items: __spreadArray([], formItemOptions, true)
-          }], false)
-        }],
-        pipeOut: function (values) {
-          autoAddOptions(values);
-          return values;
-        }
-      }
-    });
     // scaffoldForm: ScaffoldForm = {
     //   title: '配置表单信息',
     //   body: [getSchemaTpl('api')],
@@ -427,19 +384,13 @@ var FormPlugin = /** @class */function (_super) {
           title: i18n("22b777e6fcb613b8ba83ced9594cd07e"),
           body: [getSchemaTpl('layout:originPosition', {
             value: 'left-top'
-          }), {
-            name: 'title',
-            type: 'input-text',
-            label: i18n("32c65d8d7431e76029678ec7bb73a5ab"),
+          }), getSchemaTpl('title', {
             visibleOn: "this.wrapWithPanel !== false"
-          }, {
-            name: 'submitText',
-            type: 'input-text',
-            label: i18n("60ad7d0d170b973ab9cdb0b23e636704"),
+          }), getSchemaTpl('submitText', {
             pipeIn: defaultValue(i18n("939d5345ad4345dbaabe14798f6ac0f1")),
             visibleOn: "this.wrapWithPanel !== false && !this.actions && (!Array.isArray(this.body) || !this.body.some(function(item) {return !!~['submit','button','reset','button-group'].indexOf(item.type);}))",
             description: i18n("a834505b13627a2e9eb4e0a0c2746e5c")
-          }, getSchemaTpl('switch', {
+          }), getSchemaTpl('switch', {
             name: 'autoFocus',
             label: i18n("cbef9ad64297efd7657d5b67b2112751"),
             labelRemark: {
@@ -680,27 +631,7 @@ var FormPlugin = /** @class */function (_super) {
             type: 'combo',
             multiLine: true,
             description: i18n("8a5e590f69e1ae52d86396410ceeee5a"),
-            items: [{
-              label: i18n("fb24383a41f23196349548b5d0cb98ce"),
-              name: 'fetchSuccess',
-              type: 'input-text'
-            }, {
-              label: i18n("62e3e15c8fb9038f2780329bc26e8bab"),
-              name: 'fetchFailed',
-              type: 'input-text'
-            }, {
-              label: i18n("b66ef8966dad62d377bc5310d8b88e7f"),
-              name: 'saveSuccess',
-              type: 'input-text'
-            }, {
-              label: i18n("cf538bbe1fb431f9e2668da4d84cfadf"),
-              name: 'saveFailed',
-              type: 'input-text'
-            }, {
-              label: i18n("6509e435d66db2a105b2444b1d3d0db1"),
-              name: 'validateFailed',
-              type: 'input-text'
-            }]
+            items: [getSchemaTpl('fetchSuccess'), getSchemaTpl('fetchFailed'), getSchemaTpl('saveSuccess'), getSchemaTpl('saveFailed'), getSchemaTpl('validateFailed')]
           }]
         }, {
           title: i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
@@ -764,6 +695,59 @@ var FormPlugin = /** @class */function (_super) {
     });
     return _this;
   }
+  Object.defineProperty(FormPlugin.prototype, "scaffoldForm", {
+    get: function () {
+      var i18nEnabled = getEnv(window.editorStore).i18nEnabled;
+      return {
+        title: i18n("1b6f9adf1e6a41a18b9a76407d945618"),
+        body: [getSchemaTpl('apiControl', {
+          label: i18n("380c80efc8d38510d31f50578690b781")
+        }), {
+          name: 'mode',
+          label: i18n("ffc2c1671eb7e3f6751006cd7a9961f4"),
+          type: 'button-group-select',
+          pipeIn: defaultValue('normal', false),
+          options: [{
+            label: i18n("81f8a50d084992815ab844109b3ea27f"),
+            value: 'normal'
+          }, {
+            label: i18n("3720b9ef8053b7b8a54c7d8ace051912"),
+            value: 'horizontal'
+          }, {
+            label: i18n("2dd25b8c21efbfee4a198787810d65d8"),
+            value: 'inline'
+          }]
+        }, {
+          label: i18n("9d68944682609cb230534195ca7c62ae"),
+          type: 'combo',
+          name: 'body',
+          multiple: true,
+          draggable: true,
+          multiLine: false,
+          items: __spreadArray(__spreadArray([], getFormItemOptions({
+            i18nEnabled: i18nEnabled
+          }), true), [{
+            visibleOn: 'data.type === "group"',
+            type: 'combo',
+            name: 'body',
+            label: i18n("cf993a1d9c0352215055d180aca60b97"),
+            multiple: true,
+            draggable: true,
+            multiLine: true,
+            items: __spreadArray([], getFormItemOptions({
+              i18nEnabled: i18nEnabled
+            }), true)
+          }], false)
+        }],
+        pipeOut: function (values) {
+          autoAddOptions(values);
+          return values;
+        }
+      };
+    },
+    enumerable: false,
+    configurable: true
+  });
   Object.defineProperty(FormPlugin.prototype, "afterUpdate", {
     enumerable: false,
     configurable: true,

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.12
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -37,6 +37,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/esm/plugin/Form/Group.js

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

package/esm/plugin/Form/Hidden.js

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

package/esm/plugin/Form/InputArray.js

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

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

@@ -1,10 +1,11 @@
 /**
- * amis-editor v5.2.3-beta.12
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
 import { __extends, __assign } from 'tslib';
 import { getSchemaTpl, defaultValue, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
+import cloneDeep from 'lodash/cloneDeep';
 import { ValidatorTag } from '../../validator.js';
 import { getEventControlConfig } from '../../renderer/event-control/helper.js';
 import { i18n } from 'i18n-runtime';
@@ -76,7 +77,10 @@ var CityControlPlugin = /** @class */function (_super) {
       value: {
         type: 'input-city',
         label: i18n("ba6a6f2cdb46e8f80fbfd4fed20eafac"),
-        name: 'city'
+        name: 'city',
+        allowCity: true,
+        allowDistrict: true,
+        extractValue: true
       }
     });
     Object.defineProperty(_this, "previewSchema", {
@@ -165,19 +169,45 @@ var CityControlPlugin = /** @class */function (_super) {
               rendererSchema: context === null || context === void 0 ? void 0 : context.schema,
               rendererWrapper: true,
               mode: 'vertical' // 改成上下展示模式
+            }), {
+              name: 'extractValue',
+              label: i18n("db0258df1ddbd88749b335aecdc8425e"),
+              type: 'button-group-select',
+              size: 'sm',
+              options: [{
+                label: '行政编码',
+                value: true
+              }, {
+                label: '对象结构',
+                value: false
+              }]
+            }, getSchemaTpl('switch', {
+              name: 'allowCity',
+              label: '可选城市',
+              pipeIn: defaultValue(true),
+              onChange: function (value, oldValue, item, form) {
+                if (!value) {
+                  var schema = cloneDeep(form.data);
+                  form.setValueByName('allowDistrict', undefined);
+                  form.setValueByName('value', schema.extractValue ? '' : {});
+                }
+              }
             }), getSchemaTpl('switch', {
               name: 'allowDistrict',
-              label: i18n("9633e6be5ecb44fbd69b3e8328cc8430"),
-              pipeIn: defaultValue(true)
-            }), getSchemaTpl('switch', {
-              name: 'allowCity',
-              label: i18n("eec86dd33ae6186937da563fcde3555e"),
-              pipeIn: defaultValue(true)
+              label: i18n("1f1ca9df5fa3648c718ad04649888943"),
+              visibleOn: 'data.allowCity',
+              pipeIn: defaultValue(true),
+              onChange: function (value, oldValue, item, form) {
+                if (!value) {
+                  var schema = cloneDeep(form.data);
+                  form.setValueByName('value', schema.extractValue ? '' : {});
+                }
+              }
             }), getSchemaTpl('switch', {
               name: 'searchable',
-              label: i18n("95892a76bc26c2db31087c9914e442b4"),
+              label: i18n("af9cbd3988196fc104af4fed9461e152"),
               pipeIn: defaultValue(false)
-            })]
+            }), getSchemaTpl('labelRemark'), getSchemaTpl('remark'), getSchemaTpl('description')]
           }, getSchemaTpl('status', {
             isFormItem: true
           }), getSchemaTpl('validation', {

package/esm/plugin/Form/InputColor.js

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

package/esm/plugin/Form/InputDate.js

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