amis-editor 5.6.0-beta.0 → 5.6.1

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

@@ -1,12 +1,13 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
 import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
 import cx from 'classnames';
-import { Icon, TooltipWrapper, FormItem } from 'amis';
+import { Icon, Spinner, TooltipWrapper, FormItem } from 'amis';
 import { render, autobind } from 'amis-core';
 import { FormulaEditor, CodeMirrorEditor } from 'amis-ui';
 import { editorFactory, FormulaPlugin } from './plugin.js';
@@ -14,6 +15,7 @@ import FormulaPicker from './FormulaPicker.js';
 import { reaction } from 'mobx';
 import { renderFormulaValue } from '../FormulaControl.js';
 import { getVariables } from 'amis-editor-core';
+import { findDOMNode } from 'react-dom';
 import { i18n } from 'i18n-runtime';
 
 /**
@@ -31,7 +33,8 @@ var TextareaFormulaControl = /** @class */function (_super) {
       formulaPickerOpen: false,
       formulaPickerValue: '',
       isFullscreen: false,
-      tooltipStyle: {}
+      tooltipStyle: {},
+      loading: false
     };
     return _this;
   }
@@ -160,6 +163,49 @@ var TextareaFormulaControl = /** @class */function (_super) {
       isFullscreen: !this.state.isFullscreen
     });
   };
+  TextareaFormulaControl.prototype.handleFormulaEditorOpen = function () {
+    var _a;
+    return __awaiter(this, void 0, void 0, function () {
+      var _b, node, manager, data, onFormulaEditorOpen, res, variables, error_1;
+      return __generator(this, function (_c) {
+        switch (_c.label) {
+          case 0:
+            _b = this.props, node = _b.node, manager = _b.manager, data = _b.data;
+            onFormulaEditorOpen = (_a = manager === null || manager === void 0 ? void 0 : manager.config) === null || _a === void 0 ? void 0 : _a.onFormulaEditorOpen;
+            this.setState({
+              loading: true
+            });
+            _c.label = 1;
+          case 1:
+            _c.trys.push([1, 5,, 6]);
+            if (!(manager && onFormulaEditorOpen && typeof onFormulaEditorOpen === 'function')) return [3 /*break*/, 4];
+            return [4 /*yield*/, onFormulaEditorOpen(node, manager, data)];
+          case 2:
+            res = _c.sent();
+            if (!(res !== false)) return [3 /*break*/, 4];
+            return [4 /*yield*/, getVariables(this)];
+          case 3:
+            variables = _c.sent();
+            this.setState({
+              variables: variables
+            });
+            _c.label = 4;
+          case 4:
+            return [3 /*break*/, 6];
+          case 5:
+            error_1 = _c.sent();
+            console.error('[amis-editor][TextareaFormulaControl] onFormulaEditorOpen failed: ', error_1 === null || error_1 === void 0 ? void 0 : error_1.stack);
+            return [3 /*break*/, 6];
+          case 6:
+            this.setState({
+              loading: false
+            });
+            return [2 /*return*/];
+        }
+      });
+    });
+  };
+
   TextareaFormulaControl.prototype.handleFormulaClick = function (e, type) {
     return __awaiter(this, void 0, void 0, function () {
       var variablesArr;
@@ -170,8 +216,19 @@ var TextareaFormulaControl = /** @class */function (_super) {
               return [2 /*return*/];
             }
 
-            return [4 /*yield*/, getVariables(this)];
+            _a.label = 1;
           case 1:
+            _a.trys.push([1, 3,, 4]);
+            return [4 /*yield*/, this.handleFormulaEditorOpen()];
+          case 2:
+            _a.sent();
+            return [3 /*break*/, 4];
+          case 3:
+            _a.sent();
+            return [3 /*break*/, 4];
+          case 4:
+            return [4 /*yield*/, getVariables(this)];
+          case 5:
             variablesArr = _a.sent();
             this.setState({
               variables: variablesArr,
@@ -218,7 +275,8 @@ var TextareaFormulaControl = /** @class */function (_super) {
       formulaPickerValue = _b.formulaPickerValue,
       isFullscreen = _b.isFullscreen,
       variables = _b.variables,
-      tooltipStyle = _b.tooltipStyle;
+      tooltipStyle = _b.tooltipStyle,
+      loading = _b.loading;
     var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker;
     // 输入框样式
     var resultBoxStyle = {};
@@ -258,8 +316,14 @@ var TextareaFormulaControl = /** @class */function (_super) {
       icon: isFullscreen ? 'compress-alt' : 'expand-alt',
       className: "icon"
     }))), React__default.createElement("li", {
-      className: "ae-TextareaResultBox-footer-fxIcon"
-    }, React__default.createElement("a", {
+      className: cx('ae-TextareaResultBox-footer-fxIcon', {
+        'is-loading': loading
+      })
+    }, loading ? React__default.createElement(Spinner, {
+      show: true,
+      icon: "reload",
+      size: "sm"
+    }) : React__default.createElement("a", {
       "data-tooltip": i18n("a9400c408441f1f7f6d6954deb05ae9a"),
       "data-position": "top",
       onClick: this.handleFormulaClick
@@ -289,6 +353,9 @@ var TextareaFormulaControl = /** @class */function (_super) {
       className: cx('ae-TextareaResultBox-overlay'),
       onClick: onOverallClick
     }) : null, React__default.createElement(TooltipWrapper, {
+      container: function () {
+        return findDOMNode(_this);
+      },
       trigger: "hover",
       placement: "top",
       style: {
@@ -332,6 +399,7 @@ var TextareaFormulaControl = /** @class */function (_super) {
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [HTMLElement, Object]), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "editorFactory", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, Object]), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleEditorMounted", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleFullscreenModeChange", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], TextareaFormulaControl.prototype, "handleFormulaEditorOpen", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, String]), __metadata("design:returntype", Promise)], TextareaFormulaControl.prototype, "handleFormulaClick", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "editorAutoMark", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, Object]), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleAddtionalMenuClick", null);
@@ -349,3 +417,4 @@ var TextareaFormulaControl = /** @class */function (_super) {
 })(TextareaFormulaControl);
 
 export { TextareaFormulaControl };
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -92,8 +93,8 @@ var FormulaPlugin = /** @class */ (function () {
                 var cache = ['${'];
                 for (var index = 0; index < charArr.length; index++) {
                     var char = charArr[index];
-                    if (char === '$' && charArr[index + 1] === '{') {
-                        cache.push('${');
+                    if (char === '{') {
+                        cache.push('{');
                     }
                     else if (char === '}') {
                         cache.pop();
@@ -230,3 +231,4 @@ var FormulaPlugin = /** @class */ (function () {
 }());
 
 export { FormulaPlugin, editorFactory };
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/esm/tpl/api.js

@@ -1,9 +1,10 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
-import { __rest, __assign } from 'tslib';
+import { __rest, __assign, __spreadArray, __read } from 'tslib';
 import { setSchemaTpl, getSchemaTpl, tipedLabel } from 'amis-editor-core';
 import React__default from 'react';
 import { Html, buildApi } from 'amis';
@@ -172,6 +173,12 @@ setSchemaTpl('api', function (patch) {
         name: 'sendOn',
         placeholder: i18n("bf9e242338d2c26b182aa6b9c015d84c"),
         description: i18n("91ee84292a5bf5e59d3b6309f948f2f1")
+      }, {
+        type: 'switch',
+        label: i18n("6e6d4269d0dc3324d551062350a2ae9f"),
+        name: 'silent',
+        mode: 'inline',
+        description: i18n("ddca9c0f0e3d07c3341701b80f139cc0")
       }, {
         type: 'switch',
         label: i18n("773a0e8384fd6f784088b829d7cc2f68"),
@@ -323,7 +330,7 @@ setSchemaTpl('initFetch', function (overrides) {
       name: fieldName,
       type: 'radios',
       inline: true,
-      onChange: function () {},
+      value: false,
       // pipeIn: (value:any) => typeof value === 'boolean' ? value : '1'
       options: [{
         label: i18n("0a60ac8f02ccd2cf723f927284877851"),
@@ -401,10 +408,7 @@ setSchemaTpl('apiControl', function (patch) {
     } : undefined
   }, rest);
 });
-setSchemaTpl('interval', function (more) {
-  if (more === void 0) {
-    more = {};
-  }
+setSchemaTpl('interval', function (config) {
   return __assign({
     type: 'ae-switch-more',
     label: i18n("e5e3131aaf96b6dd10574bc9beeaf934"),
@@ -413,7 +417,7 @@ setSchemaTpl('interval', function (more) {
     bulk: true,
     mode: 'normal',
     form: {
-      body: [getSchemaTpl('withUnit', {
+      body: __spreadArray([getSchemaTpl('withUnit', __assign({
         label: i18n("8df0f3891f8a80a392816f6ca662a33d"),
         name: 'interval',
         control: {
@@ -422,9 +426,9 @@ setSchemaTpl('interval', function (more) {
           value: 1000
         },
         unit: i18n("21157cbff85802e353409f647f1f1f91")
-      })]
+      }, config && config.intervalConfig || {}))], __read(config && config.formItems || []), false)
     }
-  }, more);
+  }, config && config.switchMoreConfig || {});
 });
 setSchemaTpl('silentPolling', function () {
   return getSchemaTpl('switch', {
@@ -544,3 +548,4 @@ setSchemaTpl('loadingConfig', function (patch, _a) {
     }
   });
 });
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/esm/tpl/common.js

@@ -1,10 +1,11 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
 import { __assign, __rest, __spreadArray, __read } from 'tslib';
-import { setSchemaTpl, getSchemaTpl, tipedLabel, defaultValue, isObject } from 'amis-editor-core';
+import { setSchemaTpl, getSchemaTpl, defaultValue, tipedLabel, isObject } from 'amis-editor-core';
 import flatten from 'lodash/flatten';
 import { InputComponentName } from '../component/InputComponentName.js';
 import { FormulaDateType } from '../renderer/FormulaControl.js';
@@ -67,27 +68,12 @@ setSchemaTpl('formItemName', {
   // validateOnChange: false
 });
 
-setSchemaTpl('formItemExtraName', {
-  className: 'mb-3',
-  type: 'fieldset',
-  body: [getSchemaTpl('formItemName', {
-    required: true,
-    label: i18n("e276a94ff48c08233fcb8b38335ad160"),
-    name: 'extraName',
-    visibleOn: 'typeof this.extraName === "string"'
-  }), {
-    type: 'switch',
-    label: tipedLabel(i18n("513442a944a943c0d68283d08934f13a"), i18n("6beb3a65798be5e96907c0cbec04f74b")),
-    name: 'extraName',
-    pipeIn: function (value) {
-      return typeof value === 'string';
-    },
-    pipeOut: function (value) {
-      return value ? '' : undefined;
-    },
-    inputClassName: 'is-inline'
-  }]
-});
+setSchemaTpl('formItemExtraName', getSchemaTpl('formItemName', {
+  required: false,
+  label: i18n("3ac7b489ba8cb811386c9f4fbfd1c6cc"),
+  name: 'extraName',
+  description: i18n("9da561f34a93e0275c56b84717ac9cf0")
+}));
 setSchemaTpl('formItemMode', function (config) {
   var _a;
   return {
@@ -309,7 +295,7 @@ setSchemaTpl('collapseGroup', function (config) {
     var _a;
     return __assign(__assign({
       type: 'collapse',
-      headingClassName: 'ae-formItemControl-header',
+      headingClassName: 'ae-formItemControl-header ae-Collapse-header',
       bodyClassName: 'ae-formItemControl-body'
     }, item), {
       collapsed: (_a = item.collapsed) !== null && _a !== void 0 ? _a : false,
@@ -372,10 +358,18 @@ setSchemaTpl('valueFormula', function (config) {
     variableMode = _a.variableMode,
     rest = __rest(_a, ["rendererSchema", "useSelectMode", "mode", "visibleOn", "label", "name", "rendererWrapper", "needDeleteProps", "valueType", "header", "placeholder", "DateTimeType", "variables", "requiredDataPropsVariables", "variableMode"]);
   var curRendererSchema = rendererSchema;
-  if (useSelectMode && curRendererSchema && curRendererSchema.options) {
-    curRendererSchema = __assign(__assign({}, curRendererSchema), {
-      type: 'select'
-    });
+  if (useSelectMode && curRendererSchema) {
+    if (typeof curRendererSchema === 'function') {
+      curRendererSchema = function (schema) {
+        return __assign(__assign({}, rendererSchema(schema)), {
+          type: 'select'
+        });
+      };
+    } else if (curRendererSchema.options) {
+      curRendererSchema = __assign(__assign({}, curRendererSchema), {
+        type: 'select'
+      });
+    }
   }
   return {
     type: 'group',
@@ -383,6 +377,7 @@ setSchemaTpl('valueFormula', function (config) {
     // 上下展示，可避免 自定义渲染器 出现挤压
     mode: mode === 'vertical' ? 'vertical' : 'horizontal',
     visibleOn: visibleOn,
+    className: config === null || config === void 0 ? void 0 : config.className,
     body: [getSchemaTpl('formulaControl', __assign({
       label: label !== null && label !== void 0 ? label : i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
       name: name || 'value',
@@ -819,16 +814,23 @@ setSchemaTpl('borderMode', {
   }],
   pipeIn: defaultValue('full')
 });
-setSchemaTpl('searchable', function () {
-  return getSchemaTpl('switch', {
+setSchemaTpl('searchable', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return getSchemaTpl('switch', __assign({
     label: i18n("dbdae74eb12668e2b9568b013bf27d45"),
     name: 'searchable'
-  });
+  }, schema));
 });
-setSchemaTpl('sortable', {
-  type: 'switch',
-  label: i18n("b4521626a48dcb61001fc563d2433ed3"),
-  name: 'sortable'
+setSchemaTpl('sortable', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return getSchemaTpl('switch', __assign({
+    label: i18n("b4521626a48dcb61001fc563d2433ed3"),
+    name: 'sortable'
+  }, schema));
 });
 setSchemaTpl('onlyLeaf', {
   type: 'switch',
@@ -867,6 +869,7 @@ setSchemaTpl('buttonLevel', {
   label: i18n("ac3880323853de9adc4f66bc06d438ff"),
   type: 'select',
   name: 'level',
+  menuTpl: '<div class="ae-ButtonLevel-MenuTpl"><button type="button" class="cxd-Button cxd-Button--${value} cxd-Button--size-sm cxd-Button--block">${label}</button></div>',
   options: [{
     label: i18n("18c63459a2c069022c7790430f761214"),
     value: 'default',
@@ -1390,3 +1393,18 @@ setSchemaTpl('anchorNavTitle', {
   type: 'input-text',
   required: true
 });
+/** 给 CRUD2 使用 */
+setSchemaTpl('primaryField', {
+  type: 'input-text',
+  name: 'primaryField',
+  label: tipedLabel(i18n("475cdfcaf614f2b69d88e1e34ba76079"), i18n("c28f86f11fc814ea5696af5aa9464cbe")),
+  pipeIn: function (value, formStore) {
+    var _a;
+    var rowSelection = (_a = formStore === null || formStore === void 0 ? void 0 : formStore.data) === null || _a === void 0 ? void 0 : _a.rowSelection;
+    if (value == null || typeof value !== 'string') {
+      return rowSelection && (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField) && typeof rowSelection.keyField === 'string' ? rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField : 'id';
+    }
+    return value;
+  }
+});
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/esm/tpl/horizontal.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -252,3 +253,4 @@ setSchemaTpl('subFormHorizontal', {
     }
   }]
 });
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/esm/tpl/layout.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -7,6 +8,7 @@ import { __assign } from 'tslib';
 import { setSchemaTpl, tipedLabel, defaultValue } from 'amis-editor-core';
 import isNumber from 'lodash/isNumber';
 import isString from 'lodash/isString';
+import compact from 'lodash/compact';
 import { i18n } from 'i18n-runtime';
 
 var LayoutUnitOptions = ['px', '%', 'em', 'vh', 'vw'];
@@ -135,7 +137,7 @@ setSchemaTpl('layout:z-index', function (config) {
 });
 // 显示类型
 setSchemaTpl('layout:display', function (config) {
-  var configOptions = [{
+  var configOptions = compact([{
     label: i18n("10710f1c01d960a3ffde384115296026"),
     icon: 'block-display',
     value: 'block'
@@ -147,11 +149,11 @@ setSchemaTpl('layout:display', function (config) {
     label: i18n("2c7fe494c99c94ba5965f963fd7d3a4c"),
     icon: 'inline-display',
     value: 'inline'
-  }, {
+  }, !(config === null || config === void 0 ? void 0 : config.flexHide) && {
     label: i18n("39353c2b258e4bc73d8dd6a46f0a7955"),
     icon: 'flex-display',
     value: 'flex'
-  }];
+  }]);
   var configSchema = {
     type: 'icon-button-group',
     label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel(i18n("a5d833839a610994dc4752e2d91f4192"), i18n("a8489cf57d7f44e889aff79434776f47")),
@@ -352,10 +354,10 @@ setSchemaTpl('layout:flex', function (config) {
       if (value === '1 1 auto') {
         // 弹性
         if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
-          form.setValueByName('style.overflowY', 'auto');
+          // form.setValueByName('style.overflowY', 'auto');
           form.setValueByName('style.height', undefined);
         } else {
-          form.setValueByName('style.overflowX', 'auto');
+          // form.setValueByName('style.overflowX', 'auto');
           form.setValueByName('style.width', undefined);
         }
       } else if (value === '0 0 150px') {
@@ -976,3 +978,4 @@ setSchemaTpl('layout:wrapper-contanier', function (config) {
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn
   };
 });
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/esm/tpl/options.d.ts

@@ -1 +1,10 @@
-export {};
+import type { EditorManager } from 'amis-editor-core';
+export interface OptionControlParams {
+    manager: EditorManager;
+    /** switch-more 控制器的配置 */
+    controlSchema?: Record<string, any>;
+    /** 子表单中的配置集合 */
+    collections?: Record<string, any>[];
+    /** 是否替换除了addControls以外的其他属性 */
+    replace?: boolean;
+}