Merge branch 'feat/dynamic-title-switch' into 'main_dev'

feat: 文本组件新增标题控制 See merge request yunteng/thingskit-scada!75

Merge branch 'feat/dynamic-title-switch' into 'main_dev'
feat: 文本组件新增标题控制 See merge request yunteng/thingskit-scada!75
xp.Huang
2 parents 8894b5a8 22e00dac
Showing 4 changed files with 34 additions and 18 deletions
gulpfile.js
src/main/webapp/index.html
src/main/webapp/js/grapheditor/EditorUi.js
src/main/webapp/js/grapheditor/Format.js
--- a/gulpfile.js
View file @74259d5
+++ b/gulpfile.js
View file @74259d5
@@ -102,7 +102,7 @@ function copyFileUsageOssServer(cb) {
   const outPath = './build/oss'
   for (const filePath of copyFileList) {
-    src(path.resolve(__dirname, filePath), {allowEmpty:true})
+    src(path.resolve(__dirname, filePath), { allowEmpty: true })
       .pipe((dest(outPath)))
   }
--- a/src/main/webapp/index.html
View file @74259d5
+++ b/src/main/webapp/index.html
View file @74259d5
@@ -22,26 +22,26 @@
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="theme-color" content="#d89000">
-	<link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1686710985762">
+	<link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1687228273654">
 	<!-- load configure file -->
-	<script src="./js/config/config.js?v=1686710985762"></script>
+	<script src="./js/config/config.js?v=1687228273654"></script>
 	<!-- crypto-js	-->
-	<script src="./js/plugin/crypto-js/crypto-js.js?v=1686710985762"></script>
+	<script src="./js/plugin/crypto-js/crypto-js.js?v=1687228273654"></script>
 	<!-- storage persistent	-->
-	<script src="./js/const/persistentStorage.js?v=1686710985762"></script>
+	<script src="./js/const/persistentStorage.js?v=1687228273654"></script>
 	<!-- Global const -->
-	<script src="./js/const/const.js?v=1686710985762"></script>
+	<script src="./js/const/const.js?v=1687228273654"></script>
 	<!-- Axios	-->
-	<script src="./js/plugin/axios/axios.min.js?v=1686710985762"></script>
-	<script src="./js/plugin/axios/DefHttp.js?v=1686710985762"></script>
-	<script src="./js/api/index.js?v=1686710985762"></script>
+	<script src="./js/plugin/axios/axios.min.js?v=1687228273654"></script>
+	<script src="./js/plugin/axios/DefHttp.js?v=1687228273654"></script>
+	<script src="./js/api/index.js?v=1687228273654"></script>
 	<!-- load script -->
-	<script src="./js/config/loadScript.js?v=1686710985762"></script>
+	<script src="./js/config/loadScript.js?v=1687228273654"></script>
 	<!-- act editor -->
 	<!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/ace.js"></script> -->
@@ -54,7 +54,7 @@
 	<!-- <script src="https://vjs.zencdn.net/7.10.2/video.min.js"></script> -->
 	<!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/video.min.js"></script> -->
-	<script src="./js/plugin/layui/layui.js?v=1686710985762"></script>
+	<script src="./js/plugin/layui/layui.js?v=1687228273654"></script>
 	<!-- <link rel="stylesheet" href="https://cdnjs.loli.net/ajax/libs/layui/2.6.8/css/layui.min.css"
 		integrity="sha512-iQBJbsNHXUcgEIgWThd2dr8tOdKPvICwqjPEZYY81z3eMya44A5MiAqfWSCh+Ee1YzNYkdrI982Qhwgr8LEYOQ=="
 		crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -63,7 +63,7 @@
 		crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
 	<!-- 引入修改样式	-->
-	<link rel="stylesheet" href="./styles/formatChange.css?v=1686710985762">
+	<link rel="stylesheet" href="./styles/formatChange.css?v=1687228273654">
 	<script type="text/javascript">
 		/**
@@ -306,7 +306,7 @@
 				var supportedDomain = (hostName.substring(hostName.length - 8, hostName.length) === '.draw.io') ||
 					(hostName.substring(hostName.length - 13, hostName.length) === '.diagrams.net');
-				const releaseVersion = '1686710985762'
+				const releaseVersion = '1687228273654'
 				const appMinSrc = Enable_OSS ? `${OSS_Prefix}app.min.js?v=${releaseVersion}` : `js/app.min.js?v=${releaseVersion}`
 				function loadAppJS() {
 					mxscript(appMinSrc, function () {
--- a/src/main/webapp/js/grapheditor/EditorUi.js
View file @74259d5
+++ b/src/main/webapp/js/grapheditor/EditorUi.js
View file @74259d5
@@ -3405,7 +3405,6 @@ EditorUi.prototype.lightboxFit = function(maxHeight)
 		var h = pageFormat.height;
 		// var h = pageFormat.height / graph.view.scale;
 		var s = Math.min(max, Math.min(cw / w, ch / h));
-		console.log({w, h, scale: graph.view.scale, cw, ch, s})
 		graph.view.scaleAndTranslate(s,
 			(margin + cw - w * s) / (2 * s) - bounds.x / graph.view.scale,
 			(margin + ch - h * s) / (2 * s) - bounds.y / graph.view.scale);
--- a/src/main/webapp/js/grapheditor/Format.js
View file @74259d5
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @74259d5
@@ -6647,9 +6647,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         function getAlarmListSubmitValue(filed = {}) {
             console.log(field?.devicesInfo)
-            if(!field?.devicesInfo) {
+            if (!field?.devicesInfo) {
                 UseLayUi.errorMsg('请先进行设备绑定!')
-                return 
+                return
             }
             const value = {
                 configurationId,
@@ -8129,6 +8129,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             SLAVE_DEVICE_ID: 'slaveDeviceId',
             ATTR: 'attr',
             GATEWAY: 'GATEWAY',
+            TITLE: 'title'
         }
         const enumDisplayType = HandleDynamicEffect.enumDisplayType
@@ -8165,6 +8166,16 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 `
         }
+        function generateTitle() {
+            return `
+            <div class="layui-form-item" style="margin-bottom: 0px">
+                <div class="layui-input-block" style="margin-left: 0px;">
+                    <input name="${enumConst.TITLE}" class="layui-input" lay-verType="tips" />
+                </div>
+            </div>
+            `
+        }
+
         /**
          * @description 添加一条记录
          */
@@ -8179,6 +8190,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
               <td>
                 <input autocomplete="off" lay-verType="tips" lay-verify="required" type="number" name="${enumConst.MAX}" class="layui-input ${enumActionEl.MAX_FILTER}">
               </td>
+              ${IS_DISPLAY && `<td>${generateTitle()}</td>`}
               <td style="text-align: center;">
                 <button type="button" class="layui-btn layui-btn-primary layui-border-red ${enumActionEl.DEL_BTN_EL}">删除</button>
               </td>
@@ -8347,6 +8359,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                             ${IS_RUNNING ? '<th style="text-align:center">类型</th>' : ''}
                             <th style="text-align:center">最小值(>=)</th>
                             <th style="text-align:center">最大值(<=)</th>
+                            ${IS_DISPLAY ? '<th style="text-align:center">标签</th>' : ''}
                             <th style="text-align:center">操作</th>
                         </tr>
                         </thead>
@@ -14409,7 +14422,7 @@ class DispatchCenter {
                     const template = AlarmListComponent.createAlarmItem(data.items)
                     $(`#${id}`).find('.list-wrapper').html(template)
                 } else {
-                     $(`#${id}`).find('.list-wrapper').html(`<div>暂无数据</div>`)
+                    $(`#${id}`).find('.list-wrapper').html(`<div>暂无数据</div>`)
                 }
                 if (autoPlay) {
                     const wrapperHeight = $(`#${id}`).height()
@@ -16381,6 +16394,7 @@ class HandleDynamicEffect {
         } else if (condition.type === HandleDynamicEffect.enumDisplayType.HIDDEN) {
             isShow = false
         }
+        console.log(condition)
         const updateFn = () => {
             if (!isShow) {
                 Object.keys(HandleDynamicEffect.enumActType).forEach(key => {
@@ -16393,7 +16407,10 @@ class HandleDynamicEffect {
                 const temp = this.actNodeMapping.get(node.id)
                 temp.display = true
             }
-
+            if (condition.title) {
+                node.setAttribute('label', condition.title) 
+                console.log(node)
+            }
             node.setVisible(isShow)
         }
         this.insertOnceUpdateFn(node, updateFn)