amis-editor 5.2.5-beta.5 → 5.2.5-beta.7

package/lib/renderer/event-control/helper.d.ts

@@ -1,5 +1,4 @@
-import { BaseEventContext, EditorManager, PluginActions, RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
-import { DataSchema } from 'amis-core';
+import { RendererPluginAction, RendererPluginEvent } from 'amis-editor-core';
 import { ActionConfig, ComponentInfo, ContextVariables } from './types';
 import CmptActionSelect from './comp-action-select';
 export declare const getArgsWrapper: (items: any, multiple?: boolean, patch?: {}) => {
@@ -67,12 +66,12 @@ export declare const renderCmptActionSelect: (componentLabel: string, required:
 export declare const COMMON_ACTION_SCHEMA_MAP: {
     [propName: string]: RendererPluginAction;
 };
-export declare const findActionNode: (actions: RendererPluginAction[], actionType: string) => RendererPluginAction | null;
-export declare const findSubActionNode: (actions: RendererPluginAction[], actionType: string) => RendererPluginAction | null;
-export declare const getActionType: (action: ActionConfig, hasSubActionNode: RendererPluginAction | null) => string | undefined;
-export declare const getEventLabel: (events: RendererPluginEvent[], name: string) => string | undefined;
-export declare const getEventDesc: (events: RendererPluginEvent[], name: string) => string | undefined;
-export declare const getEventStrongDesc: (events: RendererPluginEvent[], name: string) => string | undefined;
+export declare const findActionNode: (actions: RendererPluginAction[], actionType: string) => any;
+export declare const findSubActionNode: (actions: RendererPluginAction[], actionType: string) => any;
+export declare const getActionType: (action: ActionConfig, hasSubActionNode: RendererPluginAction | null) => any;
+export declare const getEventLabel: (events: RendererPluginEvent[], name: string) => any;
+export declare const getEventDesc: (events: RendererPluginEvent[], name: string) => any;
+export declare const getEventStrongDesc: (events: RendererPluginEvent[], name: string) => any;
 export declare const hasActionType: (actionType: string, actions?: RendererPluginAction[]) => boolean;
 export declare const getPropOfAcion: (action: ActionConfig, propName: string, actionTree: RendererPluginAction[], pluginActions: PluginActions, commonActions?: {
     [propName: string]: RendererPluginAction;
@@ -103,35 +102,22 @@ export declare const getOldActionSchema: (manager: EditorManager, context: BaseE
  */
 export declare const getEventControlConfig: (manager: EditorManager, context: BaseEventContext) => {
     showOldEntry: boolean;
-    actions: PluginActions;
-    events: import("amis-editor-core").PluginEvents;
-    actionTree: RendererPluginAction[];
-    commonActions: {
-        [propName: string]: RendererPluginAction;
-    } | undefined;
+    actions: any;
+    events: any;
+    actionTree: any;
+    commonActions: any;
     owner: string;
-    addBroadcast: (event: RendererPluginEvent) => void;
-    removeBroadcast: (id: string) => void;
-    allComponents: any[];
-    getContextSchemas: (id?: string, withoutSuper?: boolean) => Promise<DataSchema | import("json-schema").JSONSchema7[]>;
-    getComponents: (action: RendererPluginAction) => any[];
+    addBroadcast: any;
+    removeBroadcast: any;
+    allComponents: any;
+    getContextSchemas: (id?: string, withoutSuper?: boolean) => Promise<any>;
+    getComponents: (action: RendererPluginAction) => any;
     actionConfigInitFormatter: (action: ActionConfig, variables: {
         eventVariables: ContextVariables[];
         rawVariables: ContextVariables[];
     }) => Promise<{
-        actionType: string | undefined;
-        args: {
-            __dataContainerVariables: ContextVariables[];
-        };
-        description?: string | undefined;
-        componentId?: string | undefined;
-        data?: Record<string, any> | null | undefined;
-        dataMergeMode?: "merge" | "override" | undefined;
-        outputVar?: string | undefined;
-        preventDefault?: boolean | undefined;
-        stopPropagation?: boolean | undefined;
-        expression?: string | undefined;
-        execOn?: string | undefined;
+        actionType: any;
+        args: any;
     }>;
     actionConfigSubmitFormatter: (config: ActionConfig) => ActionConfig;
 };

package/lib/renderer/event-control/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.5
+ * amis-editor v5.2.5-alpha.12
  * Copyright 2018-2023 @fex
  */
 
@@ -98,17 +98,16 @@ var ACTION_TYPE_TREE = function (manager) {
           visibleOn: 'data.actionType === "url"'
         },
         */
-        {
+        amisEditorCore.getSchemaTpl('textareaFormulaControl', {
           name: 'url',
           label: i18nRuntime.i18n("8f1c078c6d42759e6ccb1a9bf35f1629"),
-          type: 'ae-textareaFormulaControl',
           variables: '${variables}',
           mode: 'horizontal',
           // placeholder: 'http://', 长文本暂不支持
           size: 'lg',
           required: true,
           visibleOn: 'data.actionType === "url"'
-        }, {
+        }), {
           type: 'combo',
           name: 'params',
           label: i18nRuntime.i18n("0b72392143e4038e98128cb0f6f679b3"),
@@ -132,13 +131,12 @@ var ACTION_TYPE_TREE = function (manager) {
             size: 'xs'
           },
            */
-          {
-            type: 'ae-formulaControl',
+          amisEditorCore.getSchemaTpl('formulaControl', {
             variables: '${variables}',
             name: 'val',
             variableMode: 'tabs',
             placeholder: i18nRuntime.i18n("bfed4943c5f487de1b63a82f7230cce2")
-          }]
+          })]
         }, {
           type: 'switch',
           name: 'blank',
@@ -360,15 +358,14 @@ var ACTION_TYPE_TREE = function (manager) {
           required: true
         },
         */
-        {
+        amisEditorCore.getSchemaTpl('textareaFormulaControl', {
           name: 'msg',
           label: i18nRuntime.i18n("b87b77561e776367e6756e11ea652217"),
-          type: 'ae-textareaFormulaControl',
           mode: 'horizontal',
           variables: '${variables}',
           size: 'lg',
           required: true
-        },
+        }),
         /*
         {
         name: 'title',
@@ -382,14 +379,13 @@ var ACTION_TYPE_TREE = function (manager) {
         mode: 'horizontal'
         },
         */
-        {
+        amisEditorCore.getSchemaTpl('textareaFormulaControl', {
           name: 'title',
           label: i18nRuntime.i18n("43ab9af06e1e0f0b2a8767b46cf8b1cf"),
-          type: 'ae-textareaFormulaControl',
           variables: '${variables}',
           mode: 'horizontal',
           size: 'lg'
-        },
+        }),
         /*
         {
         name: 'timeout',
@@ -403,10 +399,9 @@ var ACTION_TYPE_TREE = function (manager) {
         mode: 'horizontal'
         },
         */
-        {
+        amisEditorCore.getSchemaTpl('formulaControl', {
           name: 'timeout',
           label: i18nRuntime.i18n("f41a94bb85c5223181c4cdf83ea9021b"),
-          type: 'ae-formulaControl',
           rendererSchema: {
             type: 'input-number'
           },
@@ -414,7 +409,7 @@ var ACTION_TYPE_TREE = function (manager) {
           variables: '${variables}',
           size: 'lg',
           mode: 'horizontal'
-        }, {
+        }), {
           type: 'button-group-select',
           name: 'position',
           value: 'top-right',
@@ -583,7 +578,7 @@ var ACTION_TYPE_TREE = function (manager) {
         }
       }],
       supportComponents: '*',
-      schema: tslib.__spreadArray(tslib.__spreadArray([], renderCmptSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true), true), [{
+      schema: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(renderCmptSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true)), false), [{
         type: 'radios',
         label: i18nRuntime.i18n("69fbb2e5fc9eb3ba06096cbedbf5a622"),
         name: 'groupType',
@@ -615,8 +610,7 @@ var ACTION_TYPE_TREE = function (manager) {
           label: i18nRuntime.i18n("dce5379cb978a8259ecfca8f08f00817"),
           value: 'hidden'
         }]
-      }, {
-        type: 'ae-expressionFormulaControl',
+      }, amisEditorCore.getSchemaTpl('expressionFormulaControl', {
         mode: 'horizontal',
         label: i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
         required: true,
@@ -625,7 +619,7 @@ var ACTION_TYPE_TREE = function (manager) {
         evalMode: true,
         name: '__actionExpression',
         visibleOn: "this.groupType === 'visibility'"
-      }], false)
+      })], false)
     }, {
       actionLabel: i18nRuntime.i18n("12c8d50c55eeec7059ddd5c303e34f77"),
       actionType: 'usability',
@@ -652,8 +646,8 @@ var ACTION_TYPE_TREE = function (manager) {
           }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || '-'), "\u8868\u8FBE\u5F0F\u5DF2\u914D\u7F6E");
         }
       }],
-      supportComponents: tslib.__spreadArray(tslib.__spreadArray(['form'], FORMITEM_CMPTS, true), SUPPORT_DISABLED_CMPTS, true),
-      schema: tslib.__spreadArray(tslib.__spreadArray([], renderCmptSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true), true), [{
+      supportComponents: tslib.__spreadArray(tslib.__spreadArray(['form'], tslib.__read(FORMITEM_CMPTS), false), tslib.__read(SUPPORT_DISABLED_CMPTS), false),
+      schema: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(renderCmptSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true)), false), [{
         type: 'radios',
         label: i18nRuntime.i18n("69fbb2e5fc9eb3ba06096cbedbf5a622"),
         name: 'groupType',
@@ -685,8 +679,7 @@ var ACTION_TYPE_TREE = function (manager) {
           label: i18nRuntime.i18n("710ad08b11419332713360d2750cd707"),
           value: 'disabled'
         }]
-      }, {
-        type: 'ae-expressionFormulaControl',
+      }, amisEditorCore.getSchemaTpl('expressionFormulaControl', {
         mode: 'horizontal',
         label: i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
         required: true,
@@ -694,7 +687,7 @@ var ACTION_TYPE_TREE = function (manager) {
         evalMode: true,
         name: '__actionExpression',
         visibleOn: "this.groupType === 'usability'"
-      }], false)
+      })], false)
     }, {
       actionLabel: i18nRuntime.i18n("e052287273ad39a1d3fa9fa3decb5fd9"),
       actionType: 'staticStatus',
@@ -714,8 +707,8 @@ var ACTION_TYPE_TREE = function (manager) {
           }, info === null || info === void 0 ? void 0 : info.rendererLabel), "\u7EC4\u4EF6\u5207\u6362\u4E3A\u8F93\u5165\u6001");
         }
       }],
-      supportComponents: tslib.__spreadArray(['form'], SUPPORT_STATIC_FORMITEM_CMPTS, true),
-      schema: tslib.__spreadArray(tslib.__spreadArray([], renderCmptSelect(i18nRuntime.i18n("d80bc0fcbfb250480320b683e48b1467"), true), true), [{
+      supportComponents: tslib.__spreadArray(['form'], tslib.__read(SUPPORT_STATIC_FORMITEM_CMPTS), false),
+      schema: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(renderCmptSelect(i18nRuntime.i18n("d80bc0fcbfb250480320b683e48b1467"), true)), false), [{
         type: 'radios',
         label: i18nRuntime.i18n("d2e930293da37452638759e17d771adf"),
         name: 'groupType',
@@ -742,13 +735,13 @@ var ACTION_TYPE_TREE = function (manager) {
         }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || '-'), "\u7EC4\u4EF6");
       },
       supportComponents: 'byComponent',
-      schema: tslib.__spreadArray(tslib.__spreadArray([], renderCmptSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
+      schema: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(renderCmptSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
         form.setValueByName('args.resetPage', true);
         form.setValueByName('__addParam', true);
         form.setValueByName('__customData', false);
         form.setValueByName('__containerType', 'all');
         form.setValueByName('__reloadParam', []);
-      }), true), [{
+      })), false), [{
         type: 'switch',
         name: '__resetPage',
         label: amisEditorCore.tipedLabel(i18nRuntime.i18n("697af73997072e0ce9ee65b15a7b3715"), i18nRuntime.i18n("d7bf42dd6e66f2818f9a232603c4a53b")),
@@ -812,16 +805,15 @@ var ACTION_TYPE_TREE = function (manager) {
         visibleOn: `data.__addParam && data.__customData && data.__containerType === "all" && data.actionType === "reload" && ${IS_DATA_CONTAINER}`
       },
       */
-      {
+      amisEditorCore.getSchemaTpl('formulaControl', {
         name: '__valueInput',
         label: '',
-        type: 'ae-formulaControl',
         variables: '${variables}',
         size: 'lg',
         mode: 'horizontal',
         required: true,
         visibleOn: "data.__addParam && data.__customData && data.__containerType === \"all\" && data.actionType === \"reload\" && ".concat(IS_DATA_CONTAINER)
-      }, {
+      }), {
         type: 'combo',
         name: '__reloadParams',
         label: '',
@@ -851,12 +843,11 @@ var ACTION_TYPE_TREE = function (manager) {
           inputMode: 'input-group'
         }
         */
-        {
+        amisEditorCore.getSchemaTpl('formulaControl', {
           name: 'val',
-          type: 'ae-formulaControl',
           variables: '${variables}',
           placeholder: i18nRuntime.i18n("bfed4943c5f487de1b63a82f7230cce2")
-        }],
+        })],
         visibleOn: "data.__addParam && data.__customData && data.__containerType === \"appoint\" && data.actionType === \"reload\" && ".concat(IS_DATA_CONTAINER)
       }, {
         type: 'radios',
@@ -920,10 +911,10 @@ var ACTION_TYPE_TREE = function (manager) {
       {
         type: 'container',
         visibleOn: '__actionSubType === "cmpt"',
-        body: tslib.__spreadArray(tslib.__spreadArray([], renderCmptActionSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
+        body: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(renderCmptActionSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
           form.setValueByName('args.__containerType', 'all');
           form.setValueByName('args.__comboType', 'all');
-        }), true), [getArgsWrapper({
+        })), false), [getArgsWrapper({
           type: 'wrapper',
           className: 'p-none',
           body: [{
@@ -1005,12 +996,11 @@ var ACTION_TYPE_TREE = function (manager) {
               inputMode: 'input-group'
             }
             */
-            {
+            amisEditorCore.getSchemaTpl('formulaControl', {
               name: 'val',
-              type: 'ae-formulaControl',
               variables: '${variables}',
               placeholder: i18nRuntime.i18n("a33903526e8fb3d1ac3066da70e7941e")
-            }],
+            })],
             visibleOn: "".concat(IS_DATA_CONTAINER, " && data.__containerType === 'appoint' || data.__comboType === 'appoint'")
           }, {
             type: 'combo',
@@ -1057,11 +1047,10 @@ var ACTION_TYPE_TREE = function (manager) {
                 inputMode: 'input-group'
               }
               */
-              {
+              amisEditorCore.getSchemaTpl('formulaControl', {
                 name: 'val',
-                type: 'ae-formulaControl',
                 variables: '${variables}'
-              }]
+              })]
             }],
             visibleOn: "(data.__rendererName === 'combo' || data.__rendererName === 'input-table')\n                      && data.__comboType === 'all'"
           },
@@ -1080,16 +1069,15 @@ var ACTION_TYPE_TREE = function (manager) {
             required: true
           },
           */
-          {
+          amisEditorCore.getSchemaTpl('formulaControl', {
             name: '__valueInput',
             label: '',
-            type: 'ae-formulaControl',
             variables: '${variables}',
             size: 'lg',
             mode: 'horizontal',
             visibleOn: "(".concat(IS_DATA_CONTAINER, " || ").concat(SHOW_SELECT_PROP, ") && data.__containerType === 'all'"),
             required: true
-          },,
+          }),
           /*
           {
             name: '__valueInput',
@@ -1105,16 +1093,15 @@ var ACTION_TYPE_TREE = function (manager) {
             required: true
           }
           */
-          {
+          amisEditorCore.getSchemaTpl('formulaControl', {
             name: '__valueInput',
             label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
-            type: 'ae-formulaControl',
             variables: '${variables}',
             size: 'lg',
             mode: 'horizontal',
             visibleOn: "data.__rendererName && !".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'"),
             required: true
-          }]
+          })]
         })], false)
       },
       // 页面变量
@@ -1271,16 +1258,15 @@ var ACTION_TYPE_TREE = function (manager) {
           required: true
         },
         */
-        {
+        amisEditorCore.getSchemaTpl('textareaFormulaControl', {
           name: 'content',
           label: i18nRuntime.i18n("ac04259507be8ba6b891dc9dc208f491"),
-          type: 'ae-textareaFormulaControl',
           variables: '${variables}',
           mode: 'horizontal',
           size: 'lg',
           visibleOn: 'data.actionType === "copy"',
           required: true
-        }, {
+        }), {
           type: 'select',
           name: 'copyFormat',
           mode: 'horizontal',
@@ -1391,7 +1377,7 @@ var renderCmptSelect = function (componentLabel, required, onChange) {
 };
 // 渲染组件特性动作配置项
 var renderCmptActionSelect = function (componentLabel, required, onChange) {
-  return tslib.__spreadArray(tslib.__spreadArray([], renderCmptSelect(componentLabel || i18nRuntime.i18n("d80bc0fcbfb250480320b683e48b1467"), true, function (value, oldVal, data, form) {
+  return tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(renderCmptSelect(componentLabel || i18nRuntime.i18n("d80bc0fcbfb250480320b683e48b1467"), true, function (value, oldVal, data, form) {
     return tslib.__awaiter(void 0, void 0, void 0, function () {
       var rendererType, dataSchema, dataSchemaIns, variables;
       var _a, _b;
@@ -1412,9 +1398,9 @@ var renderCmptActionSelect = function (componentLabel, required, onChange) {
             {
               label: "".concat(form.data.__rendererLabel, "\u53D8\u91CF"),
               children: variables
-            }], form.data.rawVariables.filter(function (item) {
+            }], tslib.__read(form.data.rawVariables.filter(function (item) {
               return [i18nRuntime.i18n("cc6aeb073ebc3cb29734a49164f8964c"), i18nRuntime.i18n("979a50681e278dcc0be18f68459e8217")].includes(item.label);
-            }), true));
+            })), false));
             if (form.data.actionType === 'setValue') {
               // todo:这里会闪一下，需要从amis查下问题
               form.setValueByName('args.value', []);
@@ -1437,7 +1423,7 @@ var renderCmptActionSelect = function (componentLabel, required, onChange) {
         }
       });
     });
-  }), true), [{
+  })), false), [{
     asFormItem: true,
     label: i18nRuntime.i18n("8deee3cdecdf06a05d22fcacc7031492"),
     name: 'groupType',
@@ -1491,12 +1477,11 @@ var COMMON_ACTION_SCHEMA_MAP = {
           inputMode: 'input-group'
         }
         */
-        {
+        amisEditorCore.getSchemaTpl('formulaControl', {
           name: 'val',
-          type: 'ae-formulaControl',
           variables: '${variables}',
           placeholder: i18nRuntime.i18n("9a2ee7044ff04234a8892a13583d14b6")
-        }],
+        })],
         visibleOn: "".concat(IS_DATA_CONTAINER)
       }, {
         type: 'combo',
@@ -1537,11 +1522,10 @@ var COMMON_ACTION_SCHEMA_MAP = {
             inputMode: 'input-group'
           }
           */
-          {
+          amisEditorCore.getSchemaTpl('formulaControl', {
             name: 'val',
-            type: 'ae-formulaControl',
             variables: '${variables}'
-          }]
+          })]
         }],
         visibleOn: "data.__rendererName === 'combo' || data.__rendererName === 'input-table'"
       },
@@ -1560,16 +1544,15 @@ var COMMON_ACTION_SCHEMA_MAP = {
         required: true
       }
       */
-      {
+      amisEditorCore.getSchemaTpl('formulaControl', {
         name: '__valueInput',
         label: i18nRuntime.i18n("e22855f53b7a1ab33e920375c0cd0e3d"),
-        type: 'ae-formulaControl',
         variables: '${variables}',
         size: 'lg',
         mode: 'horizontal',
         visibleOn: "!".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'"),
         required: true
-      }]
+      })]
     })
   },
   reload: {
@@ -2021,8 +2004,9 @@ var getOldActionSchema = function (manager, context) {
  */
 var objectToComboArray = function (obj) {
   return Object.entries(obj).map(function (_a) {
-    var key = _a[0],
-      val = _a[1];
+    var _b = tslib.__read(_a, 2),
+      key = _b[0],
+      val = _b[1];
     return {
       key: key,
       val: val
@@ -2118,7 +2102,7 @@ var getEventControlConfig = function (manager, context) {
               children: components
             })];
           }
-          finalCmpts = tslib.__spreadArray(tslib.__spreadArray([], finalCmpts, true), components, true);
+          finalCmpts = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(finalCmpts), false), tslib.__read(components), false);
           components = editorData === null || editorData === void 0 ? void 0 : editorData.__superCmptTreeSource;
           editorData = editorData === null || editorData === void 0 ? void 0 : editorData.__super;
         }
@@ -2223,7 +2207,7 @@ var getEventControlConfig = function (manager, context) {
                     var _b, _c;
                     // 筛选出附加配置参数
                     if (!innerArgs.includes(key)) {
-                      config.addOnArgs = tslib.__spreadArray(tslib.__spreadArray([], config.addOnArgs, true), [{
+                      config.addOnArgs = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(config.addOnArgs), false), [{
                         key: key,
                         val: (_b = config.args) === null || _b === void 0 ? void 0 : _b[key]
                       }], false);
@@ -2248,10 +2232,10 @@ var getEventControlConfig = function (manager, context) {
               return [2 /*return*/, tslib.__assign(tslib.__assign({}, config), {
                 actionType: getActionType(action, hasSubActionNode),
                 args: tslib.__assign(tslib.__assign({}, config.args), {
-                  __dataContainerVariables: (datasource === null || datasource === void 0 ? void 0 : datasource.length) ? tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([], variables.eventVariables, true), [{
+                  __dataContainerVariables: (datasource === null || datasource === void 0 ? void 0 : datasource.length) ? tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(variables.eventVariables), false), [{
                     label: i18nRuntime.i18n("c0a8088f2bbc993500c5a01b0f0a1887"),
                     children: datasource
-                  }], false), variables.rawVariables, true) : tslib.__spreadArray(tslib.__spreadArray([], variables.eventVariables, true), variables.rawVariables, true)
+                  }], false), tslib.__read(variables.rawVariables), false) : tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(variables.eventVariables), false), tslib.__read(variables.rawVariables), false)
                 })
               })];
           }