amis-editor 5.2.1-beta.33 → 5.2.1-beta.35

package/lib/renderer/style-control/Background.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/Border.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/BoxModel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/BoxShadow.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/Display.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/Font.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/InsetBoxModel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/font-family.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/transformation.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/textarea-formula/FormulaPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/textarea-formula/TextareaFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/textarea-formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/textarea-formula/utils.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 
@@ -487,3 +487,66 @@ amisEditorCore.setSchemaTpl('actionApiControl', function (patch) {
     } : undefined
   }, rest);
 });
+amisEditorCore.setSchemaTpl('loadingConfig', function (patch, _a) {
+  var context = _a.context;
+  var globalSelector = '';
+  var parent = context.node.parent;
+  while (parent && !globalSelector) {
+    var parentNodeType = parent.type;
+    if (parentNodeType === 'dialog' || parentNodeType === 'drawer') {
+      globalSelector = '[role=dialog-body]';
+    } else if (parentNodeType === 'page') {
+      globalSelector = '[role=page-body]';
+    }
+    parent = parent.parent;
+  }
+  return tslib.__assign(tslib.__assign({
+    name: 'loadingConfig',
+    type: 'select',
+    label: i18nRuntime.i18n("5a4e41af91746f8a3905aa9f66048955"),
+    options: [{
+      label: i18nRuntime.i18n("6ade3082696deb00357f5c0359093cd4"),
+      value: 1 /* LoadingOption.MERGE */
+    }, {
+      label: i18nRuntime.i18n("b6ac896eff6a6502e4ae7079b3e507a5"),
+      value: 0 /* LoadingOption.HIDDEN */
+    }, {
+      label: i18nRuntime.i18n("0e9ffe1f1cf3f7a620970ea75dba9f39"),
+      value: 2 /* LoadingOption.GLOBAL */
+    }]
+  }, patch), {
+    pipeOut: function (value) {
+      switch (value) {
+        case 0 /* LoadingOption.HIDDEN */:
+          return {
+            show: false
+          };
+        case 2 /* LoadingOption.GLOBAL */:
+          return {
+            show: true,
+            root: globalSelector
+          };
+        case 1 /* LoadingOption.MERGE */:
+          return {
+            show: true
+          };
+        default:
+          return {};
+      }
+    },
+    pipeIn: function (value) {
+      if (value === void 0) {
+        value = {};
+      }
+      if (value.root) {
+        return 2 /* LoadingOption.GLOBAL */;
+      }
+
+      if (value.show === false) {
+        return 0 /* LoadingOption.HIDDEN */;
+      }
+
+      return 1 /* LoadingOption.MERGE */;
+    }
+  });
+});

package/lib/tpl/common.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/horizontal.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 
@@ -187,6 +187,28 @@ amisEditorCore.setSchemaTpl('layout:display', function (config) {
 });
 // 主轴排列方向
 amisEditorCore.setSchemaTpl('layout:justifyContent', function (config) {
+  var defaultOptions = [{
+    label: i18nRuntime.i18n("4ba6c2256050d805ae5cd1e0e84737cf"),
+    value: 'flex-start'
+  }, {
+    label: i18nRuntime.i18n("56c17ba6a56c01706ae00a31611deb03"),
+    value: 'center'
+  }, {
+    label: i18nRuntime.i18n("abeb360ab1e66534a041fb8b44e1a00e"),
+    value: 'flex-end'
+  }, {
+    label: i18nRuntime.i18n("d5a3cb1cc31a0469b011abdbd3e947f7"),
+    value: 'space-around'
+  }, {
+    label: i18nRuntime.i18n("85530444a72a840ee657e2df99970136"),
+    value: 'space-between'
+  }, {
+    label: i18nRuntime.i18n("9aad08fbd356fb4279f0efa81b3d016e"),
+    value: 'space-evenly'
+  }, {
+    label: i18nRuntime.i18n("ae558cbf4c35d381b6542f517f2e8dff"),
+    value: 'stretch'
+  }];
   var configSchema = {
     type: 'select',
     label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel("\u6C34\u5E73\u5BF9\u9F50\u65B9\u5F0F", i18nRuntime.i18n("0a0574baedb8eb2abf7daf25159d8bb1")),
@@ -195,28 +217,7 @@ amisEditorCore.setSchemaTpl('layout:justifyContent', function (config) {
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
-    options: [{
-      label: i18nRuntime.i18n("4ba6c2256050d805ae5cd1e0e84737cf"),
-      value: 'flex-start'
-    }, {
-      label: i18nRuntime.i18n("56c17ba6a56c01706ae00a31611deb03"),
-      value: 'center'
-    }, {
-      label: i18nRuntime.i18n("abeb360ab1e66534a041fb8b44e1a00e"),
-      value: 'flex-end'
-    }, {
-      label: i18nRuntime.i18n("d5a3cb1cc31a0469b011abdbd3e947f7"),
-      value: 'space-around'
-    }, {
-      label: i18nRuntime.i18n("85530444a72a840ee657e2df99970136"),
-      value: 'space-between'
-    }, {
-      label: i18nRuntime.i18n("9aad08fbd356fb4279f0efa81b3d016e"),
-      value: 'space-evenly'
-    }, {
-      label: i18nRuntime.i18n("ae558cbf4c35d381b6542f517f2e8dff"),
-      value: 'stretch'
-    }]
+    options: (config === null || config === void 0 ? void 0 : config.options) || defaultOptions
   };
   if ((config === null || config === void 0 ? void 0 : config.mode) === 'vertical') {
     // 上下展示，可避免 自定义渲染器 出现挤压
@@ -233,6 +234,22 @@ amisEditorCore.setSchemaTpl('layout:justifyContent', function (config) {
 });
 // 交叉轴排列方向
 amisEditorCore.setSchemaTpl('layout:alignItems', function (config) {
+  var defaultOptions = [{
+    label: i18nRuntime.i18n("4ba6c2256050d805ae5cd1e0e84737cf"),
+    value: 'flex-start'
+  }, {
+    label: i18nRuntime.i18n("56c17ba6a56c01706ae00a31611deb03"),
+    value: 'center'
+  }, {
+    label: i18nRuntime.i18n("abeb360ab1e66534a041fb8b44e1a00e"),
+    value: 'flex-end'
+  }, {
+    label: i18nRuntime.i18n("ed97c73866617b40a7b1215867e0f489"),
+    value: 'baseline'
+  }, {
+    label: i18nRuntime.i18n("7ac1519928de413cfe36f5d2e0610430"),
+    value: 'stretch'
+  }];
   var configSchema = {
     type: 'select',
     label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel("\u5782\u76F4\u5BF9\u9F50\u65B9\u5F0F", i18nRuntime.i18n("5ccc4c05cd41195f202f550a4c307a64")),
@@ -241,22 +258,7 @@ amisEditorCore.setSchemaTpl('layout:alignItems', function (config) {
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
-    options: [{
-      label: i18nRuntime.i18n("4ba6c2256050d805ae5cd1e0e84737cf"),
-      value: 'flex-start'
-    }, {
-      label: i18nRuntime.i18n("56c17ba6a56c01706ae00a31611deb03"),
-      value: 'center'
-    }, {
-      label: i18nRuntime.i18n("abeb360ab1e66534a041fb8b44e1a00e"),
-      value: 'flex-end'
-    }, {
-      label: i18nRuntime.i18n("ed97c73866617b40a7b1215867e0f489"),
-      value: 'baseline'
-    }, {
-      label: i18nRuntime.i18n("7ac1519928de413cfe36f5d2e0610430"),
-      value: 'stretch'
-    }]
+    options: (config === null || config === void 0 ? void 0 : config.options) || defaultOptions
   };
   if ((config === null || config === void 0 ? void 0 : config.mode) === 'vertical') {
     return {
@@ -331,27 +333,51 @@ amisEditorCore.setSchemaTpl('layout:flex-wrap', function (config) {
 // 弹性模式
 amisEditorCore.setSchemaTpl('layout:flex', function (config) {
   return {
-    type: 'switch',
-    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("ee2df1c1a0d99094f641166535948d4b"), i18nRuntime.i18n("3587540660a01f8a8aff6a2c0409a404")),
+    type: 'button-group-select',
+    size: 'xs',
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.flex',
+    options: [{
+      label: i18nRuntime.i18n("091885db07e43ff7cbe60c3b664b0b50"),
+      value: '1 1 auto'
+    }, {
+      label: i18nRuntime.i18n("1ef8fd21130d17cb7c1613eaed6ca1e4"),
+      value: '0 0 150px'
+    }, {
+      label: i18nRuntime.i18n("363165ccee78341a65f1d42174e8b08f"),
+      value: '0 0 auto'
+    }],
+    label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("eb44269adb6ba70569cd62ea88cb2750"),
     value: (config === null || config === void 0 ? void 0 : config.value) || '0 0 auto',
-    trueValue: '1 1 auto',
-    falseValue: '0 0 auto',
-    onText: (config === null || config === void 0 ? void 0 : config.onText) || i18nRuntime.i18n("cc42dd3170fdf36bdc2b0f58ab23eb84"),
-    offText: (config === null || config === void 0 ? void 0 : config.offText) || i18nRuntime.i18n("b15d91274e9fc68608c609999e0413fa"),
     inputClassName: 'inline-flex justify-between',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     onChange: function (value, oldValue, model, form) {
-      if (!value || value === '0 0 auto') {
-        // 固定宽度模式下，剔除占比设置
+      if (value === '1 1 auto') {
+        // 弹性
+        if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
+          form.setValueByName('style.overflowY', 'auto');
+          form.setValueByName('style.height', undefined);
+        } else {
+          form.setValueByName('style.overflowX', 'auto');
+          form.setValueByName('style.width', undefined);
+        }
+      } else if (value === '0 0 150px') {
+        // 固定
         form.setValueByName('style.flexGrow', undefined);
-      }
-      if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
-        form.setValueByName('style.overflowY', 'auto');
-        form.setValueByName('style.height', undefined);
-      } else {
-        form.setValueByName('style.overflowX', 'auto');
-        form.setValueByName('style.width', undefined);
+        form.setValueByName('style.flexBasis', '150px');
+        if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
+          form.setValueByName('style.height', undefined);
+        } else {
+          form.setValueByName('style.width', undefined);
+        }
+      } else if (value === '0 0 auto') {
+        // 适配
+        form.setValueByName('style.flexGrow', undefined);
+        form.setValueByName('style.flexBasis', undefined);
+        if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
+          form.setValueByName('style.height', undefined);
+        } else {
+          form.setValueByName('style.width', undefined);
+        }
       }
     }
   };
@@ -395,11 +421,20 @@ amisEditorCore.setSchemaTpl('layout:flex-grow', function (config) {
 });
 // 是否固定宽度: isFixedWidth 配置:
 amisEditorCore.setSchemaTpl('layout:isFixedWidth', function (config) {
+  var _a;
   return {
-    type: 'switch',
-    label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("b591aed69defa2abf0486da6a58dfb5e"),
+    type: 'button-group-select',
+    label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("a170a375b264f7fe0c02a7ca8c268784"),
+    size: 'xs',
     name: (config === null || config === void 0 ? void 0 : config.name) || 'isFixedWidth',
-    value: (config === null || config === void 0 ? void 0 : config.value) || false,
+    options: [{
+      label: i18nRuntime.i18n("1ef8fd21130d17cb7c1613eaed6ca1e4"),
+      value: true
+    }, {
+      label: i18nRuntime.i18n("363165ccee78341a65f1d42174e8b08f"),
+      value: false
+    }],
+    value: (_a = config === null || config === void 0 ? void 0 : config.value) !== null && _a !== void 0 ? _a : false,
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     inputClassName: 'inline-flex justify-between',
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
@@ -514,11 +549,20 @@ amisEditorCore.setSchemaTpl('layout:overflow-x', function (config) {
 });
 // 是否固定高度: isFixedHeight 配置:
 amisEditorCore.setSchemaTpl('layout:isFixedHeight', function (config) {
+  var _a;
   return {
-    type: 'switch',
-    label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("c19b79073b676b9bade80613aba2dbfa"),
+    type: 'button-group-select',
+    label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("f02f876ee64cc016d97fa4dc498d4857"),
+    size: 'xs',
     name: (config === null || config === void 0 ? void 0 : config.name) || 'isFixedHeight',
-    value: (config === null || config === void 0 ? void 0 : config.value) || false,
+    options: [{
+      label: i18nRuntime.i18n("1ef8fd21130d17cb7c1613eaed6ca1e4"),
+      value: true
+    }, {
+      label: i18nRuntime.i18n("363165ccee78341a65f1d42174e8b08f"),
+      value: false
+    }],
+    value: (_a = config === null || config === void 0 ? void 0 : config.value) !== null && _a !== void 0 ? _a : false,
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     inputClassName: 'inline-flex justify-between',
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
@@ -715,3 +759,62 @@ amisEditorCore.setSchemaTpl('layout:originPosition', function (config) {
     return configSchema;
   }
 });
+// 吸附位置配置项
+amisEditorCore.setSchemaTpl('layout:sorption', {
+  type: 'button-group-select',
+  label: i18nRuntime.i18n("7d30297d4e1f310c73b27be88c748026"),
+  size: 'xs',
+  name: 'sorptionPosition',
+  options: [{
+    label: i18nRuntime.i18n("2ea76e2ffc1b92911d6f7decfa993360"),
+    value: 'top'
+  }, {
+    label: i18nRuntime.i18n("8cfc818a76662085cb64752d6d592fbe"),
+    value: 'bottom'
+  }],
+  onChange: function (value, oldValue, model, form) {
+    if (value === 'top') {
+      form.setValueByName('style.inset', '0 auto auto 0');
+    } else if (value === 'bottom') {
+      form.setValueByName('style.inset', 'auto auto 0 0');
+    }
+  }
+});
+// 滚动吸附配置项
+amisEditorCore.setSchemaTpl('layout:sticky', {
+  type: 'switch',
+  label: amisEditorCore.tipedLabel(i18nRuntime.i18n("e2f6535e21570a0703c7c65f41b30eaa"), i18nRuntime.i18n("1c5ea0ffb2b15713cb22c41a02576924")),
+  name: 'stickyStatus',
+  inputClassName: 'inline-flex justify-between',
+  onChange: function (value, oldValue, model, form) {
+    if (value) {
+      form.setValueByName('style.position', 'sticky');
+      form.setValueByName('style.inset', '0px auto auto auto');
+    } else {
+      form.setValueByName('style.position', 'static');
+      form.setValueByName('style.inset', undefined);
+    }
+  }
+});
+// 滚动吸附位置配置项
+amisEditorCore.setSchemaTpl('layout:stickyPosition', {
+  type: 'button-group-select',
+  size: 'xs',
+  label: amisEditorCore.tipedLabel(i18nRuntime.i18n("7d30297d4e1f310c73b27be88c748026"), i18nRuntime.i18n("5f9be0002394f0b58952969d5952e24c")),
+  name: 'stickyPosition',
+  visibleOn: 'data.stickyStatus',
+  options: [{
+    label: i18nRuntime.i18n("2ea76e2ffc1b92911d6f7decfa993360"),
+    value: 'top'
+  }, {
+    label: i18nRuntime.i18n("8cfc818a76662085cb64752d6d592fbe"),
+    value: 'bottom'
+  }],
+  onChange: function (value, oldValue, model, form) {
+    if (value === 'top') {
+      form.setValueByName('style.inset', '0px auto auto auto');
+    } else if (value === 'bottom') {
+      form.setValueByName('style.inset', 'auto auto 0px auto');
+    }
+  }
+});

package/lib/tpl/options.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/lib/validator.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.33
+ * amis-editor v5.2.1-beta.35
  * Copyright 2018-2022 @fex
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.2.1-beta.33",
+  "version": "5.2.1-beta.35",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -53,10 +53,10 @@
     "@types/sortablejs": "^1.10.7",
     "@types/tinycolor2": "^1.4.3",
     "ajv": "^8.8.2",
-    "amis": "2.5.2",
-    "amis-core": "2.5.2",
-    "amis-formula": "2.5.2",
-    "amis-ui": "2.5.2",
+    "amis": "2.5.3-beta.0",
+    "amis-core": "2.5.3-beta.0",
+    "amis-formula": "2.5.3-beta.0",
+    "amis-ui": "2.5.3-beta.0",
     "axios": "0.21.1",
     "concurrently": "^6.2.0",
     "css-loader": "^6.2.0",