Merge branch 'perf/main_dev' into 'main_dev'

Perf/main dev

See merge request yunteng/thingskit-scada!161

@@ -4289,6 +4289,7 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
   // TODO Thingskit 从服务器请求 load file
   async function getRemoteData() {
     const { doGetConfigurationContent } = useContentData()
+    const { getAuthInfo } = useAuth?.() || {}
 
     const platformInfo = getPlatformInfo()
     document.getElementById('first-text-animation-text').querySelector('text').innerHTML = platformInfo?.name || window.PROJECT_ENV?.shortName
@@ -4313,10 +4314,27 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
        */
 
       /**
+      * @typedef PermissionInfo
+      * @property {string[]} permissions
+      * @property {string} hasPreview
+      * @property {string} platform
+      * @property {ConfigurationContentListItemType[]} configurationContentList
+      */
+
+      /**
        * @type {ConfigurationContentType}
        */
       const result = await doGetConfigurationContent()
       const { configurationContentList, configurationId, configurationName, platform, isTemplate } = result
+
+
+      /**
+       * @type {PermissionInfo}
+       */
+      const permissionInfo = await getAuthInfo?.() || {}
+
+      this.permissionInfo = permissionInfo
+
       const firstContent = configurationContentList?.[0]
       this.configurationContentId = firstContent?.id
       this.isTemplateConfiguration = !!isTemplate
@@ -5137,6 +5155,9 @@ App.prototype.addPreviewButton = function () {
       switchLightboxMode?.()
     }))
 
+    if (this.permissionInfo && !this.permissionInfo.hasPreviewAuth) this.previewButton.style.display = 'none'
+
+
     this.buttonContainer.appendChild(this.previewButton)
   }
 }
@@ -5375,6 +5396,8 @@ App.prototype.addSaveButton = function () {
         .funct();
     }))
 
+    if (this.permissionInfo && !this.permissionInfo.hasDesignAuth) this.saveButton.style.display = 'none'
+
     this.buttonContainer.appendChild(this.saveButton)
   }
 }

@@ -343,7 +343,7 @@ Format.prototype.immediateRefresh = function () {
 		var cells = ss.cells || []
 		var currentCell = cells[0]
 		var { COMPONENT_KEY } = window.CellAttributeKeyEnum
-		var hasDataSourceBindPanel = !!(cells.length === 1 && currentCell && currentCell.getValue() && currentCell.getAttribute(COMPONENT_KEY))
+		var hasDataSourceBindPanel = !!(cells.length === 1 && currentCell && currentCell.getValue() && currentCell.getAttribute(COMPONENT_KEY)) && this.editorUi?.permissionInfo?.hasDesignAuth !== false
 
 		label.style.backgroundColor = Format.inactiveTabBackgroundColor;
 		label.style.borderLeftWidth = '1px';

@@ -9,6 +9,7 @@ enum Api {
   REFRESH_TOKEN = '/auth/token',
   GET_DICT = '/dict_item/find',
   UPLOAD_FILE = '/oss/upload',
+  GET_PERMISSIONS = '/role/me/permissions',
 }
 export const getPlatformInfo = () => {
   return defHttp.get<PlatformInfo>({
@@ -44,3 +45,9 @@ export function doUploadFile(file: FormData) {
     },
   })
 }
+
+export function getCurrentRolePermission() {
+  return defHttp.get<string[]>({
+    url: Api.GET_PERMISSIONS,
+  })
+}

@@ -4,6 +4,9 @@ import { useParseParams } from '@/core/LoadData'
 import type { MxCell } from '@/fitCore/types'
 import type { BasicNodeBindType, NodeDataActJsonType, NodeDataDataSourceJsonType, NodeDataEventJsonType, NodeDataType, SaveNodeDataParamsType } from '@/api/node/model'
 import { CellAttributeKeyEnum } from '@/enums/cellAttributeEnum'
+import { useContentDataStoreWithOut } from '@/store/modules/contentData'
+import { useMessage } from '@/hooks/web/useMessage'
+import { MessageEnum } from '@/enums/messageEnum'
 
 interface UseNodeDataParamsType {
   cell: MxCell
@@ -29,8 +32,11 @@ function removeCellSourceAttribute(cell: MxCell) {
 }
 
 export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
+  const { createMessage } = useMessage()
+
   const nodeData = ref<NodeDataType>()
 
+  const contentDataStore = useContentDataStoreWithOut()
   // const contentId = window.DrawApp.configurationContentId!
   const { configurationId } = useParseParams()
 
@@ -65,6 +71,11 @@ export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
   }
 
   const saveNodeAllData = async (data: Partial<SaveNodeDataParamsType>) => {
+    if (!contentDataStore.hasDesignAuth) {
+      createMessage.error(MessageEnum.NO_AUTH)
+      throw new Error(MessageEnum.NO_AUTH)
+    }
+
     const result = await doSaveNodeAllData(Object.assign(data, basicNodeBindData(ActionType.SAVE)))
     removeCellSourceAttribute(cell)
     nodeData.value = result || getDefaultNodeData()
@@ -72,6 +83,11 @@ export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
   }
 
   const saveNodeDataSourceData = async (data: NodeDataDataSourceJsonType) => {
+    if (!contentDataStore.hasDesignAuth) {
+      createMessage.error(MessageEnum.NO_AUTH)
+      throw new Error(MessageEnum.NO_AUTH)
+    }
+
     const result = await doSaveNodeDataSource({ ...basicNodeBindData(ActionType.SAVE), data })
     removeCellSourceAttribute(cell)
     if (unref(nodeData)?.dataSourceJson)
@@ -81,12 +97,22 @@ export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
   }
 
   const saveNodeEventData = async (data: NodeDataEventJsonType) => {
+    if (!contentDataStore.hasDesignAuth) {
+      createMessage.error(MessageEnum.NO_AUTH)
+      throw new Error(MessageEnum.NO_AUTH)
+    }
+
     const result = await doSaveNodeEvent({ ...basicNodeBindData(ActionType.SAVE), data })
     removeCellSourceAttribute(cell)
     return result
   }
 
   const saveNodeActData = async (data: NodeDataActJsonType) => {
+    if (!contentDataStore.hasDesignAuth) {
+      createMessage.error(MessageEnum.NO_AUTH)
+      throw new Error(MessageEnum.NO_AUTH)
+    }
+
     const result = await doSaveNodeAct({ ...basicNodeBindData(ActionType.SAVE), data })
     removeCellSourceAttribute(cell)
     return result

@@ -49,8 +49,8 @@ const [register, { getFieldsValue, validate, setFieldsValue }] = useForm({
         return {
           api: getVideoList,
           params: formModel[ContentDataFieldsEnum.ORG_ID],
-          valueField: 'id',
-          labelField: 'name',
+
+          fieldNames: { label: 'name', value: 'id' },
           resultField: 'items',
           onSelect(value: string, option: any) {
             formModel[ContentDataFieldsEnum.ACCESS_MODE] = value && option ? option.accessMode : null

@@ -2,3 +2,4 @@ export { usePlatform, getPlatformInfo, setPlatformInfo } from './module/usePlatf
 export { useContentData } from './module/useContentData'
 export { useParseParams } from './module/useParseParams'
 export { useLightboxModeService } from './module/useLightboxModeService'
+export { useAuth } from './module/useAuth'

+import { getCurrentRolePermission } from '@/api/sys'
+import { useContentDataStoreWithOut } from '@/store/modules/contentData'
+import { isShareMode } from '@/utils/env'
+
+export function useAuth() {
+  const contentDataStore = useContentDataStoreWithOut()
+  const getAuthInfo = async () => {
+    const result = { permissions: [] as string[], hasPreview: true, hasDesign: true }
+    if (isShareMode()) return result
+
+    const permissions = await getCurrentRolePermission()
+    result.permissions = permissions
+    const ret = contentDataStore.setPermissions(permissions)
+    return {
+      permissions,
+      ...ret,
+    }
+  }
+
+  return {
+    getAuthInfo,
+  }
+}
+
+window.useAuth = useAuth

@@ -6,11 +6,14 @@ import { ShareLoginModal } from '@/core/Share'
 import { PageModeEnum } from '@/enums/modeEnum'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { useUserStoreWithOut } from '@/store/modules/user'
+import { useMessage } from '@/hooks/web/useMessage'
+import { MessageEnum } from '@/enums/messageEnum'
 
 export function useContentData() {
   const contentDataStore = useContentDataStoreWithOut()
   const { mode, publicId, configurationId } = useParseParams()
   const userStore = useUserStoreWithOut()
+  const { createMessage } = useMessage()
 
   const shareModeBootstrap = async () => {
     if (!publicId) return
@@ -46,6 +49,10 @@ export function useContentData() {
   }
 
   const doSaveConfigurationContent = async (params: ConfigurationContentType) => {
+    if (!contentDataStore.hasDesignAuth) {
+      createMessage.error(MessageEnum.NO_AUTH)
+      return
+    }
     return saveData(params)
   }
 

+export enum ConfigurationAuthEnum {
+  DESIGN = 'api:yt:configuration:center:get_configuration_info:design',
+  PREVIEW = 'api:yt:configuration:center:get_configuration_info:preview',
+}
+
+export enum ConfigurationTemplateAuthEnum {
+  DESIGN = 'api:yt:configuration:template:center:get_configuration_info:design',
+  PREVIEW = 'api:yt:configuration:template:center:get_configuration_info:preview',
+}

+export enum MessageEnum {
+  NO_AUTH = '没有权限!',
+}

@@ -4,6 +4,8 @@ import { store } from '..'
 import type { NodeDataType } from '@/api/node/model'
 import type { ProductAndDevice } from '@/api/content/model'
 import type { CreateComponentType } from '@/core/Library/types'
+import { isShareMode } from '@/utils/env'
+import { ConfigurationAuthEnum, ConfigurationTemplateAuthEnum } from '@/enums/authEnum'
 
 interface DeviceList {
   deviceId: string
@@ -19,6 +21,8 @@ interface ContentDataStoreType {
   configurationContentList?: any
   configurationContentId: Nullable<string>
   diveceDetailMap: Record<string, DeviceList>
+  hasDesignAuth?: boolean
+  hasPerviewAuth?: boolean
 }
 
 export const useContentDataStore = defineStore('app-content-data', {
@@ -30,6 +34,8 @@ export const useContentDataStore = defineStore('app-content-data', {
     configurationContentList: [],
     configurationContentId: null,
     diveceDetailMap: {},
+    hasDesignAuth: true,
+    hasPerviewAuth: true,
   }),
   actions: {
 
@@ -74,6 +80,16 @@ export const useContentDataStore = defineStore('app-content-data', {
       if (!id) return null
       return this.contentData.find(item => item.id === id) || null
     },
+
+    setPermissions(string: string[]) {
+      if (isShareMode()) return
+      this.hasDesignAuth = string.includes((this.isTemplate ? ConfigurationTemplateAuthEnum : ConfigurationAuthEnum).DESIGN)
+      this.hasPerviewAuth = string.includes((this.isTemplate ? ConfigurationTemplateAuthEnum : ConfigurationAuthEnum).PREVIEW)
+      return {
+        hasDesignAuth: toRaw(this.hasDesignAuth),
+        hasPreviewAuth: toRaw(this.hasPerviewAuth),
+      }
+    },
   },
 
   getters: {

@@ -60,6 +60,8 @@ declare global {
     usePlatform: Fn
 
     useLightboxModeService: Fn
+
+    useAuth: Fn
   }
 }