amis-editor 5.2.0-beta.2 → 5.2.1-beta.15

package/lib/renderer/FeatureControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
@@ -12,7 +12,7 @@ var React = require('react');
 var reactDom = require('react-dom');
 var cx = require('classnames');
 var amis = require('amis');
-var lodash = require('lodash');
+var _ = require('lodash');
 var GoConfigControl = require('./GoConfigControl.js');
 var Sortable = require('sortablejs');
 var i18nRuntime = require('i18n-runtime');
@@ -27,263 +27,279 @@ var Sortable__default = /*#__PURE__*/_interopDefaultLegacy(Sortable);
  * @file 控制功能开关的控件，这里的功能指需要加子组件来支持的功能
  */
 var klass = 'ae-FeatureControl';
-
-var FeatureControl =
-/** @class */
-function (_super) {
+var FeatureControl = /** @class */function (_super) {
   tslib.__extends(FeatureControl, _super);
-
   function FeatureControl(props) {
     var _this = _super.call(this, props) || this;
-
+    Object.defineProperty(_this, "sortable", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "drag", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
     _this.state = FeatureControl.initState(props.data, props.features);
     return _this;
   }
-
-  FeatureControl.getDerivedStateFromProps = function (nextProps, preState) {
-    return FeatureControl.initState(nextProps.data, nextProps.features, preState.inUseFeat, preState.unUseFeat);
-  };
-
-  FeatureControl.initState = function (data, features, lastInUseFeat, lastUnUseFeat) {
-    var inUseFeat = [];
-    var unUseFeat = [];
-
-    if (!Array.isArray(features)) {
-      features = features(data);
+  Object.defineProperty(FeatureControl, "getDerivedStateFromProps", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (nextProps, preState) {
+      return FeatureControl.initState(nextProps.data, nextProps.features, preState.inUseFeat, preState.unUseFeat);
     }
-
-    features.forEach(function (item) {
-      var _a;
-
-      if (item.isActive == null || ((_a = item.isActive) === null || _a === void 0 ? void 0 : _a.call(item, data))) {
-        inUseFeat.push(item);
-      } else if (item.add) {
-        unUseFeat.push(item);
+  });
+  Object.defineProperty(FeatureControl, "initState", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (data, features, lastInUseFeat, lastUnUseFeat) {
+      var inUseFeat = [];
+      var unUseFeat = [];
+      if (!Array.isArray(features)) {
+        features = features(data);
       }
-    });
-    return {
-      inUseFeat: inUseFeat,
-      unUseFeat: unUseFeat
-    };
-  };
-
-  FeatureControl.prototype.handleRemove = function (item, index) {
-    var _a;
-
-    var _b = this.props,
+      features.forEach(function (item) {
+        var _a;
+        if (item.isActive == null || ((_a = item.isActive) === null || _a === void 0 ? void 0 : _a.call(item, data))) {
+          inUseFeat.push(item);
+        } else if (item.add) {
+          unUseFeat.push(item);
+        }
+      });
+      return {
+        inUseFeat: inUseFeat,
+        unUseFeat: unUseFeat
+      };
+    }
+  });
+  Object.defineProperty(FeatureControl.prototype, "handleRemove", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (item, index) {
+      var _a;
+      var _b = this.props,
         removeFeature = _b.removeFeature,
         data = _b.data,
         onBulkChange = _b.onBulkChange;
-    var _c = this.state,
+      var _c = this.state,
         inUseFeat = _c.inUseFeat,
         unUseFeat = _c.unUseFeat;
-    (_a = item.remove) === null || _a === void 0 ? void 0 : _a.call(item, data);
-    removeFeature === null || removeFeature === void 0 ? void 0 : removeFeature(item, data);
-    onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(data);
-    lodash.remove(inUseFeat, item);
-    item.add && unUseFeat.push(item);
-    this.setState({
-      inUseFeat: inUseFeat,
-      unUseFeat: unUseFeat
-    });
-  };
-
-  FeatureControl.prototype.handleAdd = function (item) {
-    var _a;
-
-    var _b = this.props,
+      (_a = item.remove) === null || _a === void 0 ? void 0 : _a.call(item, data);
+      removeFeature === null || removeFeature === void 0 ? void 0 : removeFeature(item, data);
+      onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(data);
+      _.remove(inUseFeat, item);
+      item.add && unUseFeat.push(item);
+      this.setState({
+        inUseFeat: inUseFeat,
+        unUseFeat: unUseFeat
+      });
+    }
+  });
+  Object.defineProperty(FeatureControl.prototype, "handleAdd", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (item) {
+      var _a;
+      var _b = this.props,
         addFeature = _b.addFeature,
         data = _b.data,
         onBulkChange = _b.onBulkChange;
-    var _c = this.state,
+      var _c = this.state,
         inUseFeat = _c.inUseFeat,
         unUseFeat = _c.unUseFeat;
-    inUseFeat.push(item);
-    lodash.remove(unUseFeat, item);
-    var schema = lodash.clone(data);
-    (_a = item.add) === null || _a === void 0 ? void 0 : _a.call(item, schema);
-    addFeature === null || addFeature === void 0 ? void 0 : addFeature(item, schema);
-    onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(schema);
-  };
-
-  FeatureControl.prototype.dragRef = function (ref) {
-    var sortable = this.props.sortable;
-
-    if (!sortable) {
-      return;
+      inUseFeat.push(item);
+      _.remove(unUseFeat, item);
+      var schema = _.clone(data);
+      (_a = item.add) === null || _a === void 0 ? void 0 : _a.call(item, schema);
+      addFeature === null || addFeature === void 0 ? void 0 : addFeature(item, schema);
+      onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(schema);
     }
-
-    if (!this.drag && ref) {
-      this.initDragging();
-    } else if (this.drag && !ref) {
-      this.destroyDragging();
+  });
+  Object.defineProperty(FeatureControl.prototype, "dragRef", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (ref) {
+      var sortable = this.props.sortable;
+      if (!sortable) {
+        return;
+      }
+      if (!this.drag && ref) {
+        this.initDragging();
+      } else if (this.drag && !ref) {
+        this.destroyDragging();
+      }
+      this.drag = ref;
     }
-
-    this.drag = ref;
-  };
+  });
   /**
    * 初始化拖动
    */
-
-
-  FeatureControl.prototype.initDragging = function () {
-    var _this = this;
-
-    var dom = reactDom.findDOMNode(this);
-    this.sortable = new Sortable__default["default"](dom.querySelector(".".concat(klass, "-features")), {
-      group: 'FeatureControlGroup',
-      animation: 150,
-      handle: ".".concat(klass, "Item-dragBar"),
-      ghostClass: "".concat(klass, "Item-dragging"),
-      onEnd: function (e) {
-        // 没有移动
-        if (e.newIndex === e.oldIndex) {
-          return;
-        } // 换回来
-
-
-        var parent = e.to;
-
-        if (e.newIndex < e.oldIndex && e.oldIndex < parent.childNodes.length - 1) {
-          parent.insertBefore(e.item, parent.childNodes[e.oldIndex + 1]);
-        } else if (e.oldIndex < parent.childNodes.length - 1) {
-          parent.insertBefore(e.item, parent.childNodes[e.oldIndex]);
-        } else {
-          parent.appendChild(e.item);
+  Object.defineProperty(FeatureControl.prototype, "initDragging", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _this = this;
+      var dom = reactDom.findDOMNode(this);
+      this.sortable = new Sortable__default["default"](dom.querySelector(".".concat(klass, "-features")), {
+        group: 'FeatureControlGroup',
+        animation: 150,
+        handle: ".".concat(klass, "Item-dragBar"),
+        ghostClass: "".concat(klass, "Item-dragging"),
+        onEnd: function (e) {
+          // 没有移动
+          if (e.newIndex === e.oldIndex) {
+            return;
+          }
+          // 换回来
+          var parent = e.to;
+          if (e.newIndex < e.oldIndex && e.oldIndex < parent.childNodes.length - 1) {
+            parent.insertBefore(e.item, parent.childNodes[e.oldIndex + 1]);
+          } else if (e.oldIndex < parent.childNodes.length - 1) {
+            parent.insertBefore(e.item, parent.childNodes[e.oldIndex]);
+          } else {
+            parent.appendChild(e.item);
+          }
+          var value = _this.state.inUseFeat.concat();
+          value[e.oldIndex] = value.splice(e.newIndex, 1, value[e.oldIndex])[0];
+          _this.setState({
+            inUseFeat: value
+          }, function () {
+            var _a, _b;
+            (_b = (_a = _this.props).onSort) === null || _b === void 0 ? void 0 : _b.call(_a, value);
+          });
         }
-
-        var value = _this.state.inUseFeat.concat();
-
-        value[e.oldIndex] = value.splice(e.newIndex, 1, value[e.oldIndex])[0];
-
-        _this.setState({
-          inUseFeat: value
-        }, function () {
-          var _a, _b;
-
-          (_b = (_a = _this.props).onSort) === null || _b === void 0 ? void 0 : _b.call(_a, value);
-        });
-      }
-    });
-  };
+      });
+    }
+  });
   /**
    * 拖动的销毁
    */
-
-
-  FeatureControl.prototype.destroyDragging = function () {
-    this.sortable && this.sortable.destroy();
-  };
-
-  FeatureControl.prototype.renderItem = function (item, index) {
-    var _this = this;
-
-    var _a = this.props,
+  Object.defineProperty(FeatureControl.prototype, "destroyDragging", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      this.sortable && this.sortable.destroy();
+    }
+  });
+  Object.defineProperty(FeatureControl.prototype, "renderItem", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (item, index) {
+      var _this = this;
+      var _a = this.props,
         sortable = _a.sortable,
         goFeatureComp = _a.goFeatureComp;
         _a.node;
         var manager = _a.manager;
-    var content = null;
-
-    if (goFeatureComp) {
-      content = // @ts-ignore
-      React__default["default"].createElement(GoConfigControl.GoConfigControl, {
-        className: cx__default["default"]("".concat(klass, "Item-go")),
-        label: item.label,
-        manager: manager,
-        compId: function () {
-          return goFeatureComp(item);
+      var content = null;
+      if (goFeatureComp) {
+        content =
+        // @ts-ignore
+        React__default["default"].createElement(GoConfigControl.GoConfigControl, {
+          className: cx__default["default"]("".concat(klass, "Item-go")),
+          label: item.label,
+          manager: manager,
+          compId: function () {
+            return goFeatureComp(item);
+          }
+        });
+      } else {
+        content = React__default["default"].createElement("div", {
+          className: cx__default["default"]("".concat(klass, "Item-label"))
+        }, item.label);
+      }
+      return React__default["default"].createElement("li", {
+        className: klass + 'Item',
+        key: index
+      }, sortable && React__default["default"].createElement("a", {
+        className: klass + 'Item-dragBar'
+      }, React__default["default"].createElement(amis.Icon, {
+        icon: "drag-bar",
+        className: "icon"
+      })), content, React__default["default"].createElement(amis.Button, {
+        className: klass + 'Item-action',
+        onClick: function () {
+          return _this.handleRemove(item, index);
         }
-      });
-    } else {
-      content = React__default["default"].createElement("div", {
-        className: cx__default["default"]("".concat(klass, "Item-label"))
-      }, item.label);
+      }, React__default["default"].createElement(amis.Icon, {
+        icon: "delete-btn",
+        className: "icon"
+      })));
     }
-
-    return React__default["default"].createElement("li", {
-      className: klass + 'Item',
-      key: index
-    }, sortable && React__default["default"].createElement("a", {
-      className: klass + 'Item-dragBar'
-    }, React__default["default"].createElement(amis.Icon, {
-      icon: "drag-bar",
-      className: "icon"
-    })), content, React__default["default"].createElement(amis.Button, {
-      className: klass + 'Item-action',
-      onClick: function () {
-        return _this.handleRemove(item, index);
-      }
-    }, React__default["default"].createElement(amis.Icon, {
-      icon: "delete-btn",
-      className: "icon"
-    })));
-  };
-
-  FeatureControl.prototype.renderAction = function () {
-    var _this = this;
-
-    var _a = this.props,
+  });
+  Object.defineProperty(FeatureControl.prototype, "renderAction", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _this = this;
+      var _a = this.props,
         addable = _a.addable,
         addText = _a.addText,
         render = _a.render;
-
-    if (!addable) {
-      return null;
+      if (!addable) {
+        return null;
+      }
+      return render('action', {
+        type: 'dropdown-button',
+        closeOnClick: true,
+        label: i18nRuntime.i18n("b58c7549c0246c55b9cac96383200338") || addText,
+        className: "".concat(klass, "-action"),
+        btnClassName: "".concat(klass, "-action--btn"),
+        menuClassName: "".concat(klass, "-action--menus"),
+        buttons: this.state.unUseFeat.map(function (item) {
+          return {
+            label: item.label,
+            onClick: function () {
+              return _this.handleAdd(item);
+            }
+          };
+        }, {
+          popOverContainer: null // amis 渲染挂载节点会使用 this.target
+        })
+      });
     }
-
-    return render('action', {
-      type: 'dropdown-button',
-      closeOnClick: true,
-      label: i18nRuntime.i18n("b58c7549c0246c55b9cac96383200338") || addText,
-      className: "".concat(klass, "-action"),
-      btnClassName: "".concat(klass, "-action--btn"),
-      menuClassName: "".concat(klass, "-action--menus"),
-      buttons: this.state.unUseFeat.map(function (item) {
-        return {
-          label: item.label,
-          onClick: function () {
-            return _this.handleAdd(item);
-          }
-        };
-      }, {
-        popOverContainer: null // amis 渲染挂载节点会使用 this.target
-
-      })
-    });
-  };
-
-  FeatureControl.prototype.render = function () {
-    var _this = this;
-
-    var className = this.props.className;
-    return React__default["default"].createElement("div", {
-      className: cx__default["default"]('ae-FeatureControl', className)
-    }, React__default["default"].createElement("ul", {
-      className: cx__default["default"]('ae-FeatureControl-features'),
-      ref: this.dragRef
-    }, this.state.inUseFeat.map(function (item, index) {
-      return _this.renderItem(item, index);
-    })), this.renderAction());
-  };
-
+  });
+
+  Object.defineProperty(FeatureControl.prototype, "render", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _this = this;
+      var className = this.props.className;
+      return React__default["default"].createElement("div", {
+        className: cx__default["default"]('ae-FeatureControl', className)
+      }, React__default["default"].createElement("ul", {
+        className: cx__default["default"]('ae-FeatureControl-features'),
+        ref: this.dragRef
+      }, this.state.inUseFeat.map(function (item, index) {
+        return _this.renderItem(item, index);
+      })), this.renderAction());
+    }
+  });
   tslib.__decorate([amis.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, Number]), tslib.__metadata("design:returntype", void 0)], FeatureControl.prototype, "handleRemove", null);
-
   tslib.__decorate([amis.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], FeatureControl.prototype, "handleAdd", null);
-
   tslib.__decorate([amis.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], FeatureControl.prototype, "dragRef", null);
-
   return FeatureControl;
 }(React__default["default"].Component);
-
-/** @class */
-(function (_super) {
+/** @class */(function (_super) {
   tslib.__extends(FeatureControlRenderer, _super);
-
   function FeatureControlRenderer() {
     return _super !== null && _super.apply(this, arguments) || this;
   }
-
   FeatureControlRenderer = tslib.__decorate([amis.FormItem({
     type: 'ae-feature-control'
   })], FeatureControlRenderer);

package/lib/renderer/FormulaControl.d.ts

@@ -1,26 +1,29 @@
 /**
  * @file 表达式控件
  */
-/// <reference types="lodash" />
 import React from 'react';
 import type { VariableItem, FuncGroup } from 'amis-ui/lib/components/formula/Editor';
 import { FormControlProps } from 'amis-core';
 import type { BaseEventContext } from 'amis-editor-core';
 import { EditorManager } from 'amis-editor-core';
+export declare enum FormulaDateType {
+    NotDate = 0,
+    IsDate = 1,
+    IsRange = 2
+}
 export interface FormulaControlProps extends FormControlProps {
-    /**
-     * evalMode 即直接就是表达式，否则
-     * 需要 ${这里面才是表达式}
-     * 默认为 true，即默认不会将表达式用 ${} 包裹
-     */
-    evalMode?: boolean;
     manager?: EditorManager;
     /**
      * 用于提示的变量集合，默认为空
      */
-    variables?: Array<VariableItem>;
+    variables?: Array<VariableItem> | Function;
+    /**
+     * 配合 variables 使用
+     * 当 props.variables 存在时， 是否再从 amis数据域中取变量集合，默认 false;
+     */
+    requiredDataPropsVariables?: boolean;
     /**
-     * 变量展现模式，可选值：'tabs' ｜ 'tree'
+     * 变量展现模式，可选值：'tabs' ｜ 'tree', 默认 tabs
      */
     variableMode?: 'tabs' | 'tree';
     /**
@@ -29,9 +32,13 @@ export interface FormulaControlProps extends FormControlProps {
      */
     functions: Array<FuncGroup>;
     /**
-     * 顶部标题，默认为表达式
+     * 弹窗顶部标题，默认为 "表达式"
      */
     header: string;
+    /**
+     * 静态输入框的占位提示内容，可用于默认静态输入框 & 自定义自定义渲染器 中
+     */
+    placeholder: string;
     /**
      * 编辑器上下文数据，用于获取字段所在Form的其他字段
      */
@@ -69,30 +76,40 @@ export interface FormulaControlProps extends FormControlProps {
      * 是否使用外部的Form数据
      */
     useExternalFormData?: boolean;
+    /**
+     * 是否是日期类组件使用formulaControl
+     * 日期类 值 使用表达式时，支持 now、+1day、-2weeks、+1hours、+2years等这种相对值写法，不会最外层包裹 ${}
+     * 日期类 跨度值 使用表达式时，支持 1day、2weeks、1hours、2years等这种相对值写法，不会最外层包裹 ${}
+     * 默认为 FormulaDateType.NotDate
+     */
+    DateTimeType?: FormulaDateType;
 }
 interface FormulaControlState {
     /** 变量数据 */
     variables: any;
     variableMode?: 'tree' | 'tabs';
-    evalMode?: boolean;
 }
 export default class FormulaControl extends React.Component<FormulaControlProps, FormulaControlState> {
     static defaultProps: Partial<FormulaControlProps>;
     isUnmount: boolean;
     constructor(props: FormulaControlProps);
-    componentDidUpdate(prevProps: FormulaControlProps): void;
+    componentDidMount(): Promise<void>;
+    componentDidUpdate(prevProps: FormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
-    normalizeVariables(variables: any): any[];
     /**
      * 将 ${xx}（非 \${xx}）替换成 \${xx}
      * 备注: 手动编辑时，自动处理掉 ${xx}，避免识别成 公式表达式
      */
-    replaceExpression(expression: any): any;
+    outReplaceExpression(expression: any): any;
+    inReplaceExpression(expression: any): any;
     isLoopExpression(expression: any, selfName: string): boolean;
     isExpectType(value: any): boolean;
-    resolveVariablesFromScope(): Promise<any>;
+    matchDate(str: string): boolean;
+    matchDateRange(str: string): boolean;
+    hasDateShortcutkey(str: string): boolean;
+    transExpr(str: string): string;
     handleConfirm(value: any): void;
-    handleSimpleInputChange: import("lodash").DebouncedFunc<(value: any) => void>;
+    handleSimpleInputChange: (value: any) => void;
     handleInputChange: (value: any) => void;
     filterCustomRendererProps(rendererSchema: any): any;
     renderFormulaValue(item: any): JSX.Element;