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

package/lib/renderer/DataPickerControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
@@ -19,41 +19,56 @@ var DataPickerControl = /** @class */ (function (_super) {
     function DataPickerControl() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DataPickerControl.prototype.handleConfirm = function (value) {
-        this.props.onChange(value);
-    };
-    DataPickerControl.prototype.handlePickerOpen = function () {
-        var _a;
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var _b, manager, node, variables;
-            return tslib.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _b = this.props, manager = _b.manager, node = _b.node;
-                        variables = (_a = this.props.variables) !== null && _a !== void 0 ? _a : this.props.data.variables;
-                        if (!!variables) return [3 /*break*/, 2];
-                        return [4 /*yield*/, manager.getContextSchemas(node.info.id)];
-                    case 1:
-                        _c.sent();
-                        variables = manager.dataSchema.getDataPropsAsOptions();
-                        _c.label = 2;
-                    case 2: return [2 /*return*/, {
-                            variables: variables.map(function (item) { return (tslib.__assign(tslib.__assign({}, item), { selectMode: 'tree' })); }),
-                            variableMode: 'tabs'
-                        }];
-                }
+    Object.defineProperty(DataPickerControl.prototype, "handleConfirm", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function (value) {
+            this.props.onChange(value);
+        }
+    });
+    Object.defineProperty(DataPickerControl.prototype, "handlePickerOpen", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function () {
+            var _a;
+            return tslib.__awaiter(this, void 0, void 0, function () {
+                var _b, manager, node, variables;
+                return tslib.__generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            _b = this.props, manager = _b.manager, node = _b.node;
+                            variables = (_a = this.props.variables) !== null && _a !== void 0 ? _a : this.props.data.variables;
+                            if (!!variables) return [3 /*break*/, 2];
+                            return [4 /*yield*/, manager.getContextSchemas(node.info.id)];
+                        case 1:
+                            _c.sent();
+                            variables = manager.dataSchema.getDataPropsAsOptions();
+                            _c.label = 2;
+                        case 2: return [2 /*return*/, {
+                                variables: variables.map(function (item) { return (tslib.__assign(tslib.__assign({}, item), { selectMode: 'tree' })); }),
+                                variableMode: 'tabs'
+                            }];
+                    }
+                });
             });
-        });
-    };
-    DataPickerControl.prototype.render = function () {
-        var _a = this.props; _a.classnames; var value = _a.value, onChange = _a.onChange, disabled = _a.disabled; _a.manager; _a.node;
-        return (React__default["default"].createElement(amis.FormulaPicker, { onPickerOpen: this.handlePickerOpen, evalMode: false, onConfirm: this.handleConfirm, value: value, onChange: function () { }, header: '' }, function (_a) {
-            var onClick = _a.onClick;
-            return (React__default["default"].createElement(amis.InputBox, { className: "ae-InputVariable", clearable: false, value: value, onChange: onChange, disabled: disabled },
-                React__default["default"].createElement("span", { onClick: onClick },
-                    React__default["default"].createElement(amis.Icon, { icon: "info", className: "icon" }))));
-        }));
-    };
+        }
+    });
+    Object.defineProperty(DataPickerControl.prototype, "render", {
+        enumerable: false,
+        configurable: true,
+        writable: true,
+        value: function () {
+            var _a = this.props; _a.classnames; var value = _a.value, onChange = _a.onChange, disabled = _a.disabled; _a.manager; _a.node;
+            return (React__default["default"].createElement(amis.FormulaPicker, { onPickerOpen: this.handlePickerOpen, evalMode: false, onConfirm: this.handleConfirm, value: value, onChange: function () { }, header: '' }, function (_a) {
+                var onClick = _a.onClick;
+                return (React__default["default"].createElement(amis.InputBox, { className: "ae-InputVariable", clearable: false, value: value, onChange: onChange, disabled: disabled },
+                    React__default["default"].createElement("span", { onClick: onClick },
+                        React__default["default"].createElement(amis.Icon, { icon: "info", className: "icon" }))));
+            }));
+        }
+    });
     tslib.__decorate([
         amisEditorCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderer/DateShortCutControl.d.ts

@@ -5,25 +5,28 @@ import React from 'react';
 import Sortable from 'sortablejs';
 import type { FormControlProps } from 'amis-core';
 import type { BaseEventContext } from 'amis-editor-core';
-declare type RangesType = Array<string | {
-    label: string;
-    range: any;
-}>;
-declare type DropDownOption = {
+import type { Option } from 'amis';
+type $Object = {
     [key: string]: string;
 };
+declare enum RangeType {
+    Normal = "Normal",
+    Custom = "Custom"
+}
 export interface DateShortCutControlProps extends FormControlProps {
     className?: string;
     /**
      * 编辑器上下文数据，用于获取字段所在Form的其他字段
      */
     context: BaseEventContext;
-    dropDownOption: DropDownOption;
+    normalDropDownOption: $Object;
+    customDropDownOption: $Object;
 }
 interface OptionsType {
-    label: string;
-    type: string;
-    inputValue: string;
+    label?: string;
+    value: string;
+    type: RangeType;
+    inputType?: string;
 }
 interface DateShortCutControlState {
     options: Array<OptionsType>;
@@ -32,20 +35,10 @@ export declare class DateShortCutControl extends React.PureComponent<DateShortCu
     sortable?: Sortable;
     drag?: HTMLElement | null;
     target: HTMLElement | null;
-    dropDownOptionArr: Array<{
-        label: string;
-        value: string;
-    }>;
+    normalDropDownOptionArr: Array<Option>;
+    customDropDownOptionArr: Array<Option>;
     static defaultProps: Partial<DateShortCutControlProps>;
     constructor(props: DateShortCutControlProps);
-    initOptions(ranges: RangesType): void;
-    /**
-     * 添加
-     */
-    addItem(item: {
-        label: string;
-        value: string;
-    }): void;
     dragRef(ref: any): void;
     scrollToBottom(): void;
     /**
@@ -61,13 +54,21 @@ export declare class DateShortCutControl extends React.PureComponent<DateShortCu
      */
     renderContent(): JSX.Element;
     /**
-     * 生成选项
+     * 生成固定跨度选项
+     */
+    renderNormalOption(option: OptionsType, index: number): JSX.Element;
+    /**
+     * 生成自定义跨度选项
+     */
+    renderCustomOption(option: OptionsType, index: number): JSX.Element;
+    /**
+     * 自定义跨度变化
      */
-    renderOption(option: OptionsType, index: number): JSX.Element;
+    handleCustomItemChange(value: string, index: number): void;
     /**
-     * 输入框的改变
+     * option添加
      */
-    onInputChange(index: number, value: string, key: 'inputValue' | 'label'): void;
+    addItem(item: Option, type: RangeType): void;
     /**
      * 删除选项
      */