amis-editor 5.4.0 → 5.4.1

package/esm/renderer/DateShortCutControl.d.ts

@@ -3,40 +3,68 @@
  */
 import React from 'react';
 import Sortable from 'sortablejs';
-import type { FormControlProps } from 'amis-core';
-import type { BaseEventContext } from 'amis-editor-core';
-import type { Option } from 'amis';
-type $Object = {
-    [key: string]: string;
+import { FormControlProps, Option } from 'amis-core';
+import { BaseEventContext } from 'amis-editor-core';
+declare const CertainPresetShorcut: {
+    today: string;
+    yesterday: string;
+    thisweek: string;
+    prevweek: string;
+    thismonth: string;
+    prevmonth: string;
+    thisquarter: string;
+    prevquarter: string;
+    thisyear: string;
+};
+declare const ModifyPresetShorcut: {
+    $daysago: string;
+    $dayslater: string;
+    $weeksago: string;
+    $weekslater: string;
+    $monthsago: string;
+    $monthslater: string;
+    $quartersago: string;
+    $quarterslater: string;
+    $yearsago: string;
+    $yearslater: string;
 };
-declare enum RangeType {
-    Normal = "Normal",
-    Custom = "Custom"
-}
 export interface DateShortCutControlProps extends FormControlProps {
     className?: string;
     /**
      * 编辑器上下文数据，用于获取字段所在Form的其他字段
      */
     context: BaseEventContext;
-    normalDropDownOption: $Object;
-    customDropDownOption: $Object;
+    certainOptions: Array<keyof typeof CertainPresetShorcut>;
+    modifyOptions: Array<keyof typeof ModifyPresetShorcut>;
 }
-interface OptionsType {
-    label?: string;
+type PresetShorCutType = string;
+type CustomShortCutType = {
+    label: string;
+    startDate: string;
+    endDate: string;
+};
+type ModifyOptionType = {
+    key: keyof typeof ModifyPresetShorcut;
     value: string;
-    type: RangeType;
-    inputType?: string;
+};
+declare enum OptionType {
+    Custom = 1,
+    Certain = 2,
+    Modify = 3
+}
+interface OptionDataType {
+    data: PresetShorCutType | CustomShortCutType | ModifyOptionType;
+    type?: OptionType;
 }
 interface DateShortCutControlState {
-    options: Array<OptionsType>;
+    options: Array<OptionDataType>;
 }
 export declare class DateShortCutControl extends React.PureComponent<DateShortCutControlProps, DateShortCutControlState> {
     sortable?: Sortable;
     drag?: HTMLElement | null;
     target: HTMLElement | null;
-    normalDropDownOptionArr: Array<Option>;
-    customDropDownOptionArr: Array<Option>;
+    certainDropDownOptions: Array<Option>;
+    modifyDropDownOptions: Array<Option>;
     static defaultProps: Partial<DateShortCutControlProps>;
     constructor(props: DateShortCutControlProps);
     dragRef(ref: any): void;
@@ -50,25 +78,21 @@ export declare class DateShortCutControl extends React.PureComponent<DateShortCu
      */
     destroyDragging(): void;
     /**
-     * 生成内容体
-     */
-    renderContent(): JSX.Element;
-    /**
-     * 生成固定跨度选项
+     * 生成快捷键项的配置
      */
-    renderNormalOption(option: OptionsType, index: number): JSX.Element;
+    renderOption(option: OptionDataType, index: number): any;
     /**
-     * 生成自定义跨度选项
+     * 生成内容体
      */
-    renderCustomOption(option: OptionsType, index: number): JSX.Element;
+    renderContent(): React.JSX.Element;
     /**
      * 自定义跨度变化
      */
-    handleCustomItemChange(value: string, index: number): void;
+    handleOptionChange(data: string | CustomShortCutType | ModifyOptionType, index: number): void;
     /**
      * option添加
      */
-    addItem(item: Option, type: RangeType): void;
+    addItem(item: Option, type: OptionType): void;
     /**
      * 删除选项
      */
@@ -77,7 +101,7 @@ export declare class DateShortCutControl extends React.PureComponent<DateShortCu
      * 更新options字段的统一出口
      */
     onChangeOptions(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export declare class DateShortCutControlRender extends DateShortCutControl {
 }

package/esm/renderer/DateShortCutControl.js

@@ -9,14 +9,40 @@ import cx from 'classnames';
 import Sortable from 'sortablejs';
 import { findDOMNode } from 'react-dom';
 import { FormItem, Icon } from 'amis';
-import { autobind } from 'amis-editor-core';
+import { getSchemaTpl, autobind } from 'amis-editor-core';
+import { FormulaDateType } from './FormulaControl.js';
 import { i18n } from 'i18n-runtime';
 
-var RangeType;
-(function (RangeType) {
-  RangeType["Normal"] = "Normal";
-  RangeType["Custom"] = "Custom";
-})(RangeType || (RangeType = {}));
+var DefaultValue = ['yesterday', '7daysago', 'thismonth', 'prevmonth', 'prevquarter'];
+var CertainPresetShorcut = {
+  today: i18n("800dfdd90200bd47bb4bb83def4fea56"),
+  yesterday: i18n("2f8d6f1584b73bfc6dada44526abb502"),
+  thisweek: i18n("0dc86a275145ad5a7774e594f0d94a06"),
+  prevweek: i18n("79abd4ee3661ff70c7d79716c8aaed83"),
+  thismonth: i18n("8f2a5a5f6e3777c7a0e1ce9484a2f7d7"),
+  prevmonth: i18n("d5578d93388a5b2552316418cd1124da"),
+  thisquarter: i18n("ffb2b7fbf227d9d21e03d0f160fb2a34"),
+  prevquarter: i18n("dd657784cc0d5511d2f25459e49ead1a"),
+  thisyear: i18n("d3dbc7a7fd9fc5ccd168084c8579c1ec")
+};
+var ModifyPresetShorcut = {
+  $daysago: i18n("fd312ae2f1c24b8a14d9412bb3c6bb76"),
+  $dayslater: i18n("68cba5f27ab003cfada5eb4c1f29eb21"),
+  $weeksago: i18n("34b06708894a178c440e6f6539e95e9e"),
+  $weekslater: i18n("f0e1b8d8a6e731360d7348bc8301d44a"),
+  $monthsago: i18n("5cad2778bb8f01d1a1b1226082eb2117"),
+  $monthslater: i18n("ff76f60b3da86a0d2c6663b170a7955a"),
+  $quartersago: i18n("9ff9b56c9ed633ee09396830e93113ad"),
+  $quarterslater: i18n("2b80b20008b3ae81136217ae10a1fbaf"),
+  $yearsago: i18n("84752114d27119dc50d8a7b9ac0b788b"),
+  $yearslater: i18n("5df2352afebd73d1f568ebaa81e2db28")
+};
+var OptionType;
+(function (OptionType) {
+  OptionType[OptionType["Custom"] = 1] = "Custom";
+  OptionType[OptionType["Certain"] = 2] = "Certain";
+  OptionType[OptionType["Modify"] = 3] = "Modify";
+})(OptionType || (OptionType = {}));
 var ShortCutItemWrap = function (props) {
   return React__default.createElement(React__default.Fragment, null, React__default.createElement("a", {
     className: klass + 'Item-dragBar'
@@ -42,40 +68,55 @@ var DateShortCutControl = /** @class */function (_super) {
     var _this = this;
     var _a, _b;
     _this = _super.call(this, props) || this;
-    var normalDropDownOption = props.normalDropDownOption,
-      customDropDownOption = props.customDropDownOption,
+    // 初始化下拉选项
+    var certainOptions = props.certainOptions,
+      modifyOptions = props.modifyOptions,
       data = props.data;
-    _this.normalDropDownOptionArr = Object.keys(normalDropDownOption).map(function (key) {
+    _this.certainDropDownOptions = certainOptions.map(function (key) {
       return {
-        label: normalDropDownOption[key],
+        label: CertainPresetShorcut[key],
         value: key
       };
     });
-    _this.customDropDownOptionArr = Object.keys(customDropDownOption).map(function (key) {
+    _this.modifyDropDownOptions = modifyOptions.map(function (key) {
       return {
-        label: customDropDownOption[key],
+        label: ModifyPresetShorcut[key],
         value: key
       };
     });
-    var defaultShortcuts = ['yesterday', '7daysago', 'prevweek', 'thismonth', 'prevmonth', 'prevquarter'];
+    // 初始化原始组件配置的快捷键
+    /** amis 3.1.0之后ranges属性废弃，此处兼容 */
+    var initData = (_b = (_a = data === null || data === void 0 ? void 0 : data.ranges) !== null && _a !== void 0 ? _a : data === null || data === void 0 ? void 0 : data.shortcuts) !== null && _b !== void 0 ? _b : DefaultValue;
+    initData = Array.isArray(initData) ? initData : initData.split(',');
     _this.state = {
-      /** amis 3.1.0之后ranges属性废弃，此处兼容 */
-      options: ((_b = (_a = data === null || data === void 0 ? void 0 : data.ranges) !== null && _a !== void 0 ? _a : data === null || data === void 0 ? void 0 : data.shortcuts) !== null && _b !== void 0 ? _b : defaultShortcuts).map(function (item, index) {
-        var _a;
-        var arr = item.match(/^(\d+)[a-zA-Z]+/);
+      options: initData.map(function (item) {
+        if (!item) {
+          return null;
+        }
+        // 完全自定义的快捷键
+        if (typeof item != 'string' && item.label && item.startDate && item.endDate) {
+          return {
+            type: OptionType.Custom,
+            data: item
+          };
+        }
+        // amis中提供的可灵活配置数字的自定义快捷键
+        var arr = item.match(/^([a-zA-Z]*)(\d+)([a-zA-Z]*)$/);
         if (arr) {
           return {
-            value: arr[1],
-            type: RangeType.Custom,
-            inputType: (_a = item.match(/[a-zA-Z]+/)) === null || _a === void 0 ? void 0 : _a[0]
+            data: {
+              value: arr[2],
+              key: "".concat(arr[1], "$").concat(arr[3])
+            },
+            type: OptionType.Modify
           };
         }
+        // 固定值的快捷键
         return {
-          label: normalDropDownOption[item],
-          value: item,
-          type: RangeType.Normal
+          data: item,
+          type: OptionType.Certain
         };
-      })
+      }).filter(Boolean)
     };
     return _this;
   }
@@ -139,6 +180,77 @@ var DateShortCutControl = /** @class */function (_super) {
   DateShortCutControl.prototype.destroyDragging = function () {
     this.sortable && this.sortable.destroy();
   };
+  /**
+   * 生成快捷键项的配置
+   */
+  DateShortCutControl.prototype.renderOption = function (option, index) {
+    var _this = this;
+    var _a = this.props,
+      render = _a.render,
+      schema = _a.data;
+    if (option.type === OptionType.Certain) {
+      return React__default.createElement("span", {
+        className: klass + 'Item-content-label'
+      }, CertainPresetShorcut[option.data]);
+    }
+    if (option.type === OptionType.Custom) {
+      var data = option === null || option === void 0 ? void 0 : option.data;
+      return render('inner', {
+        type: 'form',
+        wrapWithPanel: false,
+        body: [{
+          type: 'input-text',
+          mode: 'normal',
+          placeholder: i18n("a6a93b404bc039cded728683af5d625d"),
+          name: 'label'
+        }, getSchemaTpl('valueFormula', {
+          name: 'startDate',
+          header: i18n("98229308e2e9484583fde4ae363a979f"),
+          DateTimeType: FormulaDateType.IsDate,
+          rendererSchema: __assign(__assign({}, schema), {
+            type: 'input-date'
+          }),
+          placeholder: i18n("592c59589144ddc68d05d528da17dcdc"),
+          needDeleteProps: ['ranges', 'shortcuts', 'maxDate', 'id', 'minDuration'],
+          label: false
+        }), getSchemaTpl('valueFormula', {
+          name: 'endDate',
+          header: i18n("98229308e2e9484583fde4ae363a979f"),
+          DateTimeType: FormulaDateType.IsDate,
+          rendererSchema: __assign(__assign({}, schema), {
+            type: 'input-date'
+          }),
+          placeholder: i18n("f782779e8b5d709462c8e71e0d9019f2"),
+          needDeleteProps: ['ranges', 'shortcuts', 'maxDate', 'id', 'minDuration'],
+          label: false
+        })],
+        onChange: function (value) {
+          _this.handleOptionChange(value, index);
+        }
+      }, {
+        data: data
+      });
+    }
+    var key = option.data.key;
+    var label = ModifyPresetShorcut[key].split('n');
+    return render('inner', {
+      type: 'form',
+      wrapWithPanel: false,
+      body: [{
+        name: 'value',
+        type: 'input-text',
+        prefix: label[0] || undefined,
+        suffix: label[1] || undefined,
+        mode: 'normal',
+        placeholder: 'n'
+      }],
+      onChange: function (value) {
+        return _this.handleOptionChange(value, index);
+      }
+    }, {
+      data: option.data
+    });
+  };
   /**
    * 生成内容体
    */
@@ -154,112 +266,21 @@ var DateShortCutControl = /** @class */function (_super) {
       return React__default.createElement("li", {
         className: klass + 'Item',
         key: index
-      }, option.type === RangeType.Normal ? _this.renderNormalOption(option, index) : _this.renderCustomOption(option, index));
+      }, React__default.createElement(ShortCutItemWrap, {
+        index: index,
+        handleDelete: _this.handleDelete
+      }, _this.renderOption(option, index)));
     })) : React__default.createElement("div", {
       className: klass + '-content ' + klass + '-empty'
     }, "\u672A\u914D\u7F6E"));
   };
-  /**
-   * 生成固定跨度选项
-   */
-  DateShortCutControl.prototype.renderNormalOption = function (option, index) {
-    return React__default.createElement(ShortCutItemWrap, {
-      index: index,
-      handleDelete: this.handleDelete
-    }, React__default.createElement("span", null, option.label));
-  };
-  /**
-   * 生成自定义跨度选项
-   */
-  DateShortCutControl.prototype.renderCustomOption = function (option, index) {
-    var _this = this;
-    var render = this.props.render;
-    var renderInput = function (option) {
-      if (option.type === 'middle') {
-        return render('inner', {
-          type: 'input-text',
-          prefix: option === null || option === void 0 ? void 0 : option.prefix,
-          suffix: option.suffix,
-          mode: 'normal',
-          placeholder: 'n',
-          value: option === null || option === void 0 ? void 0 : option.value,
-          onChange: function (value) {
-            return _this.handleCustomItemChange(value, index);
-          }
-        });
-      }
-      return render('inner', {
-        type: 'input-text',
-        placeholder: 'n',
-        mode: 'normal',
-        suffix: option.suffix,
-        value: option === null || option === void 0 ? void 0 : option.value,
-        onChange: function (value) {
-          return _this.handleCustomItemChange(value, index);
-        }
-      });
-    };
-    var dateMap = {
-      daysago: {
-        prefix: i18n("046c6233e03af774df7b90b4504fa96c"),
-        suffix: i18n("249aba763258bbe488af3e79a381d265"),
-        type: 'middle'
-      },
-      dayslater: {
-        suffix: i18n("2f8ab07bea442bc6ce8a9e99ff88e5c1"),
-        type: 'suffix'
-      },
-      weeksago: {
-        prefix: i18n("046c6233e03af774df7b90b4504fa96c"),
-        suffix: i18n("a657f46f5bb00961adfae80d12e41b3d"),
-        type: 'middle'
-      },
-      weekslater: {
-        suffix: i18n("b1599eaa05dc9b3d90be5aebc5c84338"),
-        type: 'suffix'
-      },
-      monthsago: {
-        prefix: i18n("046c6233e03af774df7b90b4504fa96c"),
-        suffix: i18n("e42b99d59954ce6437e66f416850425a"),
-        type: 'middle'
-      },
-      monthslater: {
-        suffix: i18n("3c690347976de82df1909750cbc82b80"),
-        type: 'suffix'
-      },
-      quartersago: {
-        prefix: i18n("046c6233e03af774df7b90b4504fa96c"),
-        suffix: i18n("a483bccf85587055ab31314ad1d2f82a"),
-        type: 'middle'
-      },
-      quarterslater: {
-        suffix: i18n("b62ba98a627851e911bef8fbb005bd4a"),
-        type: 'suffix'
-      },
-      yearsago: {
-        prefix: i18n("046c6233e03af774df7b90b4504fa96c"),
-        suffix: i18n("465260fe80b0c3338d06194bb7a94446"),
-        type: 'middle'
-      },
-      yearslater: {
-        suffix: i18n("137bcb84f52bbd48623c37d8dfdebdff"),
-        type: 'suffix'
-      }
-    };
-    return React__default.createElement(ShortCutItemWrap, {
-      index: index,
-      handleDelete: this.handleDelete
-    }, option.inputType ? renderInput(__assign(__assign({}, dateMap[option.inputType]), {
-      value: option.value
-    })) : null);
-  };
   /**
    * 自定义跨度变化
    */
-  DateShortCutControl.prototype.handleCustomItemChange = function (value, index) {
+  DateShortCutControl.prototype.handleOptionChange = function (data, index) {
     var _this = this;
     var options = __spreadArray([], __read(this.state.options), false);
-    options[index].value = value;
+    options[index].data = data;
     this.setState({
       options: options
     }, function () {
@@ -271,15 +292,18 @@ var DateShortCutControl = /** @class */function (_super) {
    */
   DateShortCutControl.prototype.addItem = function (item, type) {
     var _this = this;
-    var _a;
     this.setState({
-      options: __spreadArray(__spreadArray([], __read(this.state.options), false), [__assign({
-        label: (_a = item === null || item === void 0 ? void 0 : item.label) !== null && _a !== void 0 ? _a : '',
+      options: this.state.options.concat({
         type: type,
-        value: type === RangeType.Normal ? item.value : ''
-      }, type === RangeType.Normal ? {} : {
-        inputType: item.value
-      })], false)
+        data: type === OptionType.Certain ? item.value : type === OptionType.Modify ? {
+          key: item.value,
+          value: undefined
+        } : {
+          label: undefined,
+          startDate: undefined,
+          endDate: undefined
+        }
+      })
     }, function () {
       _this.onChangeOptions();
       _this.scrollToBottom();
@@ -307,17 +331,23 @@ var DateShortCutControl = /** @class */function (_super) {
     var _b = this.props,
       onBulkChange = _b.onBulkChange,
       name = _b.name;
-    var newOptions = [];
-    options.forEach(function (item, index) {
-      if (item.type === RangeType.Normal) {
-        newOptions[index] = item.value;
+    var newRanges = [];
+    options.forEach(function (item) {
+      if (item.type === OptionType.Certain) {
+        newRanges.push(item.data);
       }
-      if (item.type === RangeType.Custom && item.value) {
-        newOptions[index] = "".concat(item.value).concat(item.inputType);
+      if (item.type === OptionType.Modify) {
+        var data = item.data;
+        var value = data.value;
+        /^\d+$/.test(value) && newRanges.push(data.key.replace('$', value));
+      }
+      if (item.type === OptionType.Custom) {
+        var data = item.data;
+        data.label && data.startDate && data.endDate && newRanges.push(__assign({}, data));
       }
     });
     /** amis 3.1.0之后ranges属性废弃 */
-    onBulkChange && onBulkChange((_a = {}, _a[name !== null && name !== void 0 ? name : 'shortcuts'] = newOptions, _a.ranges = undefined, _a));
+    onBulkChange && onBulkChange((_a = {}, _a[name !== null && name !== void 0 ? name : 'shortcuts'] = newRanges, _a.ranges = undefined, _a));
   };
   DateShortCutControl.prototype.render = function () {
     var _this = this;
@@ -339,11 +369,11 @@ var DateShortCutControl = /** @class */function (_super) {
       closeOnClick: true,
       closeOnOutside: true,
       level: 'enhance',
-      buttons: this.normalDropDownOptionArr.map(function (item) {
+      buttons: this.certainDropDownOptions.map(function (item) {
         return __assign(__assign({}, item), {
           type: 'button',
           onAction: function (e, action) {
-            return _this.addItem(item, RangeType.Normal);
+            return _this.addItem(item, OptionType.Certain);
           }
         });
       })
@@ -356,14 +386,26 @@ var DateShortCutControl = /** @class */function (_super) {
       label: i18n("7a1e5f93e362d371519bcb2bfdb0fc9a"),
       closeOnClick: true,
       closeOnOutside: true,
-      buttons: this.customDropDownOptionArr.map(function (item) {
+      buttons: this.modifyDropDownOptions.map(function (item) {
         return __assign(__assign({}, item), {
           type: 'button',
           onAction: function (e, action) {
-            return _this.addItem(item, RangeType.Custom);
+            return _this.addItem(item, OptionType.Modify);
           }
         });
-      })
+      }).concat([{
+        type: 'button',
+        label: i18n("0d98c74797e49d00bcc4c17c9d557a2b"),
+        onAction: function (e, action) {
+          return _this.addItem({
+            value: {
+              label: undefined,
+              startDate: undefined,
+              endData: undefined
+            }
+          }, OptionType.Custom);
+        }
+      }])
     }, {
       popOverContainer: null
     }))));

package/esm/renderer/ExpressionFormulaControl.d.ts

@@ -40,7 +40,7 @@ export default class ExpressionFormulaControl extends React.Component<Expression
     initFormulaPickerValue(value: string): void;
     handleConfirm(value?: string): void;
     handleClearExpression(e: React.MouseEvent<HTMLElement>): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export declare class ExpressionFormulaControlRenderer extends ExpressionFormulaControl {
 }

package/esm/renderer/FeatureControl.d.ts

@@ -55,9 +55,9 @@ export default class FeatureControl extends React.Component<FeatureControlProps,
      * 拖动的销毁
      */
     destroyDragging(): void;
-    renderItem(item: FeatureOption, index: number): JSX.Element;
+    renderItem(item: FeatureOption, index: number): React.JSX.Element;
     renderAction(): any;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export declare class FeatureControlRenderer extends FeatureControl {
 }

package/esm/renderer/FlexSettingControl.d.ts

@@ -13,7 +13,7 @@ interface FlexSettingControlProps extends FormControlProps {
 export default class FlexSettingControl extends React.Component<FlexSettingControlProps> {
     constructor(props: any);
     setField(field: string): (val: string) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export declare class FlexSettingControlRenderer extends FlexSettingControl {
 }

package/esm/renderer/FormulaControl.d.ts

@@ -12,7 +12,7 @@ export declare enum FormulaDateType {
     IsDate = 1,
     IsRange = 2
 }
-export declare function renderFormulaValue(item: any): JSX.Element;
+export declare function renderFormulaValue(item: any): React.JSX.Element;
 export interface FormulaControlProps extends FormControlProps {
     manager?: EditorManager;
     /**
@@ -94,6 +94,7 @@ interface FormulaControlState {
     variables: any;
     variableMode?: 'tree' | 'tabs';
     formulaPickerOpen: boolean;
+    loading: boolean;
 }
 export default class FormulaControl extends React.Component<FormulaControlProps, FormulaControlState> {
     static defaultProps: Partial<FormulaControlProps>;
@@ -118,13 +119,17 @@ export default class FormulaControl extends React.Component<FormulaControlProps,
     hasDateShortcutkey(str: string): boolean;
     transExpr(str: string): string;
     handleConfirm(value: any): void;
-    handleFormulaClick(): void;
+    /**
+     * 公式编辑器打开完成一些异步任务的加载
+     */
+    beforeFormulaEditorOpen(): Promise<void>;
+    handleFormulaClick(): Promise<void>;
     closeFormulaPicker(): void;
     handleSimpleInputChange: (value: any) => void;
     handleInputChange: (value: any) => void;
     filterCustomRendererProps(rendererSchema: any): any;
     getContextData(): any;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export declare class FormulaControlRenderer extends FormulaControl {
 }