amis-editor 5.2.4-beta.31 → 5.2.5

package/lib/tpl/options.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.4-beta.39
  * Copyright 2018-2023 @fex
  */
 
@@ -9,12 +9,14 @@ var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
 var assign = require('lodash/assign');
 var cloneDeep = require('lodash/cloneDeep');
+var omit = require('lodash/omit');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var assign__default = /*#__PURE__*/_interopDefaultLegacy(assign);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
+var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 
 amisEditorCore.setSchemaTpl('options', function () {
   var i18nEnabled = amisEditorCore.getI18nEnabled();
@@ -311,65 +313,61 @@ amisEditorCore.setSchemaTpl('treeOptionControl', {
 amisEditorCore.setSchemaTpl('dataMap', {
   type: 'container',
   body: [amisEditorCore.getSchemaTpl('switch', {
-    label: amisEditorCore.tipedLabel(i18nRuntime.i18n("dd10fdec63a2224aa3d28b48d428cb98"), i18nRuntime.i18n("f19464cd1d7c55610b84b4972eaf506f") + i18nRuntime.i18n("784cf5219012b5f16f2985b7f1fd52f5")),
+    label: amisEditorCore.tipedLabel(i18nRuntime.i18n("dd10fdec63a2224aa3d28b48d428cb98"), i18nRuntime.i18n("22b47452f52254ce07507287d137d167") + i18nRuntime.i18n("68419387f5bb8487a848b818d78424ae")),
     name: 'dataMapSwitch',
-    value: false,
-    className: 'm-b-xs',
+    pipeIn: amisEditorCore.defaultValue(false),
     onChange: function (value, oldValue, model, form) {
-      var newDataValue = value ? {} : null;
-      form.setValues({
-        dataMap: newDataValue,
-        data: newDataValue
-      });
+      if (value) {
+        form.setValues({
+          data: {},
+          dataMap: {},
+          withDefaultData: false
+        });
+      } else {
+        form.deleteValueByName('dataMap');
+        form.deleteValueByName('data');
+      }
     }
-  }), {
-    type: 'alert',
-    level: 'info',
+  }), amisEditorCore.getSchemaTpl('combo-container', {
+    type: 'container',
+    className: 'ae-Combo-items',
     visibleOn: 'this.dataMapSwitch',
-    className: 'relative',
-    body: [{
-      type: 'tpl',
-      tpl: i18nRuntime.i18n("af9f27383daeec508815a33753247f42")
-    }, {
-      type: 'button',
-      label: i18nRuntime.i18n("ff0d36eac9b9c029d91c365cd2c7e6cf"),
-      level: 'link',
-      className: 'absolute bottom-3 right-10',
-      onClick: function (e, props) {
+    body: [amisEditorCore.getSchemaTpl('switch', {
+      label: amisEditorCore.tipedLabel(i18nRuntime.i18n("cb65841ea7dec5ae0af20b3f5e52abfc"), i18nRuntime.i18n("6922790f45faf064e063069816e4d2ec")),
+      name: 'withDefaultData',
+      className: 'mb-0',
+      pipeIn: amisEditorCore.defaultValue(false),
+      onChange: function (value, origin, item, form) {
+        form.setValues({
+          data: value ? {
+            '&': '$$'
+          } : {},
+          dataMap: {}
+        });
+      }
+    }), {
+      type: 'input-kv',
+      syncDefaultValue: false,
+      name: 'dataMap',
+      className: 'block -mt-5',
+      deleteBtn: {
+        icon: 'fa fa-trash'
+      },
+      itemsWrapperClassName: 'ae-Combo-items',
+      pipeIn: function (e, form) {
         var _a;
-        var newData = ((_a = props.data.data) === null || _a === void 0 ? void 0 : _a['&']) === '$$' ? {} : {
+        var data = cloneDeep__default["default"]((_a = form.data) === null || _a === void 0 ? void 0 : _a.data);
+        return data && data['&'] === '$$' ? omit__default["default"](data, '&') : data;
+      },
+      onChange: function (value, oldValue, model, form) {
+        var newData = form.data.withDefaultData ? assign__default["default"]({
           '&': '$$'
-        };
-        // 用onBulkChange保证代码视图和编辑区域数据保持同步
-        props.onBulkChange({
-          data: newData,
-          dataMap: {}
+        }, value) : cloneDeep__default["default"](value);
+        form.setValues({
+          data: newData
         });
+        return value;
       }
-    }],
-    showCloseButton: true
-  }, amisEditorCore.getSchemaTpl('combo-container', {
-    type: 'input-kv',
-    syncDefaultValue: false,
-    name: 'dataMap',
-    value: null,
-    visibleOn: 'this.dataMapSwitch',
-    className: 'block -mt-5',
-    deleteBtn: {
-      icon: 'fa fa-trash'
-    },
-    onChange: function (value, oldValue, model, form) {
-      var _a;
-      // 用assign保证'&'第一个被遍历到
-      var newDataMap = ((_a = form.data.data) === null || _a === void 0 ? void 0 : _a['&']) ? assign__default["default"]({
-        '&': '$$'
-      }, value) : cloneDeep__default["default"](value);
-      form.setValues({
-        data: newDataMap
-      });
-      form.setValues({
-        data: newDataMap
-      });
-    }
+    }]
   })]
 });

package/lib/tpl/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.4-beta.39
  * Copyright 2018-2023 @fex
  */
 
@@ -44,7 +44,7 @@ amisEditorCore.setSchemaTpl('style:classNames', function (config) {
       label: i18nRuntime.i18n("e1b2f870112bd38f8d7e14a0ad589930"),
       name: 'inputClassName'
     })], unsupportStatic ? [] : [amisEditorCore.getSchemaTpl('className', {
-      label: i18nRuntime.i18n("a8797a840f3c0bbb5297aada95f9b13a"),
+      label: i18nRuntime.i18n("04f5f12c49c2a6fdc43da049591328ad"),
       name: 'staticClassName'
     })], true) : [amisEditorCore.getSchemaTpl('className', {
       label: i18nRuntime.i18n("5e5d3f13111593b2710673006d4c8297")

package/lib/tpl/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.4-beta.39
  * Copyright 2018-2023 @fex
  */
 

package/lib/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.4-beta.39
  * Copyright 2018-2023 @fex
  */
 

package/lib/validator.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.4-beta.39
  * Copyright 2018-2023 @fex
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.2.4-beta.31",
+  "version": "5.2.5",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -107,4 +107,4 @@
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   }
-}
+}

package/esm/plugin/Layout/Layout1_2_v4.js

@@ -1,142 +0,0 @@
-/**
- * amis-editor v5.2.4-beta.30
- * Copyright 2018-2023 @fex
- */
-
-import { __extends } from 'tslib';
-import { registerEditorPlugin } from 'amis-editor-core';
-import { FlexPluginBase } from './FlexPluginBase.js';
-import { i18n } from 'i18n-runtime';
-
-var Layout1_2_v4 = /** @class */function (_super) {
-  __extends(Layout1_2_v4, _super);
-  function Layout1_2_v4() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
-    Object.defineProperty(_this, "name", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: i18n("ba9ccf1040d7abd0848046330ba3558c")
-    });
-    Object.defineProperty(_this, "isBaseComponent", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: true
-    });
-    Object.defineProperty(_this, "pluginIcon", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: 'layout-3-1-plugin'
-    });
-    Object.defineProperty(_this, "description", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: i18n("230d65546ea0d299907943403608233c")
-    });
-    Object.defineProperty(_this, "order", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: 307
-    });
-    Object.defineProperty(_this, "scaffold", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: {
-        type: 'flex',
-        className: 'p-1',
-        items: [{
-          type: 'container',
-          size: 'xs',
-          body: [],
-          wrapperBody: false,
-          style: {
-            flex: '0 0 auto',
-            display: 'block'
-          }
-        }, {
-          type: 'flex',
-          items: [{
-            type: 'container',
-            size: 'xs',
-            body: [],
-            wrapperBody: false,
-            style: {
-              flex: '0 0 auto',
-              flexBasis: '250px',
-              display: 'block'
-            }
-          }, {
-            type: 'flex',
-            items: [{
-              type: 'container',
-              size: 'xs',
-              body: [],
-              wrapperBody: false,
-              style: {
-                flex: '1 1 auto',
-                flexBasis: 'auto',
-                flexGrow: 1,
-                display: 'block'
-              }
-            }, {
-              type: 'container',
-              size: 'xs',
-              body: [],
-              wrapperBody: false,
-              style: {
-                flex: '1 1 auto',
-                flexBasis: 'auto',
-                flexGrow: 1,
-                display: 'block'
-              }
-            }],
-            style: {
-              position: 'static',
-              overflowX: 'auto',
-              overflowY: 'auto',
-              margin: '0',
-              flex: '1 1 auto',
-              flexGrow: 1,
-              flexBasis: 'auto'
-            },
-            alignItems: 'stretch',
-            direction: 'column',
-            justify: 'center',
-            isFixedHeight: false,
-            isFixedWidth: false
-          }],
-          style: {
-            flex: '1 1 auto',
-            overflowX: 'auto',
-            margin: '0',
-            maxWidth: 'auto',
-            overflowY: 'auto',
-            position: 'static',
-            minWidth: 'auto',
-            width: 'auto',
-            maxHeight: 'auto',
-            minHeight: '300px'
-          },
-          direction: 'row',
-          justify: 'flex-start',
-          alignItems: 'stretch',
-          isFixedHeight: false,
-          isFixedWidth: false
-        }],
-        direction: 'column',
-        justify: 'center',
-        alignItems: 'stretch'
-      }
-    });
-    return _this;
-  }
-  return Layout1_2_v4;
-}(FlexPluginBase);
-registerEditorPlugin(Layout1_2_v4);
-
-export { Layout1_2_v4 as default };

package/lib/plugin/Layout/Layout1_2_v4.js

@@ -1,146 +0,0 @@
-/**
- * amis-editor v5.2.4-beta.30
- * Copyright 2018-2023 @fex
- */
-
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var tslib = require('tslib');
-var amisEditorCore = require('amis-editor-core');
-var FlexPluginBase = require('./FlexPluginBase.js');
-var i18nRuntime = require('i18n-runtime');
-
-var Layout1_2_v4 = /** @class */function (_super) {
-  tslib.__extends(Layout1_2_v4, _super);
-  function Layout1_2_v4() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
-    Object.defineProperty(_this, "name", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: i18nRuntime.i18n("ba9ccf1040d7abd0848046330ba3558c")
-    });
-    Object.defineProperty(_this, "isBaseComponent", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: true
-    });
-    Object.defineProperty(_this, "pluginIcon", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: 'layout-3-1-plugin'
-    });
-    Object.defineProperty(_this, "description", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: i18nRuntime.i18n("230d65546ea0d299907943403608233c")
-    });
-    Object.defineProperty(_this, "order", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: 307
-    });
-    Object.defineProperty(_this, "scaffold", {
-      enumerable: true,
-      configurable: true,
-      writable: true,
-      value: {
-        type: 'flex',
-        className: 'p-1',
-        items: [{
-          type: 'container',
-          size: 'xs',
-          body: [],
-          wrapperBody: false,
-          style: {
-            flex: '0 0 auto',
-            display: 'block'
-          }
-        }, {
-          type: 'flex',
-          items: [{
-            type: 'container',
-            size: 'xs',
-            body: [],
-            wrapperBody: false,
-            style: {
-              flex: '0 0 auto',
-              flexBasis: '250px',
-              display: 'block'
-            }
-          }, {
-            type: 'flex',
-            items: [{
-              type: 'container',
-              size: 'xs',
-              body: [],
-              wrapperBody: false,
-              style: {
-                flex: '1 1 auto',
-                flexBasis: 'auto',
-                flexGrow: 1,
-                display: 'block'
-              }
-            }, {
-              type: 'container',
-              size: 'xs',
-              body: [],
-              wrapperBody: false,
-              style: {
-                flex: '1 1 auto',
-                flexBasis: 'auto',
-                flexGrow: 1,
-                display: 'block'
-              }
-            }],
-            style: {
-              position: 'static',
-              overflowX: 'auto',
-              overflowY: 'auto',
-              margin: '0',
-              flex: '1 1 auto',
-              flexGrow: 1,
-              flexBasis: 'auto'
-            },
-            alignItems: 'stretch',
-            direction: 'column',
-            justify: 'center',
-            isFixedHeight: false,
-            isFixedWidth: false
-          }],
-          style: {
-            flex: '1 1 auto',
-            overflowX: 'auto',
-            margin: '0',
-            maxWidth: 'auto',
-            overflowY: 'auto',
-            position: 'static',
-            minWidth: 'auto',
-            width: 'auto',
-            maxHeight: 'auto',
-            minHeight: '300px'
-          },
-          direction: 'row',
-          justify: 'flex-start',
-          alignItems: 'stretch',
-          isFixedHeight: false,
-          isFixedWidth: false
-        }],
-        direction: 'column',
-        justify: 'center',
-        alignItems: 'stretch'
-      }
-    });
-    return _this;
-  }
-  return Layout1_2_v4;
-}(FlexPluginBase.FlexPluginBase);
-amisEditorCore.registerEditorPlugin(Layout1_2_v4);
-
-exports["default"] = Layout1_2_v4;