amis-editor 6.2.2 → 6.4.0

package/lib/plugin/index.d.ts

@@ -39,6 +39,7 @@ export * from './Form/InputRange';
 export * from './Form/InputRating';
 export * from './Form/InputCity';
 export * from './Form/Transfer';
+export * from './Form/TransferPicker';
 export * from './Form/TabsTransfer';
 export * from './Form/InputColor';
 export * from './Form/ConditionBuilder';
@@ -57,6 +58,7 @@ export * from './Form/UUID';
 export * from './Form/LocationPicker';
 export * from './Form/InputSubForm';
 export * from './Form/Hidden';
+export * from './Form/InputSignature';
 export * from './Form/Static';
 export * from './Button';
 export * from './ButtonGroup';
@@ -108,6 +110,7 @@ export * from './CodeView';
 export * from './Markdown';
 export * from './Collapse';
 export * from './OfficeViewer';
+export * from './PdfViewer';
 export * from './Log';
 export * from './Others/Action';
 export * from './Others/TableCell';

package/lib/renderer/APIAdaptorControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -297,4 +297,4 @@ exports.genCodeSchema = genCodeSchema;
 exports.requestAdaptorDefaultCode = requestAdaptorDefaultCode;
 exports.validateApiAdaptorDefaultCode = validateApiAdaptorDefaultCode;
 exports.validateApiAdaptorEditorDescSchema = validateApiAdaptorEditorDescSchema;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/APIControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -817,4 +817,4 @@ var APIControl = /** @class */function (_super) {
 })(APIControl);
 
 exports["default"] = APIControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/BadgeControl.d.ts

@@ -67,12 +67,12 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
     transformBadgeValue(): BadgeForm;
     normalizeBadgeValue(form: BadgeForm): {
         offset: number[];
+        size?: any;
         text?: string | number | undefined;
         style?: {
             [propName: string]: any;
         } | undefined;
         level?: any;
-        size?: any;
         position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
         mode?: "text" | "dot" | "ribbon" | undefined;
         visibleOn?: any;
@@ -80,12 +80,12 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
         overflowCount?: number | undefined;
     } | {
         offset: [number, number];
+        size?: any;
         text?: string | number | undefined;
         style?: {
             [propName: string]: any;
         } | undefined;
         level?: any;
-        size?: any;
         position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
         mode?: "text" | "dot" | "ribbon" | undefined;
         visibleOn?: any;

package/lib/renderer/BadgeControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -306,4 +306,4 @@ var BadgeControl = /** @class */function (_super) {
 })(BadgeControl);
 
 exports["default"] = BadgeControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/ButtonGroupControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -45,4 +45,4 @@ var ButtonGroupControl = /** @class */ (function (_super) {
 })(ButtonGroupControl));
 
 exports["default"] = ButtonGroupControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/DataBindingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -261,4 +261,4 @@ var SimpleDataBindingControl = /** @class */function (_super) {
 
 exports.DataBindingControl = DataBindingControl;
 exports.SimpleDataBindingControl = SimpleDataBindingControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/DataMappingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -71,4 +71,4 @@ var DataMappingControl = /** @class */ (function (_super) {
 })(DataMappingControl));
 
 exports.DataMappingControl = DataMappingControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/DataPickerControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -82,4 +82,4 @@ var DataPickerControl = /** @class */ (function (_super) {
     ], DataPickerControlRenderer);
     return DataPickerControlRenderer;
 })(DataPickerControl));
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/DateShortCutControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -446,4 +446,4 @@ var DateShortCutControl = /** @class */function (_super) {
 })(DateShortCutControl);
 
 exports.DateShortCutControl = DateShortCutControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/ExpressionFormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -14,7 +14,6 @@ var amisCore = require('amis-core');
 var cx = require('classnames');
 var amis = require('amis');
 var amisUi = require('amis-ui');
-var FormulaControl = require('./FormulaControl.js');
 var mobx = require('mobx');
 var amisEditorCore = require('amis-editor-core');
 var i18nRuntime = require('i18n-runtime');
@@ -39,25 +38,34 @@ var ExpressionFormulaControl = /** @class */function (_super) {
   }
   ExpressionFormulaControl.prototype.componentDidMount = function () {
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var editorStore;
+      var editorStore, variablesArr;
       var _this = this;
       return tslib.__generator(this, function (_a) {
-        this.initFormulaPickerValue(this.props.value);
-        editorStore = window.editorStore;
-        this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-        this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-        this.unReaction = mobx.reaction(function () {
-          return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-        }, function () {
-          return tslib.__awaiter(_this, void 0, void 0, function () {
-            return tslib.__generator(this, function (_a) {
-              this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-              this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-              return [2 /*return*/];
+        switch (_a.label) {
+          case 0:
+            this.initFormulaPickerValue(this.props.value);
+            editorStore = window.editorStore;
+            this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+            this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+            this.unReaction = mobx.reaction(function () {
+              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+            }, function () {
+              return tslib.__awaiter(_this, void 0, void 0, function () {
+                return tslib.__generator(this, function (_a) {
+                  this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+                  this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+                  return [2 /*return*/];
+                });
+              });
             });
-          });
-        });
-        return [2 /*return*/];
+            return [4 /*yield*/, amisEditorCore.getVariables(this)];
+          case 1:
+            variablesArr = _a.sent();
+            this.setState({
+              variables: variablesArr
+            });
+            return [2 /*return*/];
+        }
       });
     });
   };
@@ -77,7 +85,7 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
   };
   ExpressionFormulaControl.prototype.initFormulaPickerValue = function (value) {
-    var formulaPickerValue = (value === null || value === void 0 ? void 0 : value.replace(/^\$\{(.*)\}$/, function (match, p1) {
+    var formulaPickerValue = (value === null || value === void 0 ? void 0 : value.replace(/^\$\{([\s\S]*)\}$/, function (match, p1) {
       return p1;
     })) || '';
     this.setState({
@@ -89,8 +97,8 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     if (value === void 0) {
       value = '';
     }
-    var expressionReg = /^\$\{(.*)\}$/;
-    value = value.replace(/\r\n|\r|\n/g, ' ');
+    var expressionReg = /^\$\{([\s\S]*)\}$/;
+    // value = value.replace(/\r\n|\r|\n/g, ' ');
     if (value && !expressionReg.test(value)) {
       value = "${".concat(value, "}");
     }
@@ -132,9 +140,7 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     var _d = this.state,
       formulaPickerValue = _d.formulaPickerValue,
       variables = _d.variables;
-    var highlightValue = amisUi.FormulaEditor.highlightValue(formulaPickerValue, variables) || {
-      html: formulaPickerValue
-    };
+    var isNewExpression = amisCore.isExpression(value);
     // 自身字段
     var selfName = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.name;
     return React__default["default"].createElement("div", {
@@ -142,14 +148,14 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     }, React__default["default"].createElement(amis.PickerContainer, {
       showTitle: false,
       bodyRender: function (_a) {
-        _a.value;
-          var onChange = _a.onChange;
+        var value = _a.value,
+          onChange = _a.onChange;
         return React__default["default"].createElement(amisUi.FormulaEditor, tslib.__assign({}, rest, {
           evalMode: true,
           variableMode: variableMode,
           variables: variables,
           header: header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
-          value: formulaPickerValue,
+          value: value,
           onChange: onChange,
           selfVariableName: selfName
         }));
@@ -159,26 +165,46 @@ var ExpressionFormulaControl = /** @class */function (_super) {
       size: size !== null && size !== void 0 ? size : 'lg'
     }, function (_a) {
       var onClick = _a.onClick;
-      return formulaPickerValue ? React__default["default"].createElement(amis.Button, {
+      return value && !isNewExpression ? React__default["default"].createElement(amisUi.InputBox, {
+        value: value,
+        onChange: rest.onChange
+      }) : formulaPickerValue ? React__default["default"].createElement(amis.Button, {
         className: "btn-configured",
         tooltip: {
-          placement: 'top',
+          placement: 'left',
           tooltipTheme: 'dark',
           mouseLeaveDelay: 20,
           content: value,
           tooltipClassName: 'btn-configured-tooltip',
           children: function () {
-            return FormulaControl.renderFormulaValue(highlightValue);
+            return React__default["default"].createElement(amisUi.FormulaCodeEditor, {
+              readOnly: true,
+              value: typeof value === 'string' ? value.substring(2, value.length - 1) : '',
+              variables: variables,
+              evalMode: true,
+              editorTheme: "dark",
+              editorOptions: {
+                lineNumbers: false
+              }
+            });
           }
         },
         onClick: function (e) {
           return _this.handleOnClick(e, onClick);
         }
-      }, FormulaControl.renderFormulaValue(highlightValue), React__default["default"].createElement(amis.Icon, {
+      }, React__default["default"].createElement(amisUi.FormulaCodeEditor, {
+        singleLine: true,
+        readOnly: true,
+        highlightMode: "expression",
+        value: value,
+        variables: variables,
+        evalMode: false
+      }), React__default["default"].createElement(amis.Icon, {
         icon: "input-clear",
         className: "icon",
         onClick: _this.handleClearExpression
       })) : React__default["default"].createElement(React__default["default"].Fragment, null, React__default["default"].createElement(amis.Button, {
+        size: "sm",
         className: "btn-set-expression",
         onClick: function (e) {
           return _this.handleOnClick(e, onClick);
@@ -209,4 +235,4 @@ var ExpressionFormulaControl = /** @class */function (_super) {
 })(ExpressionFormulaControl);
 
 exports["default"] = ExpressionFormulaControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/FeatureControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -13,7 +13,7 @@ var React = require('react');
 var reactDom = require('react-dom');
 var Sortable = require('sortablejs');
 var cx = require('classnames');
-var clone = require('lodash/clone');
+var cloneDeep = require('lodash/cloneDeep');
 var remove = require('lodash/remove');
 var isPlainObject = require('lodash/isPlainObject');
 var amis = require('amis');
@@ -27,7 +27,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var Sortable__default = /*#__PURE__*/_interopDefaultLegacy(Sortable);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-var clone__default = /*#__PURE__*/_interopDefaultLegacy(clone);
+var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 var remove__default = /*#__PURE__*/_interopDefaultLegacy(remove);
 var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
 
@@ -70,14 +70,15 @@ var FeatureControl = /** @class */function (_super) {
       removeFeature = _b.removeFeature,
       data = _b.data,
       onBulkChange = _b.onBulkChange;
+    var schema = cloneDeep__default["default"](data);
     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);
+    (_a = item.remove) === null || _a === void 0 ? void 0 : _a.call(item, schema);
+    removeFeature === null || removeFeature === void 0 ? void 0 : removeFeature(item, schema);
     remove__default["default"](inUseFeat, item);
     item.add && unUseFeat.push(item);
+    onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(schema);
     this.setState({
       inUseFeat: inUseFeat,
       unUseFeat: unUseFeat
@@ -88,8 +89,9 @@ var FeatureControl = /** @class */function (_super) {
       data = _a.data,
       onBulkChange = _a.onBulkChange,
       onSort = _a.onSort;
-    onSort === null || onSort === void 0 ? void 0 : onSort(data, e);
-    onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(data);
+    var schema = cloneDeep__default["default"](data);
+    onSort === null || onSort === void 0 ? void 0 : onSort(schema, e);
+    onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(schema);
   };
   FeatureControl.prototype.handleAdd = function (item) {
     var _a;
@@ -102,7 +104,7 @@ var FeatureControl = /** @class */function (_super) {
       unUseFeat = _c.unUseFeat;
     inUseFeat.push(item);
     remove__default["default"](unUseFeat, item);
-    var schema = clone__default["default"](data);
+    var schema = cloneDeep__default["default"](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);
@@ -166,7 +168,7 @@ var FeatureControl = /** @class */function (_super) {
       data = _a.data,
       onBulkChange = _a.onBulkChange,
       onItemCheck = _a.onItemCheck;
-    var schema = clone__default["default"](data);
+    var schema = cloneDeep__default["default"](data);
     onItemCheck === null || onItemCheck === void 0 ? void 0 : onItemCheck(res, index, schema);
     onBulkChange === null || onBulkChange === void 0 ? void 0 : onBulkChange(schema);
   };
@@ -238,7 +240,7 @@ var FeatureControl = /** @class */function (_super) {
     if (customAction && typeof customAction === 'function') {
       var schema = customAction({
         onBulkChange: onBulkChange,
-        schema: clone__default["default"](data)
+        schema: cloneDeep__default["default"](data)
       });
       if (isPlainObject__default["default"](schema) && typeof schema.type === 'string') {
         return render('custom-action', schema);
@@ -306,4 +308,4 @@ var FeatureControl = /** @class */function (_super) {
 })(FeatureControl);
 
 exports["default"] = FeatureControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/FieldSetting.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -501,4 +501,4 @@ var FieldSetting = /** @class */function (_super) {
 })(FieldSetting);
 
 exports.FieldSetting = FieldSetting;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/FlexSettingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -157,7 +157,7 @@ var FlexSettingControl = /** @class */function (_super) {
       className: "ap-Flex"
     }, !label && React__default["default"].createElement("div", {
       className: "ap-Flex-label"
-    }, i18nRuntime.i18n("98204720c30a843a9234bdf22dc05d51")), flexItems.map(function (item) {
+    }, "\u5185\u90E8\u5BF9\u9F50\u8BBE\u7F6E"), flexItems.map(function (item) {
       return React__default["default"].createElement("div", {
         className: "ap-Flex-item ap-Flex-".concat(item.field),
         key: item.field
@@ -182,4 +182,4 @@ var FlexSettingControl = /** @class */function (_super) {
 })(FlexSettingControl);
 
 exports["default"] = FlexSettingControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/renderer/FormulaControl.d.ts

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import { CustomFormulaPickerProps } from './textarea-formula/FormulaPicker';
-import type { VariableItem, FuncGroup } from 'amis-ui/lib/components/formula/Editor';
+import type { VariableItem, FuncGroup } from 'amis-ui/lib/components/formula/CodeEditor';
 import { FormControlProps } from 'amis-core';
 import type { BaseEventContext } from 'amis-editor-core';
 import { EditorManager } from 'amis-editor-core';
@@ -12,6 +12,11 @@ export declare enum FormulaDateType {
     IsDate = 1,
     IsRange = 2
 }
+/**
+ * @deprecated 废弃，直接用 codemirror 渲染输入框即可，自带高亮
+ * @param item
+ * @returns
+ */
 export declare function renderFormulaValue(item: any): React.JSX.Element;
 export interface FormulaControlProps extends FormControlProps {
     manager?: EditorManager;