amis-editor 5.2.1-beta.35 → 5.2.3-beta.16

package/lib/tpl/layout.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -40,6 +40,10 @@ amisEditorCore.setSchemaTpl('layout:position', function (config) {
         form.setValueByName('style.inset', 'auto');
         form.setValueByName('originPosition', undefined);
       }
+      if (value !== 'sticky') {
+        // 非滚动吸附定位
+        form.setValueByName('stickyStatus', undefined);
+      }
     },
     options: [{
       label: i18nRuntime.i18n("18c63459a2c069022c7790430f761214"),
@@ -474,6 +478,29 @@ amisEditorCore.setSchemaTpl('layout:width', function (config) {
     }
   };
 });
+// 宽度设置(不关联固定宽度配置项)
+amisEditorCore.setSchemaTpl('layout:width:v2', function (config) {
+  var _a;
+  return {
+    type: 'input-number',
+    label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7"),
+    name: (config === null || config === void 0 ? void 0 : config.name) || 'style.width',
+    value: (config === null || config === void 0 ? void 0 : config.value) || '300px',
+    visibleOn: (config === null || config === void 0 ? void 0 : config.visibleOn) || true,
+    clearable: true,
+    unitOptions: (_a = config === null || config === void 0 ? void 0 : config.unitOptions) !== null && _a !== void 0 ? _a : LayoutUnitOptions,
+    pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
+    // pipeOut: config?.pipeOut,
+    pipeOut: function (value) {
+      var curValue = parseInt(value);
+      if (value === 'auto' || curValue || curValue === 0) {
+        return value;
+      } else {
+        return undefined;
+      }
+    }
+  };
+});
 // 最大宽度设置
 amisEditorCore.setSchemaTpl('layout:max-width', function (config) {
   var _a;
@@ -679,32 +706,68 @@ amisEditorCore.setSchemaTpl('layout:overflow-y', function (config) {
 amisEditorCore.setSchemaTpl('layout:margin-center', function (config) {
   var _a;
   return {
-    type: 'switch',
-    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("4fc0e68b093db41b45a4ea706fbe56f3"), i18nRuntime.i18n("55efb233147f9539de019d9abc7653f9")),
+    type: 'button-group-select',
+    size: 'xs',
+    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("d5bc35360607472de4525358af126de4"), i18nRuntime.i18n("052f93928af33d4d7035e7c8e8a73f17")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.margin',
     value: (config === null || config === void 0 ? void 0 : config.value) || '0',
     inputClassName: 'inline-flex justify-between',
     visibleOn: (_a = config === null || config === void 0 ? void 0 : config.visibleOn) !== null && _a !== void 0 ? _a : 'data.isFixedWidth || data.style && data.style.maxWidth',
-    pipeIn: function (value) {
-      var curValue = value || '0';
-      if (isNumber__default["default"](curValue)) {
-        curValue = curValue.toString();
-      }
-      if (!isString__default["default"](curValue)) {
-        curValue = '0';
+    options: [{
+      label: i18nRuntime.i18n("a738a8594bd2b71002d09277b84d86dd"),
+      value: 'auto auto auto 0px'
+    }, {
+      label: i18nRuntime.i18n("0bbc2ea4e1d1f23feb576de5dca1ce3b"),
+      value: '0px auto'
+    }, {
+      label: i18nRuntime.i18n("fc0f19e9e47e352d36d36cf6eb653210"),
+      value: 'auto 0px auto auto'
+    }],
+    onChange: function (value, oldValue, model, form) {
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+      if (((_b = (_a = form === null || form === void 0 ? void 0 : form.data) === null || _a === void 0 ? void 0 : _a.style) === null || _b === void 0 ? void 0 : _b.position) === 'fixed' || ((_d = (_c = form === null || form === void 0 ? void 0 : form.data) === null || _c === void 0 ? void 0 : _c.style) === null || _d === void 0 ? void 0 : _d.position) === 'absolute') {
+        // 吸附容器
+        if (value === '0px auto') {
+          // 居中
+          if (((_e = form.data) === null || _e === void 0 ? void 0 : _e.sorptionPosition) === 'top') {
+            // 吸顶
+            form.setValueByName('style.inset', '0px auto auto 50%');
+          } else if (((_f = form.data) === null || _f === void 0 ? void 0 : _f.sorptionPosition) === 'bottom') {
+            // 吸底
+            form.setValueByName('style.inset', 'auto auto 0px 50%');
+          } else {
+            form.setValueByName('style.inset', 'auto auto auto 50%');
+          }
+          form.setValueByName('style.transform', 'translateX(-50%)');
+        } else if (value === 'auto 0px auto auto') {
+          // 靠右
+          if (((_g = form.data) === null || _g === void 0 ? void 0 : _g.sorptionPosition) === 'top') {
+            // 吸顶
+            form.setValueByName('style.inset', '0px 0px auto auto');
+          } else if (((_h = form.data) === null || _h === void 0 ? void 0 : _h.sorptionPosition) === 'bottom') {
+            // 吸底
+            form.setValueByName('style.inset', 'auto 0px 0px auto');
+          } else {
+            form.setValueByName('style.inset', 'auto 0px auto auto');
+          }
+          form.setValueByName('style.transform', undefined);
+        } else {
+          // 靠左
+          if (((_j = form.data) === null || _j === void 0 ? void 0 : _j.sorptionPosition) === 'top') {
+            // 吸顶
+            form.setValueByName('style.inset', '0px auto auto 0px');
+          } else if (((_k = form.data) === null || _k === void 0 ? void 0 : _k.sorptionPosition) === 'bottom') {
+            // 吸底
+            form.setValueByName('style.inset', 'auto auto 0px 0px');
+          } else {
+            form.setValueByName('style.inset', 'auto auto auto 0px');
+          }
+          form.setValueByName('style.transform', undefined);
+        }
+      } else {
+        // 靠左
+        form.setValueByName('style.transform', undefined);
       }
-      var margin = value.split(' ');
-      var curMargin = {
-        top: margin[0] || '0',
-        right: margin[1] || '0',
-        bottom: margin[2] || margin[0] || '0',
-        left: margin[3] || margin[1] || '0'
-      };
-      // 当左右margin数值相同时，则可认为是居中模式
-      return curMargin.left !== '0' && curMargin.left === curMargin.right ? true : false;
-    },
-    pipeOut: function (value) {
-      return value ? '0 auto' : '0';
     }
   };
 });
@@ -809,12 +872,17 @@ amisEditorCore.setSchemaTpl('layout:stickyPosition', {
   }, {
     label: i18nRuntime.i18n("8cfc818a76662085cb64752d6d592fbe"),
     value: 'bottom'
+  }, {
+    label: i18nRuntime.i18n("3aed2c11e95a9c0ea1d853d4aee72e8c"),
+    value: 'auto'
   }],
   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');
+    } else if (value === 'auto') {
+      form.setValueByName('style.inset', '0px auto 0px auto');
     }
   }
 });

package/lib/tpl/options.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/tpl/style.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/tpl/validations.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/lib/util.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';
@@ -9,7 +9,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('tslib');
 require('amis');
-require('./renderer/event-control/actions.js');
 require('./renderer/event-control/helper.js');
 var isString = require('lodash/isString');
 

package/lib/validator.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v5.2.1-beta.35
- * Copyright 2018-2022 @fex
+ * amis-editor v5.2.3-beta.15
+ * Copyright 2018-2023 @fex
  */
 
 'use strict';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.2.1-beta.35",
+  "version": "5.2.3-beta.16",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -53,10 +53,6 @@
     "@types/sortablejs": "^1.10.7",
     "@types/tinycolor2": "^1.4.3",
     "ajv": "^8.8.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",

package/esm/renderer/event-control/actions.d.ts

@@ -1,3 +0,0 @@
-import { RendererPluginAction } from 'amis-editor-core';
-declare const ACTION_TYPE_TREE: (manager: any) => RendererPluginAction[];
-export default ACTION_TYPE_TREE;