amis-editor 5.5.0 → 5.6.1

package/lib/plugin/Service.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -9,47 +10,62 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var amis = require('amis');
-var React = require('react');
+var flattenDeep = require('lodash/flattenDeep');
 var amisEditorCore = require('amis-editor-core');
+var DSBuilderManager = require('../builder/DSBuilderManager.js');
+var constants = require('../builder/constants.js');
+require('lodash/isObjectLike');
+require('../builder/DSBuilder.js');
+require('../builder/ApiDSBuilder.js');
 var helper = require('../renderer/event-control/helper.js');
 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 flattenDeep__default = /*#__PURE__*/_interopDefaultLegacy(flattenDeep);
 
 var ServicePlugin = /** @class */function (_super) {
   tslib.__extends(ServicePlugin, _super);
-  function ServicePlugin() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
+  function ServicePlugin(manager) {
+    var _this = _super.call(this, manager) || this;
     // 关联渲染器名字
     _this.rendererName = 'service';
+    _this.name = i18nRuntime.i18n("985d97bfa88cbaed452ee5900ad26d45");
+    _this.panelTitle = i18nRuntime.i18n("985d97bfa88cbaed452ee5900ad26d45");
+    _this.icon = 'fa fa-server';
+    _this.pluginIcon = 'service-plugin';
+    _this.panelIcon = 'service-plugin';
     _this.$schema = '/schemas/ServiceSchema.json';
-    // 组件名称
-    _this.name = i18nRuntime.i18n("6a06f12bdf3fc96df6cb45467b9a7c2c");
     _this.isBaseComponent = true;
+    _this.order = -850;
     _this.description = i18nRuntime.i18n("9cc50da6bb17ea7ecf44c254c9b37619");
     _this.docLink = '/amis/zh-CN/components/service';
     _this.tags = [i18nRuntime.i18n("73721e611daaafe5c34aa9f3f901d016")];
-    _this.icon = 'fa fa-server';
-    _this.pluginIcon = 'service-plugin';
     _this.scaffold = {
+      type: 'service',
+      /** region 区域的 placeholder 会撑开内容区 */
+      body: []
+    };
+    _this.previewSchema = {
       type: 'service',
       body: [{
         type: 'tpl',
-        tpl: i18nRuntime.i18n("2d711b09bd0db0ad240cc83b30dd8014"),
-        wrapperComponent: '',
-        inline: false
+        tpl: i18nRuntime.i18n("33be689a0f0de129ce37f7a96052002e"),
+        inline: false,
+        className: 'bg-light wrapper'
       }]
     };
-    _this.previewSchema = {
-      type: 'tpl',
-      wrapperComponent: '',
-      tpl: i18nRuntime.i18n("c5a33208cf3deab68cd9fe34679edff6")
-    };
     _this.regions = [{
       key: 'body',
-      label: i18nRuntime.i18n("132a78bdf68d6d17bde00aa807bbf032")
+      label: i18nRuntime.i18n("132a78bdf68d6d17bde00aa807bbf032"),
+      placeholder: amis.render({
+        type: 'wrapper',
+        size: 'lg',
+        body: {
+          type: 'tpl',
+          tpl: i18nRuntime.i18n("33be689a0f0de129ce37f7a96052002e")
+        }
+      })
     }];
     _this.events = [{
       eventName: 'init',
@@ -133,95 +149,102 @@ var ServicePlugin = /** @class */function (_super) {
       actionLabel: i18nRuntime.i18n("e22855f53b7a1ab33e920375c0cd0e3d"),
       description: i18nRuntime.i18n("8b10146a8a896b890b3796eefcc3c6d3")
     }];
-    _this.panelTitle = i18nRuntime.i18n("47d68cd0f4c3e91a86d23afe8afccfb8");
     _this.panelBodyCreator = function (context) {
-      console.log(context);
-      console.log(context.node.parent);
-      console.log(context.node.parent.getComponent());
+      var dsManager = _this.dsManager;
+      /** 数据源控件 */
+      var generateDSControls = function () {
+        var dsTypeSelector = dsManager.getDSSelectorSchema({
+          type: 'select',
+          mode: 'horizontal',
+          horizontal: {
+            justify: true,
+            left: 'col-sm-4'
+          },
+          onChange: function (value, oldValue, model, form) {
+            if (value !== oldValue) {
+              var data = form.data;
+              Object.keys(data).forEach(function (key) {
+                var _a;
+                if (((_a = key === null || key === void 0 ? void 0 : key.toLowerCase()) === null || _a === void 0 ? void 0 : _a.endsWith('fields')) || (key === null || key === void 0 ? void 0 : key.toLowerCase().endsWith('api'))) {
+                  form.deleteValueByName(key);
+                }
+              });
+              form.deleteValueByName('__fields');
+              form.deleteValueByName('__relations');
+              form.setValueByName('api', undefined);
+            }
+            return value;
+          }
+        }, {
+          schema: context === null || context === void 0 ? void 0 : context.schema,
+          sourceKey: 'api'
+        });
+        /** 默认数据源类型 */
+        var defaultDsType = dsTypeSelector.value;
+        var dsSettings = dsManager.buildCollectionFromBuilders(function (builder, builderKey) {
+          return {
+            type: 'container',
+            visibleOn: "data.dsType == null ? '".concat(builderKey, "' === '").concat(defaultDsType || constants.ApiDSBuilderKey, "' : data.dsType === '").concat(builderKey, "'"),
+            body: flattenDeep__default["default"]([builder.makeSourceSettingForm({
+              feat: 'View',
+              renderer: 'service',
+              inScaffold: false,
+              sourceSettings: tslib.__assign(tslib.__assign({
+                name: 'api',
+                label: i18nRuntime.i18n("6f6f1e6feb9fa966acaddae627b73948"),
+                mode: 'horizontal'
+              }, builderKey === 'api' || builderKey === 'apicenter' ? {
+                horizontalConfig: {
+                  labelAlign: 'left',
+                  horizontal: {
+                    justify: true,
+                    left: 4
+                  }
+                }
+              } : {}), {
+                useFieldManager: builderKey === constants.ModelDSBuilderKey
+              })
+            })])
+          };
+        });
+        return tslib.__spreadArray([dsTypeSelector], tslib.__read(dsSettings), false);
+      };
       return amisEditorCore.getSchemaTpl('tabs', [{
         title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
         className: 'p-none',
         body: [amisEditorCore.getSchemaTpl('collapseGroup', [{
           title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
-          body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
+          body: tslib.__spreadArray([amisEditorCore.getSchemaTpl('layout:originPosition', {
             value: 'left-top'
-          }), amisEditorCore.getSchemaTpl('name'), {
-            children: React__default["default"].createElement(amis.Button, {
-              level: "info",
-              size: "sm",
-              className: "m-b-sm",
-              block: true,
-              onClick: function () {
-                // this.manager.showInsertPanel('body', context.id);
-                _this.manager.showRendererPanel('');
-              }
-            }, "\u6DFB\u52A0\u5185\u5BB9")
-          }]
+          })], tslib.__read(generateDSControls()), false)
         }, {
-          title: i18nRuntime.i18n("31f8a7a967286a16eb404e3ba237619e"),
-          body: [amisEditorCore.getSchemaTpl('apiControl', {
-            name: 'api',
-            label: i18nRuntime.i18n("31f8a7a967286a16eb404e3ba237619e"),
-            messageDesc: i18nRuntime.i18n("54f876a529283de5668426b2dc8adb15")
-          }), {
-            name: 'ws',
-            type: 'input-text',
-            label: i18nRuntime.i18n("7fa237c1b62d04aaec0144d1fc89d620")
-          }, /** initFetchOn可以通过api的sendOn属性控制 */
-          amisEditorCore.getSchemaTpl('switch', {
-            name: 'initFetch',
-            label: i18nRuntime.i18n("9dfeacc54ab6cd6d2ac08df387777f9e"),
-            visibleOn: 'this.api'
-          }), {
-            name: 'interval',
-            label: i18nRuntime.i18n("2af32ab13a9dece315cec2764d6aa7d4"),
-            visibleOn: 'this.api',
-            type: 'input-number',
-            step: 500,
-            description: i18nRuntime.i18n("9800f1ce2f78a23b81c8d944ebf9cce9")
-          }, amisEditorCore.getSchemaTpl('switch', {
-            name: 'silentPolling',
-            label: i18nRuntime.i18n("98223d478e88ccbc2406412a46dda8c2"),
-            visibleOn: '!!data.interval',
-            description: i18nRuntime.i18n("71ae1c76cc4160f8fb76e404e35ca08f")
-          }), {
-            name: 'stopAutoRefreshWhen',
-            label: i18nRuntime.i18n("b897babfafd35cc5d6e66470115c93cf"),
-            type: 'input-text',
-            visibleOn: '!!data.interval',
-            description: i18nRuntime.i18n("32e3a79e80dcf7f7304e8092dd7acc6f")
-          }]
+          title: i18nRuntime.i18n("3fea7ca76cdece641436d7ab0d02ab1b"),
+          body: [amisEditorCore.getSchemaTpl('hidden')]
         }, {
-          title: i18nRuntime.i18n("11bcbff684dfe6edf36e1fd1adc5ba30"),
-          body: [amisEditorCore.getSchemaTpl('apiControl', {
+          title: i18nRuntime.i18n("dfac151de712ab0b3618072c8a7f0a0f"),
+          body: [amisEditorCore.getSchemaTpl('combo-container', {
+            type: 'input-kv',
+            mode: 'normal',
+            name: 'data',
+            label: i18nRuntime.i18n("ae76ff4dcb615d3b0232dcd10115e149")
+          }), amisEditorCore.getSchemaTpl('apiControl', {
             name: 'schemaApi',
-            label: i18nRuntime.i18n("8cc3239eba9fe65b99242adb33634b33")
-          }), amisEditorCore.getSchemaTpl('switch', {
+            label: amisEditorCore.tipedLabel(i18nRuntime.i18n("270ac7e329c21eb9a5e4c342f202bbb4"), i18nRuntime.i18n("bfa178f875f63957378fc2d0bd8d0f59"))
+          }), amisEditorCore.getSchemaTpl('initFetch', {
             name: 'initFetchSchema',
-            label: i18nRuntime.i18n("3f423669b0ffeb3993b95085cd8a111e"),
-            visibleOn: 'this.schemaApi'
-          })]
-        }, {
-          title: i18nRuntime.i18n("8e8aaafe8db0d8eb05e3b11550cbabe7"),
-          body: [amisEditorCore.getSchemaTpl('loadingConfig', {}, {
-            context: context
-          }), amisEditorCore.getSchemaTpl('data'), {
+            label: i18nRuntime.i18n("dd22d42f40442605fbe0c5da03203ffb"),
+            visibleOn: 'typeof this.schemaApi === "string" ? this.schemaApi : this.schemaApi && this.schemaApi.url'
+          }), {
+            name: 'ws',
+            type: 'input-text',
+            label: amisEditorCore.tipedLabel(i18nRuntime.i18n("eb1d029d107422d00f55c8b76e66ec75"), i18nRuntime.i18n("470e0b39b2486883a10c1048f2df9f40"))
+          }, {
             type: 'js-editor',
             allowFullscreen: true,
             name: 'dataProvider',
-            label: i18nRuntime.i18n("7481babe858320dd6a4adcf307fd151d"),
-            description: i18nRuntime.i18n("bfdee34e14602e3113c88a9145843e86")
-          }, {
-            label: i18nRuntime.i18n("b64292a1903bd969d0e3a558c334f5bf"),
-            type: 'combo',
-            name: 'messages',
-            multiLine: true,
-            description: i18nRuntime.i18n("54f876a529283de5668426b2dc8adb15"),
-            items: [amisEditorCore.getSchemaTpl('fetchSuccess'), amisEditorCore.getSchemaTpl('fetchFailed')]
+            label: amisEditorCore.tipedLabel(i18nRuntime.i18n("7481babe858320dd6a4adcf307fd151d"), i18nRuntime.i18n("3bfc17446f0456f9692f25fc90383ec1")),
+            placeholder: i18nRuntime.i18n("ec9b680403aab2f0498badb090f04364")
           }]
-        }, {
-          title: i18nRuntime.i18n("3fea7ca76cdece641436d7ab0d02ab1b"),
-          body: [amisEditorCore.getSchemaTpl('ref'), amisEditorCore.getSchemaTpl('visible')]
         }])]
       }, {
         title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
@@ -234,8 +257,76 @@ var ServicePlugin = /** @class */function (_super) {
         }, helper.getEventControlConfig(_this.manager, context)))]
       }]);
     };
+    _this.panelFormPipeOut = function (schema) {
+      return tslib.__awaiter(_this, void 0, void 0, function () {
+        var entity, builder, updatedSchema, e_1;
+        var _a;
+        return tslib.__generator(this, function (_b) {
+          switch (_b.label) {
+            case 0:
+              entity = (_a = schema === null || schema === void 0 ? void 0 : schema.api) === null || _a === void 0 ? void 0 : _a.entity;
+              if (!entity || (schema === null || schema === void 0 ? void 0 : schema.dsType) !== constants.ModelDSBuilderKey) {
+                return [2 /*return*/, schema];
+              }
+              builder = this.dsManager.getBuilderBySchema(schema);
+              _b.label = 1;
+            case 1:
+              _b.trys.push([1, 3,, 4]);
+              return [4 /*yield*/, builder.buildApiSchema({
+                schema: schema,
+                renderer: 'service',
+                sourceKey: 'api'
+              })];
+            case 2:
+              updatedSchema = _b.sent();
+              return [2 /*return*/, updatedSchema];
+            case 3:
+              e_1 = _b.sent();
+              console.error(e_1);
+              return [3 /*break*/, 4];
+            case 4:
+              return [2 /*return*/, schema];
+          }
+        });
+      });
+    };
+    _this.dsManager = new DSBuilderManager.DSBuilderManager(manager);
     return _this;
   }
+  ServicePlugin.prototype.buildDataSchemas = function (node, region, trigger) {
+    var _a, _b, _c, _d, _e;
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var jsonschema, pool, current, schema, _f, _g;
+      return tslib.__generator(this, function (_h) {
+        switch (_h.label) {
+          case 0:
+            jsonschema = tslib.__assign({}, amisEditorCore.jsonToJsonSchema(amisEditorCore.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, tslib.__spreadArray([], tslib.__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));
@@ -246,9 +337,27 @@ var ServicePlugin = /** @class */function (_super) {
       scope === null || scope === void 0 ? void 0 : scope.addSchema(jsonschema);
     }
   };
+  ServicePlugin.prototype.getAvailableContextFields = function (scopeNode, node, region) {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var builder;
+      return tslib.__generator(this, function (_a) {
+        builder = this.dsManager.getBuilderBySchema(scopeNode.schema);
+        if (builder && scopeNode.schema.api) {
+          return [2 /*return*/, builder.getAvailableContextFields({
+            schema: scopeNode.schema,
+            sourceKey: 'api',
+            feat: constants.DSFeatureEnum.List
+          }, node)];
+        }
+        return [2 /*return*/];
+      });
+    });
+  };
+
   ServicePlugin.id = 'ServicePlugin';
   return ServicePlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(ServicePlugin);
 
 exports.ServicePlugin = ServicePlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/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/lib/plugin/Sparkline.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -36,13 +37,34 @@ var SparklinePlugin = /** @class */function (_super) {
     };
     _this.previewSchema = tslib.__assign({}, _this.scaffold);
     _this.panelTitle = i18nRuntime.i18n("29326bcd28fb39bd41e54242fa532c85");
-    _this.panelBody = [amisEditorCore.getSchemaTpl('layout:originPosition', {
-      value: 'left-top'
-    }), {
-      name: 'height',
-      type: 'input-number',
-      label: i18nRuntime.i18n("c1df04eec5fa0857bc0df2d68d8e953c")
-    }];
+    _this.panelJustify = true;
+    _this.panelBodyCreator = function (context) {
+      return [amisEditorCore.getSchemaTpl('tabs', [{
+        title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
+        body: [amisEditorCore.getSchemaTpl('collapseGroup', [{
+          title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
+          body: [amisEditorCore.getSchemaTpl('layout:originPosition', {
+            value: 'left-top'
+          }), amisEditorCore.getSchemaTpl('name')]
+        }, {
+          title: i18nRuntime.i18n("00958a92c5804d56047c18fc206382e1"),
+          body: [{
+            name: 'width',
+            type: 'input-number',
+            label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7")
+          }, {
+            name: 'height',
+            type: 'input-number',
+            label: i18nRuntime.i18n("c1df04eec5fa0857bc0df2d68d8e953c")
+          }]
+        }, amisEditorCore.getSchemaTpl('status')])]
+      }, {
+        title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
+        body: amisEditorCore.getSchemaTpl('collapseGroup', tslib.__spreadArray([], tslib.__read(amisEditorCore.getSchemaTpl('theme:common', {
+          exclude: ['layout']
+        })), false))
+      }])];
+    };
     return _this;
   }
   SparklinePlugin.id = 'SparklinePlugin';
@@ -51,3 +73,4 @@ var SparklinePlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(SparklinePlugin);
 
 exports.SparklinePlugin = SparklinePlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Status.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -272,3 +273,4 @@ var StatusPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(StatusPlugin);
 
 exports.StatusPlugin = StatusPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Steps.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -118,3 +119,4 @@ var StepsPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(StepsPlugin);
 
 exports.StepsPlugin = StepsPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Submit.js

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.5.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -38,3 +39,4 @@ var SubmitPlugin = /** @class */function (_super) {
 amisEditorCore.registerEditorPlugin(SubmitPlugin);
 
 exports.SubmitPlugin = SubmitPlugin;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

package/lib/plugin/Table.d.ts

@@ -1,7 +1,9 @@
 import { RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
 import { BasePlugin, PluginEvent, RegionConfig, RendererInfoResolveEventContext, BasicRendererInfo, InsertEventContext, ScaffoldForm } from 'amis-editor-core';
+import { DSBuilderManager } from '../builder/DSBuilderManager';
 import { EditorNodeType } from 'amis-editor-core';
 import type { SchemaObject } from 'amis';
+import type { EditorManager } from 'amis-editor-core';
 export declare class TablePlugin extends BasePlugin {
     static id: string;
     rendererName: string;
@@ -21,11 +23,18 @@ export declare class TablePlugin extends BasePlugin {
     events: RendererPluginEvent[];
     actions: RendererPluginAction[];
     panelJustify: boolean;
+    dsManager: DSBuilderManager;
+    constructor(manager: EditorManager);
     panelBodyCreator: (context: BaseEventContext) => any;
     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>;
+    getAvailableContextFields(scopeNode: EditorNodeType, node: EditorNodeType, region?: EditorNodeType): Promise<any>;
     editHeaderDetail(id: string): void;
     editFooterDetail(id: string): void;
+    unWatchWidthChange: {
+        [propName: string]: () => void;
+    };
+    componentRef(node: EditorNodeType, ref: any): void;
 }