amis-editor 5.2.5 → 5.4.0

package/lib/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.39
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -8,7 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('tslib');
-require('amis');
+var amis = require('amis');
 require('./renderer/event-control/helper.js');
 var isString = require('lodash/isString');
 
@@ -25,5 +25,25 @@ var isAuto = function (value) {
     }
     return false;
 };
+/**
+ * 用于列表类展示组件在 filterProps 中获取编辑态 value 值
+ */
+var resolveArrayDatasource = function (_a, defaultSource) {
+    var data = _a.data, value = _a.value, source = _a.source;
+    if (defaultSource === void 0) { defaultSource = '$items'; }
+    return Array.isArray(value)
+        ? value
+        : // resolveVariable 不支持 ${items} 格式，导致预览态无数据
+            amis.resolveVariableAndFilter(typeof source === 'string' ? source : defaultSource, data, '| raw');
+};
+var schemaToArray = function (value) {
+    return value && Array.isArray(value) ? value : [value];
+};
+var schemaArrayFormat = function (value) {
+    return value && Array.isArray(value) && value.length === 1 ? value[0] : value;
+};
 
 exports.isAuto = isAuto;
+exports.resolveArrayDatasource = resolveArrayDatasource;
+exports.schemaArrayFormat = schemaArrayFormat;
+exports.schemaToArray = schemaToArray;

package/lib/validator.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.39
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -33,7 +33,7 @@ var registerValidator = function () {
   for (var _i = 0; _i < arguments.length; _i++) {
     config[_i] = arguments[_i];
   }
-  Validators.push.apply(Validators, config);
+  Validators.push.apply(Validators, tslib.__spreadArray([], tslib.__read(config), false));
 };
 var getValidatorsByTag = function (tag) {
   var defaultValidators = {};
@@ -294,7 +294,7 @@ registerValidator.apply(void 0, tslib.__spreadArray([{
     name: 'value',
     label: i18nRuntime.i18n("d314558953b3c76adb7e131aaec8bd86")
   }]
-}], Array(5).fill(null).map(function (v, index) {
+}], tslib.__read(Array(5).fill(null).map(function (v, index) {
   var _a;
   var num = index === 0 ? '' : index;
   return {
@@ -312,7 +312,7 @@ registerValidator.apply(void 0, tslib.__spreadArray([{
       suffix: '/'
     }]
   };
-}), false));
+})), false));
 
 exports.getValidator = getValidator;
 exports.getValidatorsByTag = getValidatorsByTag;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.2.5",
+  "version": "5.4.0",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -20,12 +20,13 @@
     }
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "echo \"Warnings: no test specified\"",
     "build": "npm run clean-dist && NODE_ENV=production rollup -c ",
     "clean-dist": "rimraf lib/* esm/*",
     "i18n:update": "npx i18n update --config=./i18nConfig.js",
     "i18n:translate": "npx i18n translate --config=./i18nConfig.js --l=en-US",
-    "i18n:merge": "npx i18n merge --config=./i18nConfig.js --l=en-US"
+    "i18n:merge": "npx i18n merge --config=./i18nConfig.js --l=en-US",
+    "format": "prettier --write \"src/**/**/*.{js,jsx,ts,tsx,vue,scss,json}\""
   },
   "keywords": [
     "amis",
@@ -73,8 +74,7 @@
     "concurrently": "^6.2.0",
     "css-loader": "^6.2.0",
     "faker": "^5.5.3",
-    "husky": "^7.0.0",
-    "lint-staged": "^12.1.2",
+    "i18n-command": "^0.0.23-beta.15",
     "mini-css-extract-plugin": "^2.3.0",
     "prettier": "^2.2.1",
     "react": "^18.2.0",
@@ -107,4 +107,4 @@
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   }
-}
+}

package/esm/renderer/style-control/ThemeClassName.js

@@ -1,228 +0,0 @@
-/**
- * amis-editor v5.2.4-beta.39
- * Copyright 2018-2023 @fex
- */
-
-import { __extends, __assign, __decorate } from 'tslib';
-import React__default, { useRef, useState, useEffect } from 'react';
-import { Button, Icon, Overlay, PopOver, Editor } from 'amis-ui';
-import { FormItem, render } from 'amis-core';
-import { parse } from 'amis-postcss';
-import { debounce } from 'lodash';
-import { i18n } from 'i18n-runtime';
-
-var valueMap = {
-  'margin-top': 'marginTop',
-  'margin-right': 'marginRight',
-  'margin-bottom': 'marginBottom',
-  'margin-left': 'marginLeft',
-  'padding-top': 'paddingTop',
-  'padding-right': 'paddingRight',
-  'padding-bottom': 'paddingBottom',
-  'padding-left': 'paddingLeft',
-  'border-top-width': 'top-border-width',
-  'border-right-width': 'right-border-width',
-  'border-bottom-width': 'bottom-border-width',
-  'border-left-width': 'left-border-width',
-  'border-top-style': 'top-border-style',
-  'border-right-style': 'right-border-style',
-  'border-bottom-style': 'bottom-border-style',
-  'border-left-style': 'left-border-style',
-  'border-top-color': 'top-border-color',
-  'border-right-color': 'right-border-color',
-  'border-bottom-color': 'bottom-border-color',
-  'border-left-color': 'left-border-color',
-  'font-size': 'fontSize',
-  'font-weight': 'fontWeight',
-  'line-height': 'lineHeight'
-};
-var fontStyle = ['color', 'font-weight', 'font-size', 'font-style', 'text-decoration', 'text-align', 'vertical-align', 'font-family', 'line-height'];
-function AmisStyleCodeEditor(props) {
-  var name = props.name,
-    classname = props.value,
-    suffix = props.suffix;
-  var _a = useState(''),
-    value = _a[0],
-    setValue = _a[1];
-  function getCssAndSetValue(classname, name, suffix) {
-    try {
-      var id = (classname === null || classname === void 0 ? void 0 : classname.replace(name + '-', '')) + (suffix ? '-' + suffix : '');
-      var dom = document.getElementById(id || '') || null;
-      var content = (dom === null || dom === void 0 ? void 0 : dom.innerHTML) || '';
-      var ast = parse(content);
-      var nodes_1 = [];
-      ast.nodes.forEach(function (node) {
-        var selector = node.selector;
-        if (!selector.endsWith('.hover') && !selector.endsWith('.active')) {
-          nodes_1.push(node);
-        }
-      });
-      ast.nodes = nodes_1;
-      var css = nodes_1.map(function (node) {
-        var style = node.nodes.map(function (n) {
-          return "".concat(n.prop, ": ").concat(n.value, ";");
-        });
-        return "".concat(node.selector, " {\n  ").concat(style.join('\n  '), "\n}");
-      }).join('\n\n');
-      setValue(css);
-    } catch (error) {
-      console.error(error);
-    }
-  }
-  useEffect(function () {
-    getCssAndSetValue(classname, name, suffix);
-  }, []);
-  function handleChange(value) {
-    setValue(value);
-    editorChange(value);
-  }
-  var editorChange = debounce(function (value) {
-    var _a;
-    try {
-      var ast = parse(value);
-      var data = props.data,
-        onBulkChange = props.onBulkChange,
-        name_1 = props.name;
-      var sourceCss = data.css || {};
-      var className_1 = {};
-      ast.nodes.forEach(function (node) {
-        var nodes = node.nodes;
-        var selector = node.selector;
-        var state = 'default';
-        if (!!~selector.indexOf(':hover:active')) {
-          state = 'active';
-        } else if (!!~selector.indexOf(':hover')) {
-          state = 'hover';
-        }
-        nodes.forEach(function (item) {
-          var prop = item.prop;
-          var cssValue = item.value;
-          if (!!~prop.indexOf('radius')) {
-            var type = 'radius:' + state;
-            !className_1[type] && (className_1[type] = {});
-            var radius = cssValue.split(' ');
-            className_1[type]['top-left-border-radius'] = radius[0];
-            className_1[type]['top-right-border-radius'] = radius[1];
-            className_1[type]['bottom-right-border-radius'] = radius[2];
-            className_1[type]['bottom-left-border-radius'] = radius[3];
-          } else if (!!~prop.indexOf('border')) {
-            !className_1['border:' + state] && (className_1['border:' + state] = {});
-            className_1['border:' + state][valueMap[prop] || prop] = cssValue;
-          } else if (!!~prop.indexOf('padding') || !!~prop.indexOf('margin')) {
-            !className_1['padding-and-margin:' + state] && (className_1['padding-and-margin:' + state] = {});
-            className_1['padding-and-margin:' + state][valueMap[prop] || prop] = cssValue;
-          } else if (fontStyle.includes(prop)) {
-            !className_1['font:' + state] && (className_1['font:' + state] = {});
-            className_1['font:' + state][valueMap[prop] || prop] = cssValue;
-          } else {
-            className_1[(valueMap[prop] || prop) + ':' + state] = cssValue;
-          }
-        });
-      });
-      var newCss = __assign(__assign({}, sourceCss), (_a = {}, _a[name_1] = className_1, _a));
-      onBulkChange && onBulkChange({
-        css: newCss
-      });
-    } catch (error) {
-      console.error(error);
-    }
-  });
-  return React__default.createElement("div", {
-    className: "ThemeClassName-editor"
-  }, React__default.createElement("div", {
-    className: "ThemeClassName-editor-title"
-  }, "\u81EA\u5B9A\u4E49\u6837\u5F0F\u6E90\u7801"), React__default.createElement("div", {
-    className: "ThemeClassName-editor-close"
-  }, React__default.createElement(Button, {
-    onClick: props.onHide,
-    level: "link"
-  }, React__default.createElement(Icon, {
-    icon: "close",
-    className: "icon"
-  }))), React__default.createElement("div", {
-    className: "ThemeClassName-editor-content"
-  }, React__default.createElement(Editor, {
-    value: value,
-    language: "css",
-    onChange: handleChange,
-    options: {
-      automaticLayout: true,
-      lineNumbers: 'off',
-      glyphMargin: false,
-      tabSize: 2,
-      wordWrap: 'on',
-      lineDecorationsWidth: 0,
-      lineNumbersMinChars: 0,
-      selectOnLineNumbers: true,
-      scrollBeyondLastLine: false,
-      folding: true,
-      minimap: {
-        enabled: false
-      }
-    }
-  })));
-}
-function ThemeClassName(props) {
-  var ref = useRef(null);
-  var value = props.value;
-  var _a = useState(false),
-    showEditor = _a[0],
-    setShowEditor = _a[1];
-  function handleShowEditor() {
-    setShowEditor(true);
-  }
-  return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
-    ref: ref,
-    className: "ThemeClassName"
-  }, React__default.createElement(Button, {
-    onClick: handleShowEditor,
-    level: "link",
-    className: ":ThemeClassName-button"
-  }, React__default.createElement(Icon, {
-    icon: "file",
-    className: "icon"
-  })), render({
-    type: 'input-tag',
-    name: 'class',
-    placeholder: i18n("ec8f3e4a298160dface2fda5c0125df2"),
-    delimiter: ' ',
-    value: value,
-    onChange: function (value) {
-      props.onChange && props.onChange(value);
-    }
-  })), React__default.createElement(Overlay, {
-    container: document.body,
-    placement: "left",
-    target: ref.current,
-    show: showEditor,
-    rootClose: false
-  }, React__default.createElement(PopOver, {
-    overlay: true,
-    onHide: function () {
-      return setShowEditor(false);
-    }
-  }, React__default.createElement(AmisStyleCodeEditor, __assign({}, props, {
-    onHide: function () {
-      return setShowEditor(false);
-    }
-  })))));
-}
-/** @class */(function (_super) {
-  __extends(BorderRenderer, _super);
-  function BorderRenderer() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-  Object.defineProperty(BorderRenderer.prototype, "render", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function () {
-      return React__default.createElement(ThemeClassName, __assign({}, this.props));
-    }
-  });
-  BorderRenderer = __decorate([FormItem({
-    type: 'theme-classname',
-    strictMode: false
-  })], BorderRenderer);
-  return BorderRenderer;
-})(React__default.Component);

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

@@ -1,234 +0,0 @@
-/**
- * amis-editor v5.2.4-beta.39
- * Copyright 2018-2023 @fex
- */
-
-'use strict';
-
-var tslib = require('tslib');
-var React = require('react');
-var amisUi = require('amis-ui');
-var amisCore = require('amis-core');
-var amisPostcss = require('amis-postcss');
-var _ = require('lodash');
-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 valueMap = {
-  'margin-top': 'marginTop',
-  'margin-right': 'marginRight',
-  'margin-bottom': 'marginBottom',
-  'margin-left': 'marginLeft',
-  'padding-top': 'paddingTop',
-  'padding-right': 'paddingRight',
-  'padding-bottom': 'paddingBottom',
-  'padding-left': 'paddingLeft',
-  'border-top-width': 'top-border-width',
-  'border-right-width': 'right-border-width',
-  'border-bottom-width': 'bottom-border-width',
-  'border-left-width': 'left-border-width',
-  'border-top-style': 'top-border-style',
-  'border-right-style': 'right-border-style',
-  'border-bottom-style': 'bottom-border-style',
-  'border-left-style': 'left-border-style',
-  'border-top-color': 'top-border-color',
-  'border-right-color': 'right-border-color',
-  'border-bottom-color': 'bottom-border-color',
-  'border-left-color': 'left-border-color',
-  'font-size': 'fontSize',
-  'font-weight': 'fontWeight',
-  'line-height': 'lineHeight'
-};
-var fontStyle = ['color', 'font-weight', 'font-size', 'font-style', 'text-decoration', 'text-align', 'vertical-align', 'font-family', 'line-height'];
-function AmisStyleCodeEditor(props) {
-  var name = props.name,
-    classname = props.value,
-    suffix = props.suffix;
-  var _a = React.useState(''),
-    value = _a[0],
-    setValue = _a[1];
-  function getCssAndSetValue(classname, name, suffix) {
-    try {
-      var id = (classname === null || classname === void 0 ? void 0 : classname.replace(name + '-', '')) + (suffix ? '-' + suffix : '');
-      var dom = document.getElementById(id || '') || null;
-      var content = (dom === null || dom === void 0 ? void 0 : dom.innerHTML) || '';
-      var ast = amisPostcss.parse(content);
-      var nodes_1 = [];
-      ast.nodes.forEach(function (node) {
-        var selector = node.selector;
-        if (!selector.endsWith('.hover') && !selector.endsWith('.active')) {
-          nodes_1.push(node);
-        }
-      });
-      ast.nodes = nodes_1;
-      var css = nodes_1.map(function (node) {
-        var style = node.nodes.map(function (n) {
-          return "".concat(n.prop, ": ").concat(n.value, ";");
-        });
-        return "".concat(node.selector, " {\n  ").concat(style.join('\n  '), "\n}");
-      }).join('\n\n');
-      setValue(css);
-    } catch (error) {
-      console.error(error);
-    }
-  }
-  React.useEffect(function () {
-    getCssAndSetValue(classname, name, suffix);
-  }, []);
-  function handleChange(value) {
-    setValue(value);
-    editorChange(value);
-  }
-  var editorChange = _.debounce(function (value) {
-    var _a;
-    try {
-      var ast = amisPostcss.parse(value);
-      var data = props.data,
-        onBulkChange = props.onBulkChange,
-        name_1 = props.name;
-      var sourceCss = data.css || {};
-      var className_1 = {};
-      ast.nodes.forEach(function (node) {
-        var nodes = node.nodes;
-        var selector = node.selector;
-        var state = 'default';
-        if (!!~selector.indexOf(':hover:active')) {
-          state = 'active';
-        } else if (!!~selector.indexOf(':hover')) {
-          state = 'hover';
-        }
-        nodes.forEach(function (item) {
-          var prop = item.prop;
-          var cssValue = item.value;
-          if (!!~prop.indexOf('radius')) {
-            var type = 'radius:' + state;
-            !className_1[type] && (className_1[type] = {});
-            var radius = cssValue.split(' ');
-            className_1[type]['top-left-border-radius'] = radius[0];
-            className_1[type]['top-right-border-radius'] = radius[1];
-            className_1[type]['bottom-right-border-radius'] = radius[2];
-            className_1[type]['bottom-left-border-radius'] = radius[3];
-          } else if (!!~prop.indexOf('border')) {
-            !className_1['border:' + state] && (className_1['border:' + state] = {});
-            className_1['border:' + state][valueMap[prop] || prop] = cssValue;
-          } else if (!!~prop.indexOf('padding') || !!~prop.indexOf('margin')) {
-            !className_1['padding-and-margin:' + state] && (className_1['padding-and-margin:' + state] = {});
-            className_1['padding-and-margin:' + state][valueMap[prop] || prop] = cssValue;
-          } else if (fontStyle.includes(prop)) {
-            !className_1['font:' + state] && (className_1['font:' + state] = {});
-            className_1['font:' + state][valueMap[prop] || prop] = cssValue;
-          } else {
-            className_1[(valueMap[prop] || prop) + ':' + state] = cssValue;
-          }
-        });
-      });
-      var newCss = tslib.__assign(tslib.__assign({}, sourceCss), (_a = {}, _a[name_1] = className_1, _a));
-      onBulkChange && onBulkChange({
-        css: newCss
-      });
-    } catch (error) {
-      console.error(error);
-    }
-  });
-  return React__default["default"].createElement("div", {
-    className: "ThemeClassName-editor"
-  }, React__default["default"].createElement("div", {
-    className: "ThemeClassName-editor-title"
-  }, "\u81EA\u5B9A\u4E49\u6837\u5F0F\u6E90\u7801"), React__default["default"].createElement("div", {
-    className: "ThemeClassName-editor-close"
-  }, React__default["default"].createElement(amisUi.Button, {
-    onClick: props.onHide,
-    level: "link"
-  }, React__default["default"].createElement(amisUi.Icon, {
-    icon: "close",
-    className: "icon"
-  }))), React__default["default"].createElement("div", {
-    className: "ThemeClassName-editor-content"
-  }, React__default["default"].createElement(amisUi.Editor, {
-    value: value,
-    language: "css",
-    onChange: handleChange,
-    options: {
-      automaticLayout: true,
-      lineNumbers: 'off',
-      glyphMargin: false,
-      tabSize: 2,
-      wordWrap: 'on',
-      lineDecorationsWidth: 0,
-      lineNumbersMinChars: 0,
-      selectOnLineNumbers: true,
-      scrollBeyondLastLine: false,
-      folding: true,
-      minimap: {
-        enabled: false
-      }
-    }
-  })));
-}
-function ThemeClassName(props) {
-  var ref = React.useRef(null);
-  var value = props.value;
-  var _a = React.useState(false),
-    showEditor = _a[0],
-    setShowEditor = _a[1];
-  function handleShowEditor() {
-    setShowEditor(true);
-  }
-  return React__default["default"].createElement(React__default["default"].Fragment, null, React__default["default"].createElement("div", {
-    ref: ref,
-    className: "ThemeClassName"
-  }, React__default["default"].createElement(amisUi.Button, {
-    onClick: handleShowEditor,
-    level: "link",
-    className: ":ThemeClassName-button"
-  }, React__default["default"].createElement(amisUi.Icon, {
-    icon: "file",
-    className: "icon"
-  })), amisCore.render({
-    type: 'input-tag',
-    name: 'class',
-    placeholder: i18nRuntime.i18n("ec8f3e4a298160dface2fda5c0125df2"),
-    delimiter: ' ',
-    value: value,
-    onChange: function (value) {
-      props.onChange && props.onChange(value);
-    }
-  })), React__default["default"].createElement(amisUi.Overlay, {
-    container: document.body,
-    placement: "left",
-    target: ref.current,
-    show: showEditor,
-    rootClose: false
-  }, React__default["default"].createElement(amisUi.PopOver, {
-    overlay: true,
-    onHide: function () {
-      return setShowEditor(false);
-    }
-  }, React__default["default"].createElement(AmisStyleCodeEditor, tslib.__assign({}, props, {
-    onHide: function () {
-      return setShowEditor(false);
-    }
-  })))));
-}
-/** @class */(function (_super) {
-  tslib.__extends(BorderRenderer, _super);
-  function BorderRenderer() {
-    return _super !== null && _super.apply(this, arguments) || this;
-  }
-  Object.defineProperty(BorderRenderer.prototype, "render", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function () {
-      return React__default["default"].createElement(ThemeClassName, tslib.__assign({}, this.props));
-    }
-  });
-  BorderRenderer = tslib.__decorate([amisCore.FormItem({
-    type: 'theme-classname',
-    strictMode: false
-  })], BorderRenderer);
-  return BorderRenderer;
-})(React__default["default"].Component);