amis-editor 5.2.0-beta.0 → 5.2.0-beta.2

package/lib/renderer/ColumnControl.d.ts

@@ -0,0 +1,19 @@
+/**
+ * @file 表格自定义列可视化编辑控件
+ */
+import React from 'react';
+import { FormControlProps } from 'amis';
+export interface ColumnControlProps extends FormControlProps {
+    className?: string;
+}
+export interface ColumnsControlState {
+    columns: Array<any>;
+}
+export default class ColumnControl extends React.Component<ColumnControlProps, ColumnsControlState> {
+    constructor(props: any);
+    transformColumns(props: any): any;
+    onChange(value: Array<any>): void;
+    render(): JSX.Element;
+}
+export declare class ColumnControlRenderer extends ColumnControl {
+}

package/lib/renderer/DataBindingControl.d.ts

@@ -1,14 +1,42 @@
-import type { FormControlProps } from 'amis-core';
+/// <reference types="lodash" />
+import { FormControlProps, RendererProps } from 'amis-core';
 import React from 'react';
-export declare class DataBindingControl extends React.Component<FormControlProps> {
-    handleConfirm(result: {
-        value: string;
-        schema: any;
-    }): void;
-    handlePickerOpen(): Promise<{
-        schemas: any;
-    }>;
+import { EditorManager, EditorNodeType, DSField, DSFieldGroup } from 'amis-editor-core';
+import { SchemaCollection } from 'amis/lib/Schema';
+export interface DataBindingProps extends FormControlProps {
+    node: EditorNodeType;
+    manager: EditorManager;
+    onBindingChange?: (value: DSField, onBulkChange: (value: any) => void) => void;
+}
+export interface DataBindingState {
+    loading: boolean;
+    hint: string | void;
+    schema?: SchemaCollection;
+}
+export interface DataBindingPanelProps extends RendererProps {
+    onSelect: (value: any) => void;
+    isSelected?: (value: any) => boolean;
+}
+export declare class DataBindingControl extends React.Component<DataBindingProps, DataBindingState> {
+    constructor(props: DataBindingProps);
+    handleConfirm(result: DSField): void;
+    handlePickerOpen(): Promise<void>;
     render(): JSX.Element;
 }
 export declare class DataBindingControlRenderer extends DataBindingControl {
 }
+export interface SimpleDataBindingProps extends DataBindingPanelProps {
+    fields: DSFieldGroup[];
+}
+export interface SimpleDataBindingState {
+    filteredFields: DSFieldGroup[];
+}
+export declare class SimpleDataBindingControl extends React.Component<SimpleDataBindingProps, SimpleDataBindingState> {
+    constructor(props: SimpleDataBindingProps);
+    handleSearchDebounced: import("lodash").DebouncedFunc<(keywords: string) => Promise<void>>;
+    handleSearch(keywords: string): Promise<void>;
+    handleSelect(): void;
+    render(): JSX.Element;
+}
+export declare class SimpleDataBindingControlRenderer extends SimpleDataBindingControl {
+}

package/lib/renderer/DataBindingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.0
+ * amis-editor v5.2.0-beta.2
  * Copyright 2018-2022 @fex
  */
 
@@ -9,83 +9,302 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var amis = require('amis');
+var amisCore = require('amis-core');
+var lodash = require('lodash');
 var React = require('react');
-var AMisCodeEditor = require('amis-editor-core');
+var amisEditorCore = require('amis-editor-core');
+var matchSorter = require('match-sorter');
+var cx = require('classnames');
+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 cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
-var DataBindingControl = /** @class */ (function (_super) {
-    tslib.__extends(DataBindingControl, _super);
-    function DataBindingControl() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    DataBindingControl.prototype.handleConfirm = function (result) {
-        var _a, _b;
-        var _c = this.props, manager = _c.manager, data = _c.data;
-        if (result === null || result === void 0 ? void 0 : result.value) {
-            this.props.onChange("".concat(result.value));
-            (_b = (_a = manager.config) === null || _a === void 0 ? void 0 : _a.dataBindingChange) === null || _b === void 0 ? void 0 : _b.call(_a, result.value, data, manager);
-        }
+var DataBindingControl =
+/** @class */
+function (_super) {
+  tslib.__extends(DataBindingControl, _super);
+
+  function DataBindingControl(props) {
+    var _this = _super.call(this, props) || this;
+
+    _this.state = {
+      loading: false,
+      hint: undefined
     };
-    DataBindingControl.prototype.handlePickerOpen = function () {
-        var _a, _b;
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var _c, manager, node, withSuper, schemas;
-            return tslib.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        _c = this.props, manager = _c.manager, node = _c.node;
-                        withSuper = (_b = (_a = manager.config) === null || _a === void 0 ? void 0 : _a.withSuperDataSchema) !== null && _b !== void 0 ? _b : false;
-                        return [4 /*yield*/, manager.getContextSchemas(node.info.id, !withSuper)];
-                    case 1:
-                        schemas = _d.sent();
-                        return [2 /*return*/, { schemas: schemas }];
-                }
+    return _this;
+  }
+
+  DataBindingControl.prototype.handleConfirm = function (result) {
+    var _a, _b;
+
+    var _c = this.props,
+        manager = _c.manager,
+        data = _c.data,
+        onChange = _c.onChange,
+        onBulkChange = _c.onBulkChange,
+        onBindingChange = _c.onBindingChange;
+
+    if (result === null || result === void 0 ? void 0 : result.value) {
+      onChange(result.value);
+      onBulkChange && (onBindingChange === null || onBindingChange === void 0 ? void 0 : onBindingChange(result, onBulkChange));
+      (_b = (_a = manager.config) === null || _a === void 0 ? void 0 : _a.dataBindingChange) === null || _b === void 0 ? void 0 : _b.call(_a, result.value, data, manager);
+    }
+  };
+
+  DataBindingControl.prototype.handlePickerOpen = function () {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var _a, manager, node, schema;
+
+      return tslib.__generator(this, function (_b) {
+        switch (_b.label) {
+          case 0:
+            _a = this.props, manager = _a.manager, node = _a.node;
+            this.setState({
+              loading: true,
+              schema: undefined
             });
+            _b.label = 1;
+
+          case 1:
+            _b.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , manager.getAvailableContextFields(node)];
+
+          case 2:
+            schema = _b.sent();
+            return [3
+            /*break*/
+            , 4];
+
+          case 3:
+            _b.sent();
+            this.setState({
+              loading: false,
+              hint: i18nRuntime.i18n("005c50d1af6e833d6991ab882653b7ae")
+            });
+            return [2
+            /*return*/
+            ];
+
+          case 4:
+            this.setState({
+              loading: false,
+              hint: schema ? undefined : i18nRuntime.i18n("76f47297fe988267a26073a9aaf7911f"),
+              schema: schema !== null && schema !== void 0 ? schema : undefined
+            });
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  DataBindingControl.prototype.render = function () {
+    var _this = this;
+
+    var _a = this.props,
+        className = _a.className;
+        _a.classnames;
+        var result = _a.value,
+        onChange = _a.onChange;
+        _a.multiple;
+        var disabled = _a.disabled,
+        render = _a.render;
+    var _b = this.state,
+        schema = _b.schema,
+        loading = _b.loading,
+        hint = _b.hint;
+    return React__default["default"].createElement(amis.PickerContainer, {
+      onPickerOpen: this.handlePickerOpen,
+      className: className,
+      title: "\u7ED1\u5B9A\u5B57\u6BB5",
+      bodyRender: function (_a) {
+        var value = _a.value,
+            isOpened = _a.isOpened,
+            onChange = _a.onChange;
+
+        if (!isOpened) {
+          return null;
+        }
+
+        if (loading) {
+          return React__default["default"].createElement(amis.Spinner, {
+            show: true,
+            icon: "reload",
+            spinnerClassName: "ae-DataBindingList-spinner"
+          });
+        }
+
+        if (hint) {
+          return React__default["default"].createElement("p", {
+            className: "ae-DataBindingList-hint"
+          }, hint);
+        }
+
+        return render('content', schema, {
+          onSelect: onChange,
+          value: value ? value.value : result
         });
+      },
+      value: result,
+      onConfirm: this.handleConfirm
+    }, function (_a) {
+      var onClick = _a.onClick;
+      return React__default["default"].createElement(amis.InputBox, {
+        className: "ae-InputVariable",
+        clearable: false,
+        value: result,
+        onChange: onChange,
+        disabled: disabled
+      }, React__default["default"].createElement("span", {
+        onClick: function (e) {
+          return tslib.__awaiter(_this, void 0, void 0, function () {
+            return tslib.__generator(this, function (_a) {
+              onClick(e);
+              return [2
+              /*return*/
+              ];
+            });
+          });
+        }
+      }, React__default["default"].createElement(amis.Icon, {
+        icon: "info",
+        className: "icon cursor-pointer"
+      })));
+    });
+  };
+
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], DataBindingControl.prototype, "handleConfirm", null);
+
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", Promise)], DataBindingControl.prototype, "handlePickerOpen", null);
+
+  return DataBindingControl;
+}(React__default["default"].Component);
+
+/** @class */
+(function (_super) {
+  tslib.__extends(DataBindingControlRenderer, _super);
+
+  function DataBindingControlRenderer() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  DataBindingControlRenderer = tslib.__decorate([amis.FormItem({
+    type: 'ae-DataBindingControl'
+  })], DataBindingControlRenderer);
+  return DataBindingControlRenderer;
+})(DataBindingControl);
+
+var SimpleDataBindingControl =
+/** @class */
+function (_super) {
+  tslib.__extends(SimpleDataBindingControl, _super);
+
+  function SimpleDataBindingControl(props) {
+    var _this = _super.call(this, props) || this;
+
+    _this.handleSearchDebounced = lodash.debounce(_this.handleSearch, 250, {
+      trailing: true,
+      leading: false
+    });
+    _this.state = {
+      filteredFields: props.fields
     };
-    DataBindingControl.prototype.render = function () {
-        var _this = this;
-        var _a = this.props; _a.classnames; var value = _a.value, onChange = _a.onChange, disabled = _a.disabled;
-        return (React__default["default"].createElement(amis.SchemaVariableListPicker, { onPickerOpen: this.handlePickerOpen, onConfirm: this.handleConfirm, title: "\u7ED1\u5B9A\u53D8\u91CF" }, function (_a) {
-            var onClick = _a.onClick; _a.isOpened; _a.setState;
-            return (React__default["default"].createElement(amis.InputBox, { className: "ae-InputVariable", clearable: false, value: value, onChange: onChange, disabled: disabled },
-                React__default["default"].createElement("span", { onClick: function (e) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                        return tslib.__generator(this, function (_a) {
-                            onClick(e);
-                            return [2 /*return*/];
-                        });
-                    }); } },
-                    React__default["default"].createElement(amis.Icon, { icon: "info", className: "icon cursor-pointer" }))));
-        }));
-    };
-    tslib.__decorate([
-        AMisCodeEditor.autobind,
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object]),
-        tslib.__metadata("design:returntype", void 0)
-    ], DataBindingControl.prototype, "handleConfirm", null);
-    tslib.__decorate([
-        AMisCodeEditor.autobind,
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
-        tslib.__metadata("design:returntype", Promise)
-    ], DataBindingControl.prototype, "handlePickerOpen", null);
-    return DataBindingControl;
-}(React__default["default"].Component));
-/** @class */ ((function (_super) {
-    tslib.__extends(DataBindingControlRenderer, _super);
-    function DataBindingControlRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    DataBindingControlRenderer = tslib.__decorate([
-        amis.FormItem({
-            type: 'ae-DataBindingControl'
-        })
-    ], DataBindingControlRenderer);
-    return DataBindingControlRenderer;
-})(DataBindingControl));
+    return _this;
+  }
+
+  SimpleDataBindingControl.prototype.handleSearch = function (keywords) {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      return tslib.__generator(this, function (_a) {
+        this.setState({
+          filteredFields: matchSorter.matchSorter(this.props.fields, keywords, {
+            keys: ['label', 'value', 'children']
+          })
+        });
+        return [2
+        /*return*/
+        ];
+      });
+    });
+  };
+
+  SimpleDataBindingControl.prototype.handleSelect = function () {};
+
+  SimpleDataBindingControl.prototype.render = function () {
+    var _a = this.props,
+        className = _a.className,
+        value = _a.value,
+        onSelect = _a.onSelect,
+        isSelected = _a.isSelected;
+    var filteredFields = this.state.filteredFields;
+    return React__default["default"].createElement("div", {
+      className: cx__default["default"]('ae-DataBindingList', className)
+    }, React__default["default"].createElement("div", {
+      className: cx__default["default"]('ae-DataBindingList-searchBox')
+    }, React__default["default"].createElement(amis.SearchBox, {
+      mini: false,
+      placeholder: i18nRuntime.i18n("91be693dd1ccea38f8f514318fd8a944"),
+      onSearch: this.handleSearchDebounced
+    })), React__default["default"].createElement("div", {
+      className: cx__default["default"]('ae-DataBindingList-body')
+    }, React__default["default"].createElement(amis.CollapseGroup, {
+      className: cx__default["default"]('ae-DataBindingList-collapseGroup'),
+      defaultActiveKey: filteredFields.map(function (item) {
+        return item.value || item.label;
+      }),
+      expandIcon: amisCore.generateIcon(cx__default["default"], 'fa fa-chevron-right expandIcon', 'Icon'),
+      expandIconPosition: "right"
+    }, filteredFields.map(function (item, index) {
+      return React__default["default"].createElement(amis.Collapse, {
+        className: cx__default["default"]('ae-DataBindingList-collapse'),
+        headingClassName: cx__default["default"]('ae-DataBindingList-collapse-title'),
+        bodyClassName: cx__default["default"]('ae-DataBindingList-collapse-body'),
+        propKey: item.value || item.label,
+        key: item.value || item.label,
+        header: React__default["default"].createElement("span", null, item.label)
+      }, Array.isArray(item.children) && item.children.length > 0 ? item.children.map(function (childItem) {
+        var checked = isSelected ? isSelected(childItem) : childItem.value === value;
+        return React__default["default"].createElement("div", {
+          className: cx__default["default"]('ae-DataBindingList-item', {
+            'is-active': checked
+          }),
+          onClick: function () {
+            return onSelect(childItem);
+          },
+          key: childItem.value
+        }, childItem.label);
+      }) : React__default["default"].createElement("p", {
+        className: cx__default["default"]('ae-DataBindingList-hint')
+      }, "\u6682\u65E0\u53EF\u7528\u5B57\u6BB5"));
+    }))));
+  };
+
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String]), tslib.__metadata("design:returntype", Promise)], SimpleDataBindingControl.prototype, "handleSearch", null);
+
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], SimpleDataBindingControl.prototype, "handleSelect", null);
+
+  return SimpleDataBindingControl;
+}(React__default["default"].Component);
+
+/** @class */
+(function (_super) {
+  tslib.__extends(SimpleDataBindingControlRenderer, _super);
+
+  function SimpleDataBindingControlRenderer() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  SimpleDataBindingControlRenderer = tslib.__decorate([amisCore.Renderer({
+    type: 'ae-SimpleDataBindingPanel'
+  })], SimpleDataBindingControlRenderer);
+  return SimpleDataBindingControlRenderer;
+})(SimpleDataBindingControl);
 
 exports.DataBindingControl = DataBindingControl;
+exports.SimpleDataBindingControl = SimpleDataBindingControl;

package/lib/renderer/DataMappingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.0
+ * amis-editor v5.2.0-beta.2
  * Copyright 2018-2022 @fex
  */
 
@@ -10,7 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var amis = require('amis');
 var React = require('react');
-var AMisCodeEditor = require('amis-editor-core');
+var amisEditorCore = require('amis-editor-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -50,7 +50,7 @@ var DataMappingControl = /** @class */ (function (_super) {
         // );
     };
     tslib.__decorate([
-        AMisCodeEditor.autobind,
+        amisEditorCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object, Function, Object]),
         tslib.__metadata("design:returntype", void 0)

package/lib/renderer/DataPickerControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.0
+ * amis-editor v5.2.0-beta.2
  * Copyright 2018-2022 @fex
  */
 
@@ -8,7 +8,7 @@
 var tslib = require('tslib');
 var amis = require('amis');
 var React = require('react');
-var AMisCodeEditor = require('amis-editor-core');
+var amisEditorCore = require('amis-editor-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -48,20 +48,20 @@ var DataPickerControl = /** @class */ (function (_super) {
     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; _a.isOpened; _a.setState;
+            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([
-        AMisCodeEditor.autobind,
+        amisEditorCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [String]),
         tslib.__metadata("design:returntype", void 0)
     ], DataPickerControl.prototype, "handleConfirm", null);
     tslib.__decorate([
-        AMisCodeEditor.autobind,
+        amisEditorCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", Promise)