Commit b0d346b2062a471653295934145d2e839fff456d

Authored by xp.Huang
2 parents 5f648542 60f77955

Merge branch 'ww' into 'main'

fix: save button render invalidate and bind data source submit method not validate permission

See merge request huang/thingskit-drawio!42

Too many changes to show.

To preserve performance only 2 of 4 files are displayed.

@@ -72,12 +72,11 @@ function generatoreVersion(cb) { @@ -72,12 +72,11 @@ function generatoreVersion(cb) {
72 const reg = /const\s+releaseVersion\s?=\s?.*/g 72 const reg = /const\s+releaseVersion\s?=\s?.*/g
73 const regTimespan = /\?v=(\d+)/g 73 const regTimespan = /\?v=(\d+)/g
74 const timespan = Date.now() 74 const timespan = Date.now()
75 -  
76 const string = readFileSync(path.resolve(__dirname, './src/main/webapp/index.html'), { encoding: 'utf-8' }) 75 const string = readFileSync(path.resolve(__dirname, './src/main/webapp/index.html'), { encoding: 'utf-8' })
77 76
78 - let newString = string.replace(reg, `const releaseVersion = '${encodeURIComponent(Date.now())}'`) 77 + let newString = string.replace(reg, `const releaseVersion = '${encodeURIComponent(timespan)}'`)
79 78
80 - newString = string.replace(regTimespan, `?v=${timespan}`) 79 + newString = newString.replace(regTimespan, `?v=${timespan}`)
81 80
82 writeFileSync(path.resolve(__dirname, './src/main/webapp/index.html'), newString, { encoding: 'utf-8' }) 81 writeFileSync(path.resolve(__dirname, './src/main/webapp/index.html'), newString, { encoding: 'utf-8' })
83 82
@@ -22,26 +22,26 @@ @@ -22,26 +22,26 @@
22 <meta name="mobile-web-app-capable" content="yes"> 22 <meta name="mobile-web-app-capable" content="yes">
23 <meta name="theme-color" content="#d89000"> 23 <meta name="theme-color" content="#d89000">
24 24
25 - <link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1659688272638"> 25 + <link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1660097025459">
26 26
27 <!-- load configure file --> 27 <!-- load configure file -->
28 - <script src="./js/config/config.js?v=1659688272638"></script> 28 + <script src="./js/config/config.js?v=1660097025459"></script>
29 29
30 <!-- crypto-js --> 30 <!-- crypto-js -->
31 - <script src="./js/plugin/crypto-js/crypto-js.js?v=1659688272638"></script> 31 + <script src="./js/plugin/crypto-js/crypto-js.js?v=1660097025459"></script>
32 32
33 <!-- storage persistent --> 33 <!-- storage persistent -->
34 - <script src="./js/const/persistentStorage.js?v=1659688272638"></script> 34 + <script src="./js/const/persistentStorage.js?v=1660097025459"></script>
35 <!-- Global const --> 35 <!-- Global const -->
36 - <script src="./js/const/const.js?v=1659688272638"></script> 36 + <script src="./js/const/const.js?v=1660097025459"></script>
37 37
38 <!-- Axios --> 38 <!-- Axios -->
39 - <script src="./js/plugin/axios/axios.min.js?v=1659688272638"></script>  
40 - <script src="./js/plugin/axios/DefHttp.js?v=1659688272638"></script>  
41 - <script src="./js/api/index.js?v=1659688272638"></script> 39 + <script src="./js/plugin/axios/axios.min.js?v=1660097025459"></script>
  40 + <script src="./js/plugin/axios/DefHttp.js?v=1660097025459"></script>
  41 + <script src="./js/api/index.js?v=1660097025459"></script>
42 42
43 <!-- load script --> 43 <!-- load script -->
44 - <script src="./js/config/loadScript.js?v=1659688272638"></script> 44 + <script src="./js/config/loadScript.js?v=1660097025459"></script>
45 45
46 <!-- act editor --> 46 <!-- act editor -->
47 <!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/ace.js"></script> --> 47 <!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/ace.js"></script> -->
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <!-- <script src="https://vjs.zencdn.net/7.10.2/video.min.js"></script> --> 54 <!-- <script src="https://vjs.zencdn.net/7.10.2/video.min.js"></script> -->
55 <!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/video.min.js"></script> --> 55 <!-- <script src="https://oss.yuntengcloud.com/iotdocs/thingskit-scada/video.min.js"></script> -->
56 56
57 - <script src="./js/plugin/layui/layui.js?v=1659688272638"></script> 57 + <script src="./js/plugin/layui/layui.js?v=1660097025459"></script>
58 <!-- <link rel="stylesheet" href="https://cdnjs.loli.net/ajax/libs/layui/2.6.8/css/layui.min.css" 58 <!-- <link rel="stylesheet" href="https://cdnjs.loli.net/ajax/libs/layui/2.6.8/css/layui.min.css"
59 integrity="sha512-iQBJbsNHXUcgEIgWThd2dr8tOdKPvICwqjPEZYY81z3eMya44A5MiAqfWSCh+Ee1YzNYkdrI982Qhwgr8LEYOQ==" 59 integrity="sha512-iQBJbsNHXUcgEIgWThd2dr8tOdKPvICwqjPEZYY81z3eMya44A5MiAqfWSCh+Ee1YzNYkdrI982Qhwgr8LEYOQ=="
60 crossorigin="anonymous" referrerpolicy="no-referrer" /> 60 crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 crossorigin="anonymous" referrerpolicy="no-referrer"></script> --> 63 crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
64 64
65 <!-- 引入修改样式 --> 65 <!-- 引入修改样式 -->
66 - <link rel="stylesheet" href="./styles/formatChange.css?v=1659688272638"> 66 + <link rel="stylesheet" href="./styles/formatChange.css?v=1660097025459">
67 67
68 <script type="text/javascript"> 68 <script type="text/javascript">
69 /** 69 /**
@@ -306,7 +306,7 @@ @@ -306,7 +306,7 @@
306 var supportedDomain = (hostName.substring(hostName.length - 8, hostName.length) === '.draw.io') || 306 var supportedDomain = (hostName.substring(hostName.length - 8, hostName.length) === '.draw.io') ||
307 (hostName.substring(hostName.length - 13, hostName.length) === '.diagrams.net'); 307 (hostName.substring(hostName.length - 13, hostName.length) === '.diagrams.net');
308 308
309 - const releaseVersion = '1658971884984' 309 + const releaseVersion = '1660097025459'
310 const appMinSrc = Enable_OSS ? `${OSS_Prefix}app.min.js?v=${releaseVersion}` : `js/app.min.js?v=${releaseVersion}` 310 const appMinSrc = Enable_OSS ? `${OSS_Prefix}app.min.js?v=${releaseVersion}` : `js/app.min.js?v=${releaseVersion}`
311 function loadAppJS() { 311 function loadAppJS() {
312 mxscript(appMinSrc, function () { 312 mxscript(appMinSrc, function () {
@@ -592,11 +592,11 @@ @@ -592,11 +592,11 @@
592 var timeInterval = setInterval(() => { 592 var timeInterval = setInterval(() => {
593 try { 593 try {
594 if (!echarts) return 594 if (!echarts) return
  595 + clearInterval(timeInterval)
  596 + timeInterval = null
595 } catch (error) { 597 } catch (error) {
596 598
597 } 599 }
598 - clearInterval(timeInterval)  
599 - timeInterval = null  
600 var chartDom 600 var chartDom
601 var myChart 601 var myChart
602 try { 602 try {