amis-editor 5.5.0 → 5.6.0-beta.0

package/esm/plugin/Page.js

@@ -1,12 +1,11 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
 import { __extends, __spreadArray, __read, __assign, __awaiter, __generator } from 'tslib';
-import { ContainerWrapper, getSchemaTpl, defaultValue, tipedLabel, jsonToJsonSchema, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
+import { ContainerWrapper, getSchemaTpl, defaultValue, tipedLabel, jsonToJsonSchema, JSONPipeOut, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
 import { getEventControlConfig } from '../renderer/event-control/helper.js';
-import omit from 'lodash/omit';
 import { i18n } from 'i18n-runtime';
 
 var PagePlugin = /** @class */function (_super) {
@@ -190,12 +189,15 @@ var PagePlugin = /** @class */function (_super) {
           }]
         }, {
           title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
-          body: [getSchemaTpl('combo-container', {
-            type: 'input-kv',
-            mode: 'normal',
-            name: 'data',
-            label: i18n("c70638412c6cffd150117ae403dea939")
-          }), getSchemaTpl('apiControl', {
+          body: [
+          // page组件下掉组件静态数据配置项，可通过页面变量来定义页面中的变量
+          // getSchemaTpl('combo-container', {
+          //   type: 'input-kv',
+          //   mode: 'normal',
+          //   name: 'data',
+          //   label: '组件静态数据'
+          // }),
+          getSchemaTpl('apiControl', {
             name: 'initApi',
             mode: 'row',
             labelClassName: 'none',
@@ -303,20 +305,39 @@ var PagePlugin = /** @class */function (_super) {
     return _this;
   }
   PagePlugin.prototype.buildDataSchemas = function (node, region, trigger) {
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function () {
-      var scope, jsonschema;
-      return __generator(this, function (_a) {
-        scope = this.manager.dataSchema.getScope("".concat(node.id, "-").concat(node.type));
-        jsonschema = __assign({
-          $id: 'pageStaticData'
-        }, jsonToJsonSchema(omit(node.schema.data, '$$id')));
-        scope === null || scope === void 0 ? void 0 : scope.removeSchema(jsonschema.$id);
-        scope === null || scope === void 0 ? void 0 : scope.addSchema(jsonschema);
-        return [2 /*return*/];
+      var jsonschema, pool, current, schema, _e, _f;
+      return __generator(this, function (_g) {
+        switch (_g.label) {
+          case 0:
+            jsonschema = __assign({}, jsonToJsonSchema(JSONPipeOut(node.schema.data)));
+            pool = node.children.concat();
+            _g.label = 1;
+          case 1:
+            if (!pool.length) return [3 /*break*/, 5];
+            current = pool.shift();
+            schema = current.schema;
+            if (!(((_a = current.rendererConfig) === null || _a === void 0 ? void 0 : _a.isFormItem) && (schema === null || schema === void 0 ? void 0 : schema.name))) return [3 /*break*/, 3];
+            _e = jsonschema.properties;
+            _f = schema.name;
+            return [4 /*yield*/, (_c = (_b = current.info.plugin).buildDataSchemas) === null || _c === void 0 ? void 0 : _c.call(_b, current, undefined, trigger, node)];
+          case 2:
+            _e[_f] = _g.sent();
+            return [3 /*break*/, 4];
+          case 3:
+            if (!((_d = current.rendererConfig) === null || _d === void 0 ? void 0 : _d.storeType)) {
+              pool.push.apply(pool, __spreadArray([], __read(current.children), false));
+            }
+            _g.label = 4;
+          case 4:
+            return [3 /*break*/, 1];
+          case 5:
+            return [2 /*return*/, jsonschema];
+        }
       });
     });
   };
-
   PagePlugin.prototype.rendererBeforeDispatchEvent = function (node, e, data) {
     if (e === 'inited') {
       var scope = this.manager.dataSchema.getScope("".concat(node.id, "-").concat(node.type));

package/esm/plugin/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Panel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -92,7 +92,7 @@ var PanelPlugin = /** @class */function (_super) {
                 _this.manager.showRendererPanel('');
               },
               block: true
-            }, "\u5185\u5BB9\u533A\u65B0\u589E\u5185\u5BB9")
+            }, i18n("cac3ba71180c97b1b6432833b3417d2c"))
           }]
         }, getSchemaTpl('status')])]
       }, {

package/esm/plugin/Plain.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Progress.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -185,22 +185,21 @@ var ProgressPlugin = /** @class */function (_super) {
             type: 'combo',
             mode: 'normal',
             multiple: true,
-            label: tipedLabel(i18n("6b36c6f7ec834692ec6c8e3816349fdd"), i18n("c035fb9e67c0b566fd5d35889035424e")),
+            label: tipedLabel(i18n("6b36c6f7ec834692ec6c8e3816349fdd"), i18n("087e631da111edc6db508289a7b5a95b")),
             items: [{
+              placeholder: 'color',
+              type: 'input-color',
+              name: 'color'
+            }, {
               type: 'input-number',
               name: 'value',
               placeholder: 'value',
-              required: true,
               columnClassName: 'w-xs',
               unique: true,
+              requiredOn: 'data.map?.length > 1',
               min: 0,
               step: 10,
               precision: 0
-            }, {
-              placeholder: 'color',
-              type: 'input-color',
-              name: 'color',
-              required: true
             }],
             value: [{
               color: '#dc3545',
@@ -212,8 +211,34 @@ var ProgressPlugin = /** @class */function (_super) {
               color: '#28a745',
               value: 100
             }],
-            pipeIn: function (value) {
-              return Array.isArray(value) ? value : [];
+            pipeIn: function (mapItem) {
+              // schema传入
+              if (Array.isArray(mapItem) && mapItem.length) {
+                return typeof mapItem[0] === 'string' ? mapItem.map(function (item, index) {
+                  var span = 100 / mapItem.length;
+                  return {
+                    value: (index + 1) * span,
+                    color: item
+                  };
+                }) : mapItem.length === 1 && !mapItem[0].value ? [{
+                  color: mapItem[0].color,
+                  value: 100
+                }] : mapItem;
+              } else {
+                return mapItem ? [mapItem] : [];
+              }
+            },
+            pipeOut: function (mapItem, origin, data) {
+              // 传入schema
+              if (mapItem.length === 1 && !mapItem[0].value) {
+                // 只有一个颜色且value未设置时默认为100
+                return [{
+                  color: mapItem[0].color,
+                  value: 100
+                }];
+              } else {
+                return mapItem;
+              }
             }
           })]
         }, getSchemaTpl('style:classNames', {

package/esm/plugin/Property.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/QRCode.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Reset.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/SearchBox.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Service.d.ts

@@ -31,5 +31,6 @@ export declare class ServicePlugin extends BasePlugin {
     actions: RendererPluginAction[];
     panelTitle: string;
     panelBodyCreator: (context: BaseEventContext) => any;
+    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
     rendererBeforeDispatchEvent(node: EditorNodeType, e: any, data: any): void;
 }

package/esm/plugin/Service.js

@@ -1,12 +1,12 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
-import { __extends, __assign } from 'tslib';
+import { __extends, __assign, __awaiter, __generator, __spreadArray, __read } from 'tslib';
 import { Button } from 'amis';
 import React__default from 'react';
-import { getSchemaTpl, jsonToJsonSchema, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
+import { getSchemaTpl, jsonToJsonSchema, JSONPipeOut, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
 import { getEventControlConfig } from '../renderer/event-control/helper.js';
 import { i18n } from 'i18n-runtime';
 
@@ -127,9 +127,6 @@ var ServicePlugin = /** @class */function (_super) {
     }];
     _this.panelTitle = i18n("47d68cd0f4c3e91a86d23afe8afccfb8");
     _this.panelBodyCreator = function (context) {
-      console.log(context);
-      console.log(context.node.parent);
-      console.log(context.node.parent.getComponent());
       return getSchemaTpl('tabs', [{
         title: i18n("24d67862f87f439db7ca957aecb77cce"),
         className: 'p-none',
@@ -147,7 +144,7 @@ var ServicePlugin = /** @class */function (_super) {
                 // this.manager.showInsertPanel('body', context.id);
                 _this.manager.showRendererPanel('');
               }
-            }, "\u6DFB\u52A0\u5185\u5BB9")
+            }, i18n("f754888421621d122c110d83e710e9d3"))
           }]
         }, {
           title: i18n("31f8a7a967286a16eb404e3ba237619e"),
@@ -228,6 +225,40 @@ var ServicePlugin = /** @class */function (_super) {
     };
     return _this;
   }
+  ServicePlugin.prototype.buildDataSchemas = function (node, region, trigger) {
+    var _a, _b, _c, _d, _e;
+    return __awaiter(this, void 0, void 0, function () {
+      var jsonschema, pool, current, schema, _f, _g;
+      return __generator(this, function (_h) {
+        switch (_h.label) {
+          case 0:
+            jsonschema = __assign({}, jsonToJsonSchema(JSONPipeOut((_a = node.schema.data) !== null && _a !== void 0 ? _a : {})));
+            pool = node.children.concat();
+            _h.label = 1;
+          case 1:
+            if (!pool.length) return [3 /*break*/, 5];
+            current = pool.shift();
+            schema = current.schema;
+            if (!(((_b = current.rendererConfig) === null || _b === void 0 ? void 0 : _b.isFormItem) && (schema === null || schema === void 0 ? void 0 : schema.name))) return [3 /*break*/, 3];
+            _f = jsonschema.properties;
+            _g = schema.name;
+            return [4 /*yield*/, (_d = (_c = current.info.plugin).buildDataSchemas) === null || _d === void 0 ? void 0 : _d.call(_c, current, undefined, trigger, node)];
+          case 2:
+            _f[_g] = _h.sent();
+            return [3 /*break*/, 4];
+          case 3:
+            if (!((_e = current.rendererConfig) === null || _e === void 0 ? void 0 : _e.storeType)) {
+              pool.push.apply(pool, __spreadArray([], __read(current.children), false));
+            }
+            _h.label = 4;
+          case 4:
+            return [3 /*break*/, 1];
+          case 5:
+            return [2 /*return*/, jsonschema];
+        }
+      });
+    });
+  };
   ServicePlugin.prototype.rendererBeforeDispatchEvent = function (node, e, data) {
     if (e === 'fetchInited') {
       var scope = this.manager.dataSchema.getScope("".concat(node.id, "-").concat(node.type));

package/esm/plugin/Sparkline.d.ts

@@ -24,5 +24,6 @@ export declare class SparklinePlugin extends BasePlugin {
         value: number[];
     };
     panelTitle: string;
-    panelBody: any[];
+    panelJustify: boolean;
+    panelBodyCreator: (context: BaseEventContext) => any[];
 }

package/esm/plugin/Sparkline.js

@@ -1,9 +1,9 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
-import { __extends, __assign } from 'tslib';
+import { __extends, __assign, __spreadArray, __read } from 'tslib';
 import { getSchemaTpl, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
 import { i18n } from 'i18n-runtime';
 
@@ -32,13 +32,37 @@ var SparklinePlugin = /** @class */function (_super) {
     };
     _this.previewSchema = __assign({}, _this.scaffold);
     _this.panelTitle = i18n("29326bcd28fb39bd41e54242fa532c85");
-    _this.panelBody = [getSchemaTpl('layout:originPosition', {
-      value: 'left-top'
-    }), {
-      name: 'height',
-      type: 'input-number',
-      label: i18n("c1df04eec5fa0857bc0df2d68d8e953c")
-    }];
+    _this.panelJustify = true;
+    _this.panelBodyCreator = function (context) {
+      return [getSchemaTpl('tabs', [{
+        title: i18n("24d67862f87f439db7ca957aecb77cce"),
+        body: [getSchemaTpl('collapseGroup', [{
+          title: i18n("4092ed98e9035652d4c9ca9441701ed7"),
+          body: [getSchemaTpl('layout:originPosition', {
+            value: 'left-top'
+          }), getSchemaTpl('name')]
+        }, {
+          title: i18n("00958a92c5804d56047c18fc206382e1"),
+          body: [{
+            name: 'width',
+            type: 'input-number',
+            label: i18n("c28479019e24e0e4745f4948e9e97ee7")
+          }, {
+            name: 'height',
+            type: 'input-number',
+            label: i18n("c1df04eec5fa0857bc0df2d68d8e953c")
+          }]
+        }, getSchemaTpl('status')])]
+      }, {
+        title: i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
+        body: getSchemaTpl('collapseGroup', __spreadArray(__spreadArray([], __read(getSchemaTpl('theme:common', {
+          exclude: ['layout']
+        })), false), [{
+          title: i18n("b4875c6e5e3dd45e5c5318bf6e1ee089"),
+          body: [getSchemaTpl('className')]
+        }], false))
+      }])];
+    };
     return _this;
   }
   SparklinePlugin.id = 'SparklinePlugin';

package/esm/plugin/Status.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Submit.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/plugin/Table.d.ts

@@ -25,7 +25,7 @@ export declare class TablePlugin extends BasePlugin {
     filterProps(props: any): any;
     getRendererInfo(context: RendererInfoResolveEventContext): BasicRendererInfo | void;
     beforeInsert(event: PluginEvent<InsertEventContext>): void;
-    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType): Promise<any>;
+    buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType, parent?: EditorNodeType): Promise<any>;
     editHeaderDetail(id: string): void;
     editFooterDetail(id: string): void;
 }