Merge branch 'perf/configuration-id' into 'main_dev'

perf：优化组态节点保存 See merge request yunteng/thingskit-scada!257

Merge branch 'perf/configuration-id' into 'main_dev'
perf：优化组态节点保存 See merge request yunteng/thingskit-scada!257
xp.Huang
2 parents c930584c 5ff9b87d
Showing 11 changed files with 87 additions and 52 deletions
public/webapp/js/diagramly/App.js
public/webapp/js/diagramly/LocalFile.js
src/api/node/index.ts
src/api/node/model/index.ts
src/components/Modal/src/components/ModalFooter.vue
src/components/Modal/src/props.ts
src/core/Library/components/PublicForm/components/DataEvents/MouseDownOrUpSetting/config.ts
src/core/Library/components/PublicForm/components/DataEvents/MouseDownOrUpSetting/index.vue
src/core/Library/components/PublicForm/components/DataEvents/config.ts
src/core/Library/hook/useNodeData.ts
src/core/LoadData/module/useAuth.ts
--- a/public/webapp/js/diagramly/App.js
View file @3ec5a6d
+++ b/public/webapp/js/diagramly/App.js
View file @3ec5a6d
@@ -5672,16 +5672,36 @@ App.prototype.save = function (name, done) {
             // const data = `${Graph.xmlDeclaration}\n${this.getFileData(true, null, null, null, true, true, null, null, null, false)}`;
             // this.currentFile.setData(data)
-            const allCells = this.editor.graph.getModel().cells || {}
+            const graph = this.editor.graph
+            const model = graph.model
+            const pages = this.pages
+
+            const currentPageContentId = this.ui.currentPage.getId()
+            let originalPage
+            const contentPageInfos = pages.map(page => {
+              this.ui.selectPage(page)
+              const cells = model.getChildCells(graph.getDefaultParent())
+              const nodeIds = cells.map(cell => cell.getId())
+              const contentId = this.ui.currentPage.getId()
+
+              if (contentId === currentPageContentId)
+                originalPage = page
+
+              return {
+                nodeIds,
+                contentId
+              }
+            })
+            originalPage && this.ui.selectPage(originalPage)
+
             await doSaveConfigurationContent({
               configurationContentList: [
                 {
                   id: currentFile.getHash(),
                   content: this.currentFile.getData(),
-                  contentId: this.currentPage.getId(),
                   type: 1,
-                  nodeIds: Object.keys(allCells),
-                  name: this.currentPage.getName()
+                  name: this.currentPage.getName(),
+                  contentPageInfos
                 }
               ],
               configurationName: currentFile.title,
--- a/public/webapp/js/diagramly/LocalFile.js
View file @3ec5a6d
+++ b/public/webapp/js/diagramly/LocalFile.js
View file @3ec5a6d
@@ -167,26 +167,36 @@ LocalFile.prototype.saveFile = function (title, revision, success, error, useCur
 		const handleSaveContent = async () => {
 			const { doSaveConfigurationContent, configurationId } = useContentData()
 			try {
-				const allCells = this.ui.editor.graph.getModel().cells || {}
-				// const allCells = this.shadowPages
-				// 	.map(item => {
-				// 		console.log(item)
-				// 		return this.ui.editor.graph.createCellLookup([item.root])
-				// 	})
-				// 	.map(obj => Object.values(obj))
-				// 	.reduce((prev, next) => [...prev, ...next], [])
- 
+				const graph = this.ui.editor.graph
+				const model = graph.model
+				const pages = this.ui.pages
+
+				const currentPageContentId = this.ui.currentPage.getId()
+				let originalPage
+				const contentPageInfos = pages.map(page => {
+					this.ui.selectPage(page)
+					const cells = model.getChildCells(graph.getDefaultParent())
+					const nodeIds = cells.map(cell => cell.getId())
+					const contentId = this.ui.currentPage.getId()
+
+					if (contentId === currentPageContentId)
+						originalPage = page
+
+					return {
+						nodeIds,
+						contentId
+					}
+				})
+				originalPage && this.ui.selectPage(originalPage)
+
 				await doSaveConfigurationContent({
 					configurationContentList: [
 						{
 							id: this.ui.configurationContentId,
 							content: savedData,
-							// contentId: this.ui.configurationContentId,
-							contentId: this.ui.currentPage.getId(),
 							type: 1,
-							// nodeIds: Array.from(new Set(allCells)),
-							nodeIds: Object.keys(allCells),
-							name: this.ui.currentPage.getName()
+							name: this.ui.currentPage.getName(),
+							contentPageInfos
 						}
 					],
 					configurationName: this.ui.currentFile.title,
--- a/src/api/node/index.ts
View file @3ec5a6d
+++ b/src/api/node/index.ts
View file @3ec5a6d
@@ -25,28 +25,28 @@ export const doSaveNodeAllData = (data: SaveNodeDataParamsType) => {
 }
 export const doSaveNodeAct = (params: SaveNodeActParamsType) => {
-  const { configurationId, contentId, id, data } = params
+  const { configurationId, contentId, configurationNodeId, data } = params
   return defHttp.post({
     url: Api.SAVE_NODE_ACT,
-    params: { configurationId, contentId, id },
+    params: { configurationId, contentId, configurationNodeId },
     data,
   })
 }
 export const doSaveNodeDataSource = (params: SaveNodeDataSourceParamsType) => {
-  const { configurationId, contentId, id, data } = params
+  const { configurationId, contentId, configurationNodeId, data } = params
   return defHttp.post({
     url: Api.SAVE_NODE_DATASOURCE,
-    params: { configurationId, contentId, id },
+    params: { configurationId, contentId, configurationNodeId },
     data,
   })
 }
 export const doSaveNodeEvent = (params: SaveNodeEventParamsType) => {
-  const { configurationId, contentId, id, data } = params
+  const { configurationId, contentId, configurationNodeId, data } = params
   return defHttp.post({
     url: Api.SAVE_NODE_EVENT,
-    params: { configurationId, contentId, id },
+    params: { configurationId, contentId, configurationNodeId },
     data,
   })
 }
--- a/src/api/node/model/index.ts
View file @3ec5a6d
+++ b/src/api/node/model/index.ts
View file @3ec5a6d
@@ -11,9 +11,10 @@ export enum DeleteNodeDataTypeEnum {
 }
 export interface BasicNodeBindType {
-  id: string
   contentId: string
+  configurationNodeId: string
   configurationId: string
+  id?: string
 }
 export interface SaveNodeDataParamsType extends BasicNodeBindType {
@@ -45,6 +46,7 @@ export interface NodeDataBasicType {
   enabled: boolean
   tenantId: string
   configurationId: string
+  configurationNodeId: string
   contentId: string
 }
--- a/src/components/Modal/src/components/ModalFooter.vue
View file @3ec5a6d
+++ b/src/components/Modal/src/components/ModalFooter.vue
View file @3ec5a6d
 <script lang="ts" setup>
 import { Button } from 'ant-design-vue'
 import { basicProps } from '../props'
+import { useTranslation } from '@/hooks/useTranslation'
 defineProps(basicProps)
 const emit = defineEmits(['ok', 'cancel'])
+
+const { t } = useTranslation()
 function handleOk(e: Event) {
   emit('ok', e)
 }
@@ -16,17 +19,11 @@ function handleCancel(e: Event) {
   <div>
     <slot name="insertFooter" />
     <Button v-if="showCancelBtn" v-bind="cancelButtonProps" @click="handleCancel">
-      {{ cancelText }}
+      {{ cancelText || t('cancel') }}
     </Button>
     <slot name="centerFooter" />
-    <Button
-      v-if="showOkBtn"
-      :type="okType"
-      :loading="confirmLoading"
-      v-bind="okButtonProps"
-      @click="handleOk"
-    >
-      {{ okText }}
+    <Button v-if="showOkBtn" :type="okType" :loading="confirmLoading" v-bind="okButtonProps" @click="handleOk">
+      {{ okText || t('ok') }}
     </Button>
     <slot name="appendFooter" />
   </div>
--- a/src/components/Modal/src/props.ts
View file @3ec5a6d
+++ b/src/components/Modal/src/props.ts
View file @3ec5a6d
@@ -3,9 +3,7 @@ import type { ButtonProps } from 'ant-design-vue/es/button/buttonTypes'
 import type { ButtonType } from 'ant-design-vue/lib/button'
 import type { VueNode } from 'ant-design-vue/es/_util/type'
 import type { ModalWrapperProps } from './typing'
-import { useTranslation } from '@/hooks/useTranslation'
-const { t } = useTranslation()
 export const modalProps = {
   open: { type: Boolean },
   scrollTop: { type: Boolean, default: true },
@@ -14,8 +12,8 @@ export const modalProps = {
   // open drag
   draggable: { type: Boolean, default: true },
   centered: { type: Boolean },
-  cancelText: { type: String, default: t('cancel') },
-  okText: { type: String, default: t('ok') },
+  cancelText: { type: String },
+  okText: { type: String },
   closeFunc: Function as PropType<() => Promise<boolean>>,
 }
--- a/src/core/Library/components/PublicForm/components/DataEvents/MouseDownOrUpSetting/config.ts
View file @3ec5a6d
+++ b/src/core/Library/components/PublicForm/components/DataEvents/MouseDownOrUpSetting/config.ts
View file @3ec5a6d
@@ -37,7 +37,7 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
       componentProps: {
         allowClear: false,
         options: [
-          { label: EventTypeNameEnum[event], value: EventTypeEnum[event] },
+          { label: t(EventTypeNameEnum[event]), value: EventTypeEnum[event] },
         ],
       },
     },
--- a/src/core/Library/components/PublicForm/components/DataEvents/MouseDownOrUpSetting/index.vue
View file @3ec5a6d
+++ b/src/core/Library/components/PublicForm/components/DataEvents/MouseDownOrUpSetting/index.vue
View file @3ec5a6d
@@ -177,8 +177,8 @@ defineExpose<ComponentExposeType>({
               :validate-status="getValidateStatus(record[TableColumnFieldEnum.DEVICE_PROFILE_ID])"
             >
               <Select
-                v-model:value="record[TableColumnFieldEnum.DEVICE_PROFILE_ID]" :options="productList" :field-names="{ label: 'name', value: 'profileId' }" placeholder="请选择产品"
-                class="w-full"
+                v-model:value="record[TableColumnFieldEnum.DEVICE_PROFILE_ID]" :options="productList"
+                :field-names="{ label: 'name', value: 'profileId' }" placeholder="请选择产品" class="w-full"
                 @change="(value, option) => handleSelectProduct(value, option, record as TableRecordItemType)"
               />
             </FormItem>
@@ -189,8 +189,8 @@ defineExpose<ComponentExposeType>({
               :validate-status="getValidateStatus(record[TableColumnFieldEnum.DEVICE_ID])"
             >
               <Select
-                v-model:value="record[TableColumnFieldEnum.DEVICE_ID]" :options="deviceList" :placeholder="t('chooseDevice')"
-                class="w-full"
+                v-model:value="record[TableColumnFieldEnum.DEVICE_ID]" :options="deviceList"
+                :placeholder="t('chooseDevice')" class="w-full"
                 @change="(value, option) => handleSelectDevice(value, option, record as TableRecordItemType)"
               />
             </FormItem>
@@ -198,8 +198,8 @@ defineExpose<ComponentExposeType>({
           <template v-if="column.key === TableColumnFieldEnum.WAY">
             <RadioGroup
               v-model:value="record[TableColumnFieldEnum.WAY]" :options="[
-                { label: CommandWayNameEnum.ONE_WAY, value: CommandWayEnum.ONE_WAY },
-                { label: CommandWayNameEnum.TWO_WAY, value: CommandWayEnum.TWO_WAY },
+                { label: t(CommandWayNameEnum.ONE_WAY), value: CommandWayEnum.ONE_WAY },
+                { label: t(CommandWayNameEnum.TWO_WAY), value: CommandWayEnum.TWO_WAY },
               ]"
             />
           </template>
--- a/src/core/Library/components/PublicForm/components/DataEvents/config.ts
View file @3ec5a6d
+++ b/src/core/Library/components/PublicForm/components/DataEvents/config.ts
View file @3ec5a6d
@@ -2,6 +2,7 @@ import { isBoolean } from '@wry-smile/utils-is'
 import type { BasicContentComponentProps } from '../..'
 import type { PublicFormSettingType } from '../../..'
 import { DataSourceTypeEnum, EventTypeEnum, EventTypeNameEnum } from '@/enums/datasource'
+import { useTranslation } from '@/hooks/useTranslation'
 export interface DynamicEffectItemType {
   label: string
@@ -10,29 +11,31 @@ export interface DynamicEffectItemType {
   componentProps?: BasicContentComponentProps
 }
+const { t } = useTranslation()
+
 export const getEventItem = (formSetting?: PublicFormSettingType): DynamicEffectItemType[] => {
   const list = [
     {
-      label: EventTypeNameEnum.DOWN,
+      label: t(EventTypeNameEnum.DOWN),
       key: EventTypeEnum.DOWN,
       component: () => import('./MouseDownOrUpSetting/index.vue'),
       componentProps: { event: EventTypeEnum.DOWN, type: DataSourceTypeEnum.EVENT },
     },
     {
-      label: EventTypeNameEnum.UP,
+      label: t(EventTypeNameEnum.UP),
       key: EventTypeEnum.UP,
       component: () => import('./MouseDownOrUpSetting/index.vue'),
       componentProps: { event: EventTypeEnum.UP, type: DataSourceTypeEnum.EVENT },
     },
     {
-      label: EventTypeNameEnum.SINGLE,
+      label: t(EventTypeNameEnum.SINGLE),
       key: EventTypeEnum.SINGLE,
       component: () => import('./SingleClickOrDoubleClickSetting/index.vue'),
       componentProps: { event: EventTypeEnum.SINGLE, type: DataSourceTypeEnum.EVENT },
     },
     {
-      label: EventTypeNameEnum.DOUBLE,
+      label: t(EventTypeNameEnum.DOUBLE),
       key: EventTypeEnum.DOUBLE,
       component: () => import('./SingleClickOrDoubleClickSetting/index.vue'),
       componentProps: { event: EventTypeEnum.DOUBLE, type: DataSourceTypeEnum.EVENT },
--- a/src/core/Library/hook/useNodeData.ts
View file @3ec5a6d
+++ b/src/core/Library/hook/useNodeData.ts
View file @3ec5a6d
@@ -52,11 +52,16 @@ export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
   }
   const basicNodeBindData = (type: ActionType): BasicNodeBindType => {
-    return {
-      id: type === ActionType.GET ? getSourceCellID () || getCellID () : getCellID(),
+    const res: BasicNodeBindType = {
+      configurationNodeId: type === ActionType.GET ? getSourceCellID() || getCellID() : getCellID(),
       contentId: window.DrawApp.currentPage.getId(),
       configurationId,
     }
+
+    if (unref(nodeData)?.id)
+      res.id = unref(nodeData)?.id
+
+    return res
   }
   const getCellInfo = computed(() => {
--- a/src/core/LoadData/module/useAuth.ts
View file @3ec5a6d
+++ b/src/core/LoadData/module/useAuth.ts
View file @3ec5a6d
@@ -9,7 +9,7 @@ export function useAuth() {
     const result = { permissions: [] as string[], hasPreview: true, hasDesign: true }
     if (isFromEdge())
-      return result
+      return Object.assign(result, { hasDesignAuth: true, hasPreviewAuth: true })
     if (isShareMode()) return result