Commit 0d962aab6ec68dd9d1db7dd7bee30a61c2e7bfc5

Authored by xp.Huang
2 parents b9f9cd58 e04547e9

Merge branch 'feat/button-components-add-image' into 'main_dev'

perf: 模版模式放开预览选项

See merge request yunteng/thingskit-scada!187
... ... @@ -5117,10 +5117,10 @@ App.prototype.addPreviewButton = function () {
5117 5117 this.previewButton.parentNode.removeChild(this.previewButton)
5118 5118 }
5119 5119
5120   - if (this.isTemplateConfiguration) {
5121   - this.previewButton = null
5122   - return
5123   - }
  5120 + // if (this.isTemplateConfiguration) {
  5121 + // this.previewButton = null
  5122 + // return
  5123 + // }
5124 5124
5125 5125 this.previewButton = document.createElement('button')
5126 5126 this.previewButton.className = 'geBtn geShareBtn'
... ...
... ... @@ -237,7 +237,7 @@ a.geStatus .geStatusMessage {
237 237 -moz-box-shadow: 2px 2px 3px 0px #ddd;
238 238 box-shadow: 2px 2px 3px 0px #ddd;
239 239 }
240   -.geEditor input, .geEditor button:not([class^="ant"]), .geEditor select, .geColorBtn {
  240 +.geEditor input, .geEditor button:not([class*="ant-"]), .geEditor select, .geColorBtn {
241 241 border: 1px solid #d8d8d8;
242 242 border-radius: 4px;
243 243 }
... ...
... ... @@ -9,7 +9,6 @@ import { getAppInstanceId } from '@/utils/draw'
9 9 import type { RenderComponentExposeType } from '@/core/Library/types'
10 10 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
11 11 import type { NodeDataDataSourceJsonType } from '@/api/node/model'
12   -import { ControlComponentEnum } from '@/core/Library/packages/Control'
13 12
14 13 export class MessageHandler {
15 14 constructor(public service: LightboxModeWebsocketService) {
... ... @@ -53,7 +52,6 @@ export class MessageHandler {
53 52
54 53 defaultHandler(commandSource: CommandSource, message: SubscriptionUpdateMsg) {
55 54 const { data, node } = commandSource
56   - if (this.nodeUtils.getNodeComponentKey(this.nodeUtils.getCellById(node)) === ControlComponentEnum.PARAMETER_SETTINGS) return
57 55 const { attr } = data as NodeDataDataSourceJsonType
58 56 const { latestValue } = useLatestMessageValue(message.data, attr)
59 57 if (isNull(latestValue)) return
... ...