amis-editor 5.2.3-beta.12 → 5.2.3

package/lib/renderer/event-control/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.12
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -2033,9 +2033,9 @@ var getEventControlConfig = function (manager, context) {
     actionConfigInitFormatter: function (action, variables) {
       return tslib.__awaiter(void 0, void 0, void 0, function () {
         var config, innerArgs, tmpArgs_1, hasSubActionNode, datasource, schema, dataSchema, dataSchemaIns;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        return tslib.__generator(this, function (_s) {
-          switch (_s.label) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        return tslib.__generator(this, function (_u) {
+          switch (_u.label) {
             case 0:
               config = tslib.__assign({}, action);
               if (['link', 'url'].includes(action.actionType) && ((_a = action.args) === null || _a === void 0 ? void 0 : _a.params)) {
@@ -2104,6 +2104,12 @@ var getEventControlConfig = function (manager, context) {
                 }
               }
               delete config.data;
+              // 处理下 combo - addItem 的初始化
+              if (action.actionType === 'addItem' && typeof ((_p = action.args) === null || _p === void 0 ? void 0 : _p.item) === 'object') {
+                config.args = tslib.__assign(tslib.__assign({}, config.args), {
+                  item: objectToComboArray((_q = action.args) === null || _q === void 0 ? void 0 : _q.item)
+                });
+              }
               // 还原args为可视化配置结构(args + addOnArgs)
               if (config.args) {
                 if (innerArgs) {
@@ -2127,14 +2133,14 @@ var getEventControlConfig = function (manager, context) {
               }
               hasSubActionNode = findSubActionNode(actionTree, action.actionType);
               datasource = [];
-              if (!((_p = action.args) === null || _p === void 0 ? void 0 : _p.componentId)) return [3 /*break*/, 2];
-              schema = (_q = manager === null || manager === void 0 ? void 0 : manager.store) === null || _q === void 0 ? void 0 : _q.getSchema((_r = action.args) === null || _r === void 0 ? void 0 : _r.componentId, 'id');
+              if (!((_r = action.args) === null || _r === void 0 ? void 0 : _r.componentId)) return [3 /*break*/, 2];
+              schema = (_s = manager === null || manager === void 0 ? void 0 : manager.store) === null || _s === void 0 ? void 0 : _s.getSchema((_t = action.args) === null || _t === void 0 ? void 0 : _t.componentId, 'id');
               return [4 /*yield*/, manager.getContextSchemas(schema === null || schema === void 0 ? void 0 : schema.$$id, true)];
             case 1:
-              dataSchema = _s.sent();
+              dataSchema = _u.sent();
               dataSchemaIns = new amisCore.DataSchema(dataSchema || []);
               datasource = (dataSchemaIns === null || dataSchemaIns === void 0 ? void 0 : dataSchemaIns.getDataPropsAsOptions()) || [];
-              _s.label = 2;
+              _u.label = 2;
             case 2:
               return [2 /*return*/, tslib.__assign(tslib.__assign({}, config), {
                 actionType: getActionType(action, hasSubActionNode),
@@ -2150,7 +2156,7 @@ var getEventControlConfig = function (manager, context) {
       });
     },
     actionConfigSubmitFormatter: function (config) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
       var action = tslib.__assign(tslib.__assign({}, config), {
         groupType: undefined
       });
@@ -2229,6 +2235,11 @@ var getEventControlConfig = function (manager, context) {
           }
         }
       }
+      if (action.actionType === 'addItem' && action.__rendererName === 'combo') {
+        action.args = tslib.__assign(tslib.__assign({}, action.args), {
+          item: comboArrayToObject((_l = config.args) === null || _l === void 0 ? void 0 : _l.item)
+        });
+      }
       // 转换下格式
       if (['visibility', 'usability'].includes(config.actionType)) {
         action.args = action.actionType !== 'static' ? {

package/lib/renderer/event-control/index.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/lib/renderer/style-control/ThemeClassName.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 类名输入框 + 自定义样式源码编辑器
+ */
+import React from 'react';
+import { FormControlProps } from 'amis-core';
+export declare class BorderRenderer extends React.Component<FormControlProps> {
+    render(): JSX.Element;
+}

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

@@ -0,0 +1,234 @@
+/**
+ * amis-editor v5.2.3
+ * 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);

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

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

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

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

package/lib/renderer/textarea-formula/FormulaPicker.d.ts

@@ -8,5 +8,8 @@ export interface FormulaPickerProps {
     variableMode?: 'tabs' | 'tree';
     evalMode?: boolean;
 }
+export interface CustomFormulaPickerProps extends FormulaPickerProps {
+    [propName: string]: any;
+}
 declare const FormulaPicker: React.FC<FormulaPickerProps>;
 export default FormulaPicker;

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

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

package/lib/renderer/textarea-formula/TextareaFormulaControl.d.ts

@@ -5,6 +5,7 @@
 import React from 'react';
 import { FormControlProps } from 'amis-core';
 import { FormulaPlugin } from './plugin';
+import { CustomFormulaPickerProps } from './FormulaPicker';
 import CodeMirror from 'codemirror';
 import { VariableItem } from 'amis-ui/lib/components/formula/Editor';
 export interface TextareaFormulaControlProps extends FormControlProps {
@@ -34,6 +35,14 @@ export interface TextareaFormulaControlProps extends FormControlProps {
         icon?: string;
         className?: string;
     }>;
+    /**
+     * 整体点击长文本公式输入框
+     */
+    onOverallClick?: () => void;
+    /**
+     * 自定义fx面板
+     */
+    customFormulaPicker?: React.FC<CustomFormulaPickerProps>;
 }
 interface TextareaFormulaControlState {
     value: string;

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.12
+ * amis-editor v5.2.3
  * Copyright 2018-2023 @fex
  */
 
@@ -192,6 +192,9 @@ var TextareaFormulaControl = /** @class */function (_super) {
     configurable: true,
     writable: true,
     value: function () {
+      if (this.props.onOverallClick) {
+        return;
+      }
       this.setState({
         isFullscreen: !this.state.isFullscreen
       });
@@ -202,6 +205,9 @@ var TextareaFormulaControl = /** @class */function (_super) {
     configurable: true,
     writable: true,
     value: function () {
+      if (this.props.onOverallClick) {
+        return;
+      }
       this.setState({
         formulaPickerOpen: true,
         formulaPickerValue: '',
@@ -231,13 +237,16 @@ var TextareaFormulaControl = /** @class */function (_super) {
         _a.placeholder;
         var height = _a.height,
         additionalMenus = _a.additionalMenus,
-        rest = tslib.__rest(_a, ["className", "header", "label", "placeholder", "height", "additionalMenus"]);
+        onOverallClick = _a.onOverallClick,
+        customFormulaPicker = _a.customFormulaPicker,
+        rest = tslib.__rest(_a, ["className", "header", "label", "placeholder", "height", "additionalMenus", "onOverallClick", "customFormulaPicker"]);
       var _b = this.state,
         value = _b.value,
         formulaPickerOpen = _b.formulaPickerOpen,
         formulaPickerValue = _b.formulaPickerValue,
         isFullscreen = _b.isFullscreen,
         variables = _b.variables;
+      var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker["default"];
       // 输入框样式
       var resultBoxStyle = {};
       if (height) {
@@ -296,7 +305,10 @@ var TextareaFormulaControl = /** @class */function (_super) {
             return item === null || item === void 0 ? void 0 : item.onClick();
           }
         }, item.label));
-      })))), formulaPickerOpen ? React__default["default"].createElement(FormulaPicker["default"], {
+      })))), !!onOverallClick ? React__default["default"].createElement("div", {
+        className: cx__default["default"]('ae-TextareaResultBox-overlay'),
+        onClick: onOverallClick
+      }) : null, formulaPickerOpen ? React__default["default"].createElement(FormulaPickerCmp, tslib.__assign({}, this.props, {
         value: formulaPickerValue,
         initable: true,
         variables: variables,
@@ -308,7 +320,7 @@ var TextareaFormulaControl = /** @class */function (_super) {
           });
         },
         onConfirm: this.handleConfirm
-      }) : null);
+      })) : null);
     }
   });
   Object.defineProperty(TextareaFormulaControl, "defaultProps", {

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

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

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

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

package/lib/tpl/api.js

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