perf: switch component cancel fill commond

ww
1 parent 4a851038
Showing 3 changed files with 102 additions and 21 deletions
src/main/webapp/js/diagramly/sidebar/Sidebar.js
src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Control-Components.js
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/diagramly/sidebar/Sidebar.js
View file @49ad777
+++ b/src/main/webapp/js/diagramly/sidebar/Sidebar.js
View file @49ad777
@@ -249,8 +249,23 @@
 		 */
 		DEFAULT: 'default',
+		/**
+		 * @description 开关组件 value
+		 */
+		SWITCH_VALUE: 'switchValue',
+
+		/**
+		 * @description 开关组件状态 {true | false | null}
+		 */
+		SWITCH_STATE: 'switchState'
 	}
+	Sidebar.prototype.enumComponentTypeValue = {
+		SWITCH_STATE_ENABLED: 'enabled',
+		SWITCH_STATE_CLOSE: 'close',
+		SWITCH_STATE_NONE: 'none',
+	}	
+
 	/**
 	 * @description 组件权限map
 	 * @type {Map<string, string[]>}
--- a/src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Control-Components.js
View file @49ad777
+++ b/src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Control-Components.js
View file @49ad777
@@ -4,7 +4,8 @@
 	// Control Component 控制元件
 	Sidebar.prototype.addControlComponentsPalette = function () {
 		const { COMPONENT_TYPE } = this.enumCellBasicAttribute
-		const { SWITCH, PARAMS_SETTING_BUTTON } = this.enumComponentType
+		const { SWITCH, PARAMS_SETTING_BUTTON, SWITCH_VALUE, SWITCH_STATE } = this.enumComponentType
+		const { SWITCH_STATE_NONE } = this.enumComponentTypeValue
 		const gn = 'mxgraph.control';
 		const dt = 'control';
 		const label = '控制元件'
@@ -15,14 +16,14 @@
 		const defaultStyle = ';imageAspect=0;'
 		this.setCurrentSearchEntryLibrary(dt);
-
-
 		const fns = [
 			this.addEntry(this.getTagsForStencil(gn, 'Switch', dt).join(' '), mxUtils.bind(this, function () {
 				const cell = new mxCell('', new mxGeometry(0, 0, 48, 48), `image;image=images/thingskit/switch-on.svg;${defaultStyle}`);
 				// 自定义属性
 				const cellAttribute = {
-					[COMPONENT_TYPE]: SWITCH
+					[COMPONENT_TYPE]: SWITCH,
+					[SWITCH_VALUE]: 1,
+					[SWITCH_STATE]: SWITCH_STATE_NONE
 				}
 				cell.setVertex(true)
 				this.setCellAttributes(cell, cellAttribute)
--- a/src/main/webapp/js/grapheditor/Format.js
View file @49ad777
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @49ad777
@@ -6923,9 +6923,17 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         async function submit(callback) {
             const formVal = form.val(enumActionEl.FORM_FILTER)
             const isParamsSetting = formVal[enumConst.ACTION] === enumActionType.PARAMS_SETTING
+            const { COMPONENT_TYPE } = Sidebar.prototype.enumCellBasicAttribute
+            const { SWITCH } = Sidebar.prototype.enumComponentType
+            const isSwitchComponent = vertices[0].getAttribute(COMPONENT_TYPE) === SWITCH
+
+            if (isParamsSetting && isSwitchComponent && (!currentNodeData.act || !currentNodeData.act.find(item => item.type === enumDynamicEffectType.SWITCH))) {
+                UseLayUi.topErrorMsg('请先配置数据动效中的状态设置')
+                return
+            }
+
             if (isParamsSetting) {
                 if (!isJson(formVal[enumConst.COMMAND])) {
-                    console.log()
                     UseLayUi.topErrorMsg('命令配置存在错误')
                     return
                 }
@@ -12994,6 +13002,7 @@ class DispatchCenter {
         DISPLAY: 'DISPLAY',
         FLASH: 'FLASH',
         ROTATE: 'ROTATE',
+        SWITCH: 'SWITCH',
     }
     static enumPageType = {
@@ -13396,13 +13405,18 @@ class HandleDataSource {
         const { condition = [] } = switchConfig || {}
         let reg = /image=[^;]+/g
         let flag = false
+        const { SWITCH_STATE, SWITCH_VALUE } = Sidebar.prototype.enumComponentType
+        const { SWITCH_STATE_NONE } = Sidebar.prototype.enumComponentTypeValue
         for (const item of condition) {
-            const { value, imagePath } = item || {}
+            const { value, imagePath, type } = item || {}
             if (Number(receiveValue) === Number(value)) {
                 flag = true
                 this.updatePage(() => {
                     const style = node.getStyle()
                     node.setStyle(style.replace(reg, `image=${imagePath}`))
+                    node.setAttribute('label', '')
+                    node.setAttribute(SWITCH_VALUE, receiveValue)
+                    node.setAttribute(SWITCH_STATE, type)
                 }, node)
                 break
             }
@@ -13411,6 +13425,9 @@ class HandleDataSource {
             this.updatePage(() => {
                 const style = node.getStyle()
                 node.setStyle(style.replace(reg, `image=images/thingskit/not-standard-value.svg`))
+                node.setAttribute('label', receiveValue)
+                node.setAttribute(SWITCH_VALUE, receiveValue)
+                node.setAttribute(SWITCH_STATE, SWITCH_STATE_NONE)
             }, node)
         }
     }
@@ -14010,7 +14027,12 @@ class HandleDataInteraction {
      */
     paramsSetting(nodeId, content) {
         const { layer, jquery: $, form } = layui
+        const { SWITCH_STATE, SWITCH_VALUE, SWITCH, PARAMS_SETTING_BUTTON } = Sidebar.prototype.enumComponentType
+        const { SWITCH_STATE_ENABLED, SWITCH_STATE_NONE, SWITCH_STATE_CLOSE } = Sidebar.prototype.enumComponentTypeValue
+        const { COMPONENT_TYPE } = Sidebar.prototype.enumCellBasicAttribute
         const contentData = this.contentData
+        const currentNode = this.DispatchInstance.contentAllCell.find(item => item.id === nodeId)
+
         const enumConst = {
             VALUE: 'value',
             ISSUED_WAY: 'way',
@@ -14040,20 +14062,6 @@ class HandleDataInteraction {
             </div>`
         }
-        function isJson(string) {
-            if (typeof string === 'string') {
-                try {
-                    const obj = JSON.parse(string)
-                    if (typeof obj === 'object' && obj !== null) {
-                        return true
-                    }
-                } catch (e) {
-                    return false
-                }
-            }
-            return false
-        }
-
         function jsonParse(value) {
             try {
                 return JSON.parse(value)
@@ -14062,6 +14070,48 @@ class HandleDataInteraction {
             }
         }
+        // TODO switch component send command
+        function getSwitchComponentBindValue() {
+            return currentNode.getAttribute(SWITCH_VALUE)
+        }
+
+        async function handleSwitchComponent() {
+            const state = currentNode.getAttribute(SWITCH_STATE)
+            const value = currentNode.getAttribute(SWITCH_VALUE)
+            if (state === SWITCH_STATE_NONE) {
+                return
+            }
+
+            let { deviceId, attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
+            let { command, way } = content
+            const validate = new Validate([
+                { value, required: true, message: '下发值是必填项' },
+                { value: deviceId, required: true, message: '未绑定设备' },
+                { value: way, required: true, message: '未绑定指令下发方式(单向/双向)' },
+                { value: command, required: true, message: '未设置下发命令' },
+                { value: attr, required: true, message: '未绑定设备属性' },
+            ])
+            if (!validate.begin()) return
+            if (typeof command === 'string') command = jsonParse(command)
+            const data = replaceAttrPlaceholder(command, attr, value)
+            const instructionData = {
+                method: "methodThingskit",
+                params: data,
+            }
+
+            const [err, res = []] = await to(ConfigurationNodeApi.deviceIsOnLine(deviceId))
+            const { value: onlineFlag } = res[0] || {}
+            if (onlineFlag) {
+                const [err, res] = await to(ConfigurationNodeApi.sendInstruction(way, deviceId, instructionData))
+                if (!err) {
+                    UseLayUi.topSuccessMsg('操作成功')
+                    callback()
+                }
+            } else {
+                UseLayUi.topErrorMsg('设备不在线!')
+            }
+        }
+
         function replaceAttrPlaceholder(oldValue = {}, replaceAttr = '', replaceValue = '', newValue = {},) {
             if (typeof oldValue !== 'object') return newValue
@@ -14135,7 +14185,22 @@ class HandleDataInteraction {
             })
         }
-        createLayer()
+
+        function startProcess() {
+            const componentType = currentNode.getAttribute(COMPONENT_TYPE)
+            const handle = {
+                [SWITCH]: handleSwitchComponent,
+                [PARAMS_SETTING_BUTTON]: createLayer
+            }
+
+            try {
+                handle[componentType]()
+            } catch (error) {
+
+            }
+        }
+        console.log('enter')
+        startProcess()
     }
 }