@kengic/vue 0.30.1-beta.82 → 0.30.1-beta.85

package/component/KgSimulator/KgSimulator.tsx

@@ -0,0 +1,235 @@
+import { ElConfigProvider } from 'element-plus';
+import zhCN from 'element-plus/es/locale/lang/zh-cn';
+import storejs from 'store';
+import { defineComponent, ExtractPropTypes, onBeforeUnmount, onMounted, PropType, provide } from 'vue';
+import './KgSimulator.css';
+import './KgSimulator.icons';
+import { KG } from '../../model';
+import { httpClient } from '../../service';
+import { KgUtil } from '../../util';
+import { KgSimulatorCanvas } from './KgSimulator.Canvas';
+import { KgSimulatorCanvasTitle } from './KgSimulator.Canvas.Title';
+import { useKgSimulator } from './KgSimulator.hooks';
+import { KgSimulatorMenu } from './KgSimulator.Menu';
+import { GetSceneRequest, STORE_KEY } from './KgSimulator.model';
+import { KgSimulatorPanelPrefab } from './KgSimulator.Panel.Prefab';
+import { KgSimulatorPanelProperty } from './KgSimulator.Panel.Property';
+import { KgSimulatorPanelScene } from './KgSimulator.Panel.Scene';
+import { KgSimulatorToolbarButtonPrefab } from './KgSimulator.ToolbarButton.Prefab';
+import { KgSimulatorToolbarButtonProperty } from './KgSimulator.ToolbarButton.Property';
+import { KgSimulatorToolbarButtonScene } from './KgSimulator.ToolbarButton.Scene';
+
+export const getProps = () => ({
+    /**
+     * 标识.
+     */
+    id: {
+        type: String as PropType<string>,
+        required: true,
+    },
+});
+
+export type IKgSimulatorProps = Partial<ExtractPropTypes<ReturnType<typeof getProps>>>;
+
+/**
+ * 模拟器, 仿真模拟器, 环形输送线模拟器, 环形穿梭车模拟器.
+ */
+export const KgSimulator = defineComponent({
+    name: 'KgSimulator',
+    props: getProps(),
+    setup(props) {
+        const TOOLBAR__LEFT_TOP__TELEPORT_ID = `${props.id}--kg-simulator--editor--left--toolbar--top`;
+        const TOOLBAR__LEFT_BOTTOM__TELEPORT_ID = `${props.id}--kg-simulator--editor--left--toolbar--bottom`;
+        const TOOLBAR__RIGHT_TOP__TELEPORT_ID = `${props.id}--kg-simulator--editor--right--toolbar--top`;
+        const TOOLBAR__RIGHT_BOTTOM__TELEPORT_ID = `${props.id}--kg-simulator--editor--right--toolbar--bottom`;
+
+        const PANEL__LEFT_TOP__TELEPORT_ID = `${props.id}--kg-simulator--editor--left--panel--top`;
+        const PANEL__LEFT_BOTTOM__TELEPORT_ID = `${props.id}--kg-simulator--editor--left--panel--bottom`;
+        const PANEL__RIGHT_TOP__TELEPORT_ID = `${props.id}--kg-simulator--editor--right--panel--top`;
+        const PANEL__RIGHT_BOTTOM__TELEPORT_ID = `${props.id}--kg-simulator--editor--right--panel--bottom`;
+
+        provide(KG.DI.ID, props.id);
+
+        provide(KG.DI.KG_SIMULATOR.TOOLBAR__LEFT_TOP__TELEPORT_ID, TOOLBAR__LEFT_TOP__TELEPORT_ID);
+        provide(KG.DI.KG_SIMULATOR.TOOLBAR__LEFT_BOTTOM__TELEPORT_ID, TOOLBAR__LEFT_BOTTOM__TELEPORT_ID);
+        provide(KG.DI.KG_SIMULATOR.TOOLBAR__RIGHT_TOP__TELEPORT_ID, TOOLBAR__RIGHT_TOP__TELEPORT_ID);
+        provide(KG.DI.KG_SIMULATOR.TOOLBAR__RIGHT_BOTTOM__TELEPORT_ID, TOOLBAR__RIGHT_BOTTOM__TELEPORT_ID);
+
+        provide(KG.DI.KG_SIMULATOR.PANEL__LEFT_TOP__TELEPORT_ID, PANEL__LEFT_TOP__TELEPORT_ID);
+        provide(KG.DI.KG_SIMULATOR.PANEL__LEFT_BOTTOM__TELEPORT_ID, PANEL__LEFT_BOTTOM__TELEPORT_ID);
+        provide(KG.DI.KG_SIMULATOR.PANEL__RIGHT_TOP__TELEPORT_ID, PANEL__RIGHT_TOP__TELEPORT_ID);
+        provide(KG.DI.KG_SIMULATOR.PANEL__RIGHT_BOTTOM__TELEPORT_ID, PANEL__RIGHT_BOTTOM__TELEPORT_ID);
+
+        const kgSimulator = useKgSimulator(props.id);
+
+        //region DATA
+        // ----------------------------------------------------------------------------------------------------
+
+        // ----------------------------------------------------------------------------------------------------
+        //endregion
+
+        //region WATCH
+        // ----------------------------------------------------------------------------------------------------
+        // ----------------------------------------------------------------------------------------------------
+        //endregion
+
+        //region FUNCTION
+        // ----------------------------------------------------------------------------------------------------
+        /**
+         * 自动重新打开上次场景.
+         */
+        async function reopenScene() {
+            switch (true) {
+                case kgSimulator.$Mode$IsEdit: {
+                    if (kgSimulator.$Config$IsReopenSceneOnStart) {
+                        let storeScene = storejs.get(STORE_KEY.CIRCULAR_CONVEYOR__EDIT__CURRENT_SCENE);
+
+                        // 环形输送线
+                        if (storeScene) {
+                            try {
+                                KgUtil.showLoading();
+                                const scene = await httpClient().request({ data: new GetSceneRequest({ sceneId: storeScene.id }), method: 'POST', url: '/Scene/GetScene' });
+                                kgSimulator.openScene(scene);
+                            } finally {
+                                KgUtil.hideLoading();
+                            }
+                        }
+                        // 环形穿梭车
+                        else {
+                            storeScene = storejs.get(STORE_KEY.CIRCULAR_SHUTTLE__EDIT__CURRENT_SCENE);
+                        }
+                    }
+                    break;
+                }
+
+                case kgSimulator.$Mode$IsMonitor: {
+                    break;
+                }
+
+                case kgSimulator.$Mode$IsSimulate: {
+                    if (kgSimulator.$Config$IsReopenSceneOnStart) {
+                        let storeScene = storejs.get(STORE_KEY.CIRCULAR_CONVEYOR__SIMULATE__CURRENT_SCENE);
+
+                        // 环形输送线
+                        if (storeScene) {
+                            try {
+                                KgUtil.showLoading();
+                                const scene = await httpClient().request({ data: new GetSceneRequest({ sceneId: storeScene.id }), method: 'POST', url: '/Scene/GetScene' });
+                                kgSimulator.openScene(scene);
+                            } finally {
+                                KgUtil.hideLoading();
+                            }
+                        }
+                        // 环形穿梭车
+                        else {
+                            storeScene = storejs.get(STORE_KEY.CIRCULAR_SHUTTLE__SIMULATE__CURRENT_SCENE);
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+        // ----------------------------------------------------------------------------------------------------
+        //endregion
+
+        //region LIFECYCLE
+        //----------------------------------------------------------------------------------------------------
+        onMounted(async () => {
+            if (kgSimulator.$Mode$IsMonitor || kgSimulator.$Mode$IsSimulate) {
+                kgSimulator.$WebSocket$connect({ url: kgSimulator.$Config$CircularConveyor$Api$WebSocket });
+            }
+
+            await reopenScene();
+        });
+
+        onBeforeUnmount(() => {
+            switch (true) {
+                case kgSimulator.$Mode$IsEdit: {
+                    break;
+                }
+
+                case kgSimulator.$Mode$IsMonitor: {
+                    break;
+                }
+
+                case kgSimulator.$Mode$IsSimulate: {
+                    kgSimulator.set$Mode$Simulate$IsRunning(false);
+                    break;
+                }
+            }
+        });
+        //----------------------------------------------------------------------------------------------------
+        //endregion
+
+        return () => (
+            <ElConfigProvider locale={zhCN}>
+                <div class="kg-simulator">
+                    <KgSimulatorMenu />
+
+                    <div class="kg-simulator--editor">
+                        <div class="kg-simulator--editor--left">
+                            <div class="kg-simulator--editor--left--toolbar">
+                                <div
+                                    class="kg-simulator--editor--left--toolbar--top"
+                                    id={TOOLBAR__LEFT_TOP__TELEPORT_ID}
+                                />
+                                <div
+                                    class="kg-simulator--editor--left--toolbar--bottom"
+                                    id={TOOLBAR__LEFT_BOTTOM__TELEPORT_ID}
+                                />
+                            </div>
+                            <div class="kg-simulator--editor--left--panel">
+                                <div
+                                    class="kg-simulator--editor--left--panel--top"
+                                    id={PANEL__LEFT_TOP__TELEPORT_ID}
+                                />
+                                <div
+                                    class="kg-simulator--editor--left--panel--bottom"
+                                    id={PANEL__LEFT_BOTTOM__TELEPORT_ID}
+                                />
+                            </div>
+                        </div>
+
+                        <div class="kg-simulator--editor--center">
+                            <KgSimulatorCanvasTitle />
+                            <KgSimulatorCanvas />
+                        </div>
+
+                        <div class="kg-simulator--editor--right">
+                            <div class="kg-simulator--editor--right--panel">
+                                <div
+                                    class="kg-simulator--editor--right--panel--top"
+                                    id={PANEL__RIGHT_TOP__TELEPORT_ID}
+                                />
+                                <div
+                                    class="kg-simulator--editor--right--panel--bottom"
+                                    id={PANEL__RIGHT_BOTTOM__TELEPORT_ID}
+                                />
+                            </div>
+
+                            <div class="kg-simulator--editor--right--toolbar">
+                                <div
+                                    class="kg-simulator--editor--right--toolbar--top"
+                                    id={TOOLBAR__RIGHT_TOP__TELEPORT_ID}
+                                />
+                                <div
+                                    class="kg-simulator--editor--right--toolbar--bottom"
+                                    id={TOOLBAR__RIGHT_BOTTOM__TELEPORT_ID}
+                                />
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="kg-simulator--status"></div>
+
+                    <KgSimulatorToolbarButtonPrefab></KgSimulatorToolbarButtonPrefab>
+                    <KgSimulatorPanelPrefab></KgSimulatorPanelPrefab>
+                    <KgSimulatorToolbarButtonProperty></KgSimulatorToolbarButtonProperty>
+                    <KgSimulatorPanelProperty></KgSimulatorPanelProperty>
+                    <KgSimulatorToolbarButtonScene></KgSimulatorToolbarButtonScene>
+                    <KgSimulatorPanelScene></KgSimulatorPanelScene>
+                </div>
+            </ElConfigProvider>
+        );
+    },
+});

package/component/KgSimulator/KgSimulator.utils.ts

@@ -0,0 +1,30 @@
+import { Q } from '@thymine/xunee';
+import { isNil } from 'lodash-es';
+
+/**
+ * 判断是不是同一个点, 考虑一定误差.
+ */
+export function isSamePoint(x1: number | null | undefined, x2: number | null | undefined) {
+    if (isNil(x1) || isNil(x2)) {
+        return false;
+    }
+
+    return Math.abs(x1 - x2) < 10;
+}
+
+/**
+ * 获取时间戳.
+ */
+export function timestamp(): string {
+    return new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString().replaceAll('Z', '').replaceAll('-', '').replaceAll(':', '').replaceAll('T', '').replaceAll('.', '');
+}
+
+/**
+ * 获取节点下的界面元素.
+ *
+ * @param param.code 编号.
+ * @param param.node 节点.
+ */
+export function getNodeUiByCode<T extends Q.BaseUI>(param: { code: string; node: Q.Node }): { ui: T } {
+    return (param.node?.bindingUIs?.toDatas?.()?.find((i) => i.ui.code === param.code) ?? { ui: {} as Q.BaseUI }) as { ui: T };
+}

package/component/KgSimulator/index.ts

@@ -0,0 +1,4 @@
+export { KgSimulator } from './KgSimulator';
+
+export * from './KgSimulator.hooks';
+export * from './KgSimulator.store';

package/component/KgSubmit/KgSubmit.event.ts

@@ -0,0 +1,272 @@
+import { IKgEventListener, kgEmit } from '@kengic/core.core';
+import { Ref } from 'vue';
+import { IRequestConfig } from '../../service';
+import { KgAny } from '../../type';
+import { IKgTableRow } from '../KgTable';
+
+/**
+ * 事件类型.
+ */
+export type IKgSubmitEvent =
+    // 打开提交弹窗之前,
+    | 'onBeforeOpen'
+
+    // 打开提交弹窗,
+    | 'onOpen'
+
+    // 点击确认按钮之后, 执行默认逻辑之前,
+    | 'onBeforeOk'
+
+    // 点击确认按钮之后, 表单验证完成,
+    | 'onAfterValidate'
+
+    // 发起接口请求之前. 表单验证完成, 参数解析完成,
+    | 'onBeforeRequest'
+
+    // 请求成功, 关闭提交弹窗之后,
+    | 'onOk'
+
+    // 点击取消按钮, 或者点击右上角的关闭按钮, 尚未关闭弹窗,
+    | 'onBeforeCancel'
+
+    // 点击取消按钮, 或者点击右上角的关闭按钮, 已经关闭弹窗,
+    | 'onCancel'
+
+    // 请求失败. 请求失败了, 或者请求返回了错误消息,
+    | 'onError'
+
+    // 关闭提交弹窗,
+    | 'onClose'
+
+    // 手动点击确认按钮,
+    | 'onOkButtonClick'
+
+    // 手动点击取消按钮,
+    | 'onCancelButtonClick'
+
+    // 表单对象设置完成,
+    | 'onAfterSetFormModel';
+
+//region 事件 onBeforeOpen
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onBeforeOpen = {
+    isCreating: boolean | null;
+    isUpdating: boolean | null;
+    isCopying: boolean | null;
+    isDeleting: boolean | null;
+    row: IKgTableRow | null;
+};
+export type IKgSubmit$EventListener$onBeforeOpen = ((param: IKgSubmit$EventListenerParameter$onBeforeOpen) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onOpen
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onOpen = {
+    /** @deprecated 请直接使用 {@link IUseKgVar.isCopying} */
+    isCopying: boolean | null;
+    /** @deprecated 请直接使用 {@link IUseKgVar.isCreating} */
+    isCreating: boolean | null;
+    /** @deprecated 请直接使用 {@link IUseKgVar.isDeleting} */
+    isDeleting: boolean | null;
+    /** @deprecated 请直接使用 {@link IUseKgVar.isUpdating} */
+    isUpdating: boolean | null;
+    /** @deprecated 请直接使用 {@link IUseKgSubmit.formModel} */
+    model: Ref<Record<string, any>>;
+    /** @deprecated 请直接使用 {@link IUseKgTable.selectedRow} */
+    row: IKgTableRow | null;
+};
+export type IKgSubmit$EventListener$onOpen = ((param: IKgSubmit$EventListenerParameter$onOpen) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onBeforeOk
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onBeforeOk = {
+    /** @deprecated 已弃用, 请使用 {@link IUseKgSubmit.formModel} */
+    model: Ref<Record<string, any>>;
+};
+export type IKgSubmit$EventListener$onBeforeOk = ((param: IKgSubmit$EventListenerParameter$onBeforeOk) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onAfterValidate
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onAfterValidate = {
+    isCopying: boolean | null;
+    isCreating: boolean | null;
+    isDeleting: boolean | null;
+    isUpdating: boolean | null;
+    model: Ref<Record<string, any>>;
+    row: IKgTableRow | null;
+    rows: Array<IKgTableRow> | null;
+};
+export type IKgSubmit$EventListener$onAfterValidate = ((param: IKgSubmit$EventListenerParameter$onAfterValidate) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onBeforeRequest
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onBeforeRequest = {
+    /**
+     * <p>请求参数. 是一个对象或者列表. 是对「表单数据对象」解析之后得到的请求参数, 如果需要修改某些参数, 则直接修改该对象的属性即可.</p>
+     */
+    data: Ref<KgAny>;
+
+    /** @deprecated */
+    isCopying: boolean | null;
+    /** @deprecated */
+    isCreating: boolean | null;
+    /** @deprecated */
+    isDeleting: boolean | null;
+    /** @deprecated */
+    isUpdating: boolean | null;
+    /** @deprecated */
+    model: Ref<Record<string, any>>;
+
+    /**
+     * 请求参数.
+     */
+    params: Ref<Record<string, any>>;
+
+    requestConfig: IRequestConfig;
+
+    /** @deprecated */
+    row: IKgTableRow | null;
+    /** @deprecated */
+    rows: Array<IKgTableRow> | null;
+};
+export type IKgSubmit$EventListener$onBeforeRequest = ((param: IKgSubmit$EventListenerParameter$onBeforeRequest) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onOk
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onOk = {
+    /** @deprecated */
+    isCopying: boolean | null;
+    /** @deprecated */
+    isCreating: boolean | null;
+    /** @deprecated */
+    isDeleting: boolean | null;
+    /** @deprecated */
+    isUpdating: boolean | null;
+    /** @deprecated */
+    model: Ref<Record<string, any>>;
+
+    /**
+     * 接口返回结果.
+     */
+    result: any | null;
+
+    /** @deprecated */
+    row: IKgTableRow | null;
+};
+export type IKgSubmit$EventListener$onOk = ((param: IKgSubmit$EventListenerParameter$onOk) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onBeforeCancel
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onBeforeCancel = {};
+export type IKgSubmit$EventListener$onBeforeCancel = ((param: IKgSubmit$EventListenerParameter$onBeforeCancel) => Promise<boolean>) & IKgEventListener;
+//----------------------------------------------------------------------------------------------------
+//endregion
+
+//region 事件 onCancel
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onCancel = {};
+export type IKgSubmit$EventListener$onCancel = ((param: IKgSubmit$EventListenerParameter$onCancel) => Promise<boolean>) & IKgEventListener;
+//----------------------------------------------------------------------------------------------------
+//endregion
+
+//region 事件 onError
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onError = {};
+export type IKgSubmit$EventListener$onError = ((param: IKgSubmit$EventListenerParameter$onError) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onClose
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onClose = {} | null | undefined;
+export type IKgSubmit$EventListener$onClose = ((param: IKgSubmit$EventListenerParameter$onClose) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onOkButtonClick
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onSubmitSave = {};
+export type IKgSubmit$EventListener$onSubmitSave = ((param: IKgSubmit$EventListenerParameter$onSubmitSave) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onCancelButtonClick
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onSubmitCancel = {};
+export type IKgSubmit$EventListener$onSubmitCancel = ((param: IKgSubmit$EventListenerParameter$onSubmitCancel) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+//region 事件 onAfterSetFormModel
+//----------------------------------------------------------------------------------------------------
+export type IKgSubmit$EventListenerParameter$onAfterSetFormModel = {};
+export type IKgSubmit$EventListener$onAfterSetFormModel = ((param: IKgSubmit$EventListenerParameter$onAfterSetFormModel) => Promise<boolean>) & IKgEventListener;
+//endregion
+
+export type IKgSubmit$EventListenerParameter =
+    | IKgSubmit$EventListenerParameter$onBeforeOpen
+    | IKgSubmit$EventListenerParameter$onOpen
+    | IKgSubmit$EventListenerParameter$onBeforeOk
+    | IKgSubmit$EventListenerParameter$onAfterValidate
+    | IKgSubmit$EventListenerParameter$onBeforeRequest
+    | IKgSubmit$EventListenerParameter$onOk
+    | IKgSubmit$EventListenerParameter$onBeforeCancel
+    | IKgSubmit$EventListenerParameter$onCancel
+    | IKgSubmit$EventListenerParameter$onError
+    | IKgSubmit$EventListenerParameter$onClose
+    | IKgSubmit$EventListenerParameter$onSubmitSave
+    | IKgSubmit$EventListenerParameter$onSubmitCancel
+    | IKgSubmit$EventListenerParameter$onAfterSetFormModel;
+
+export type IKgSubmit$EventListener =
+    | IKgSubmit$EventListener$onBeforeOpen
+    | IKgSubmit$EventListener$onOpen
+    | IKgSubmit$EventListener$onBeforeOk
+    | IKgSubmit$EventListener$onAfterValidate
+    | IKgSubmit$EventListener$onBeforeRequest
+    | IKgSubmit$EventListener$onOk
+    | IKgSubmit$EventListener$onBeforeCancel
+    | IKgSubmit$EventListener$onCancel
+    | IKgSubmit$EventListener$onError
+    | IKgSubmit$EventListener$onClose
+    | IKgSubmit$EventListener$onSubmitSave
+    | IKgSubmit$EventListener$onSubmitCancel
+    | IKgSubmit$EventListener$onAfterSetFormModel;
+
+export const eventListeners: Record<
+    string,
+    {
+        onAfterSetFormModel: Array<IKgSubmit$EventListener$onAfterSetFormModel>;
+        onAfterValidate: Array<IKgSubmit$EventListener$onAfterValidate>;
+        onBeforeCancel: Array<IKgSubmit$EventListener$onBeforeCancel>;
+        onBeforeOk: Array<IKgSubmit$EventListener$onBeforeOk>;
+        onBeforeOpen: Array<IKgSubmit$EventListener$onBeforeOpen>;
+        onBeforeRequest: Array<IKgSubmit$EventListener$onBeforeRequest>;
+        onCancel: Array<IKgSubmit$EventListener$onCancel>;
+        onCancelButtonClick: Array<IKgSubmit$EventListener$onSubmitCancel>;
+        onClose: Array<IKgSubmit$EventListener$onClose>;
+        onError: Array<IKgSubmit$EventListener$onError>;
+        onOk: Array<IKgSubmit$EventListener$onOk>;
+        onOkButtonClick: Array<IKgSubmit$EventListener$onSubmitSave>;
+        onOpen: Array<IKgSubmit$EventListener$onOpen>;
+    }
+> = {};
+
+/**
+ * 触发事件.
+ *
+ * @param param.event 事件名称.
+ * @param param.id 唯一标识.
+ * @param param.parameter 事件参数.
+ */
+export function emit<P extends IKgSubmit$EventListenerParameter>(param: { event: IKgSubmitEvent; id?: string | undefined; parameter: P }): Promise<boolean> {
+    const { event, id = '', parameter } = param ?? {};
+
+    return kgEmit<IKgSubmitEvent, P, IKgSubmit$EventListener>({
+        event: event,
+        eventListeners: eventListeners,
+        id: id,
+        parameter: parameter,
+    });
+}