fix: implement dynamic effect priority

ww
1 parent 819b08d0
Showing 1 changed file with 65 additions and 39 deletions
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/grapheditor/Format.js
View file @e6992e8
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @e6992e8
@@ -5579,7 +5579,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             const { dataSources = [] } = currentNodeData
             const { additional = {} } = dataSources[0] || {}
             const { [enumBindKey.EFFECT_SCOPE]: effectScope = 1000 } = additional
-            console.log(additional)
             linkageIntervalSelect(effectScope)
             form.val(CONTAINER_FILTER, additional)
         }
@@ -7267,7 +7266,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         }
         function getValue() {
-            console.log(form.val(componentFilter))
             return form.val(componentFilter)
         }
@@ -12626,7 +12624,7 @@ class HandleDataSource {
             const seriesValue = []
             const chartOption = {
                 title: {
-                    subtext: realDataList.length ? '' :'暂无数据',
+                    subtext: realDataList.length ? '' : '暂无数据',
                     x: 'center',
                     y: 'center',
                     itemGap: -20,
@@ -12672,11 +12670,9 @@ class HandleDataSource {
                 ],
                 dataZoom: [
                     {
-                        xAxisIndex: 0,
                         show: true,
                         type: 'slider',
-                        startValue: 0,
-                        endValue: showNumberOf
+                        // endValue: showNumberOf
                     }
                 ]
             }
@@ -12730,17 +12726,21 @@ class HandleDataSource {
                 ],
                 dataZoom: [
                     {
-                        startValue: seriesValue.length - 1 > showNumberOf
-                            ? oldStartValue === seriesValue.length - 1
-                                ? 0
-                                : oldStartValue + 1
-                            : 0,
-                        endValue: seriesValue.length - 1 > showNumberOf
-                            ? oldEndValue === seriesValue.length - 1
-                                ? showNumberOf
-                                : oldEndValue + 1
-                            : showNumberOf
+                        show: true,
+                        type: 'slider',
                     }
+                    // {
+                    //     startValue: seriesValue.length - 1 > showNumberOf
+                    //         ? oldStartValue === seriesValue.length - 1
+                    //             ? 0
+                    //             : oldStartValue + 1
+                    //         : 0,
+                    //     endValue: seriesValue.length - 1 > showNumberOf
+                    //         ? oldEndValue === seriesValue.length - 1
+                    //             ? showNumberOf
+                    //             : oldEndValue + 1
+                    //         : showNumberOf
+                    // }
                 ]
             })
         }
@@ -12768,7 +12768,7 @@ class HandleDataSource {
         const seriesValue = []
         const chartOption = {
             title: {
-                subtext: historyDataList.length ? '' :'暂无数据',
+                subtext: historyDataList.length ? '' : '暂无数据',
                 x: 'center',
                 y: 'center',
                 itemGap: -20,
@@ -12815,11 +12815,11 @@ class HandleDataSource {
             ],
             dataZoom: [
                 {
-                    xAxisIndex: 0,
-                    show: false,
+                    // xAxisIndex: 0,
+                    show: true,
                     type: 'slider',
-                    startValue: 0,
-                    endValue: showNumberOf
+                    // startValue: 0,
+                    // endValue: showNumberOf
                 }
             ]
         }
@@ -12860,9 +12860,9 @@ class HandleDataSource {
         }
         instance.setOption(chartOption)
-        instance.on('mouseover', stop)
-        instance.on('mouseout', goMove)
-        autoMove()
+        // instance.on('mouseover', stop)
+        // instance.on('mouseout', goMove)
+        // autoMove()
     }
     /**
@@ -13141,7 +13141,7 @@ class HandleDynamicEffect {
     /**
      * @description 动效节点映射
-     * @type {Map<string, Map<string, any>>}
+     * @type {Map<string, {display: boolean, value: Map<string, any>}>}
      */
     actNodeMapping = new Map()
@@ -13223,9 +13223,9 @@ class HandleDynamicEffect {
         this.enableActList.forEach(each => {
             const { id, type, attr, deviceId, slaveDeviceId } = each
-            if (!this.actNodeMapping.has(id)) this.actNodeMapping.set(id, new Map())
+            if (!this.actNodeMapping.has(id)) this.actNodeMapping.set(id, { display: true, value: new Map() })
             const temp = this.actNodeMapping.get(id)
-            temp.set(type, each)
+            temp.value.set(type, each)
             const cmdId = this.DispatchInstance.getCmdId(id)
@@ -13303,6 +13303,11 @@ class HandleDynamicEffect {
     rotate(message) {
         const { subscriptionId, data } = message
         const node = this.getNodeByCmdId(subscriptionId)
+        const key = node.id + DispatchCenter.enumDynamicEffectType.ROTATE
+        if (!this.validatePriority(node.id)) {
+            this.delUpdateFn(key)
+            return
+        }
         const { flag } = this.validate(subscriptionId, DispatchCenter.enumDynamicEffectType.ROTATE, data)
         let deg = 0
         const updateFn = () => {
@@ -13311,16 +13316,14 @@ class HandleDynamicEffect {
             let style = node.getStyle()
             const reg = /rotation=(-?)\w+(;?)/g
             style = style.replace(reg, '')
-            style += `rotation=${deg}`
+            style += `rotation=${deg};`
             node.setStyle(style)
             this.graph.updateCellStyles(style, node)
         }
-        const key = node.id + DispatchCenter.enumDynamicEffectType.ROTATE
         if (!flag) {
             this.delUpdateFn(key)
             return
         }
-        console.log(this.actNodeMapping)
         this.insertContinueUpdateFn(node, updateFn, key)
     }
@@ -13335,19 +13338,29 @@ class HandleDynamicEffect {
         if (!flag) return
         const node = this.getNodeByCmdId(subscriptionId)
         let isShow = false
-        if (node.visible && condition.type === HandleDynamicEffect.enumDisplayType.SHOW) {
-            return
-        } else if (condition.type === HandleDynamicEffect.enumDisplayType.SHOW) {
+        if (condition.type === HandleDynamicEffect.enumDisplayType.SHOW) {
             isShow = true
         } else if (condition.type === HandleDynamicEffect.enumDisplayType.HIDDEN) {
             isShow = false
         }
         const updateFn = () => {
+            // let style = node.getStyle()
+            // const reg = /opacity=(-?)\w+(;?)/g
+            // style = style.replace(reg, '')
+            // style += `opacity=${isShow ? 100 : 0};`
+            // console.log(style)
+            // node.setStyle(style)
+
+            if (!isShow) {
+                Object.keys(HandleDynamicEffect.enumActType).forEach(key => {
+                    const delKey = node.id + key
+                    this.delUpdateFn(delKey)
+                })
+                const temp = this.actNodeMapping.get(node.id)
+                temp.display = false
+            }
+
             node.setVisible(isShow)
-            node.setAttribute('display', isShow)
-            console.log('isShow', isShow)
-            console.log(node.style)
-            console.log(node)
         }
         this.insertOnceUpdateFn(node, updateFn)
     }
@@ -13360,13 +13373,17 @@ class HandleDynamicEffect {
     flash(message) {
         const { subscriptionId, data } = message
         const node = this.getNodeByCmdId(subscriptionId)
+        const key = node.id + DispatchCenter.enumDynamicEffectType.FLASH
+        if (!this.validatePriority(node.id)) {
+            this.delUpdateFn(key)
+            return
+        }
         const { flag, condition } = this.validate(subscriptionId, HandleDynamicEffect.enumActType.FLASH, data)
         let flashFlag = false
         const updateFn = () => {
             node.setVisible(flashFlag)
             flashFlag = !flashFlag
         }
-        const key = node.id + DispatchCenter.enumDynamicEffectType.FLASH
         if (!flag) {
             flashFlag = true
             this.insertOnceUpdateFn(node, updateFn)
@@ -13435,7 +13452,7 @@ class HandleDynamicEffect {
     getBindData(subscriptionId, actionType) {
         const nodeId = this.getNodeIdByCmdId(subscriptionId)
         const temp = this.actNodeMapping.get(nodeId)
-        return temp.get(actionType)
+        return temp.value.get(actionType)
     }
     /**
@@ -13457,6 +13474,15 @@ class HandleDynamicEffect {
         return this.DispatchInstance.contentAllCell.find(item => item.id === nodeId)
     }
+    /**
+     * @description 验证优先级
+     * @param {string} nodeId 
+     * @returns 
+     */
+    validatePriority(nodeId) {
+        return this.actNodeMapping.get(nodeId).display
+    }
+
 }
 class UpdateQueue {