简柏林 / thingskit-scada · Commits

Commit 10b07ecb360401418019ac37a762a8bcbccfe190

Authored by ww
1 parent da685680

fix: image component not update

Inline Side-by-side
Showing 5 changed files with 21 additions and 17 deletions
@@ -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=1660097025459"> 25 + <link rel="stylesheet" href="./js/plugin/layui/css/layui.css?v=1663582316568">
26 26
27 <!-- load configure file --> 27 <!-- load configure file -->
28 - <script src="./js/config/config.js?v=1660097025459"></script> 28 + <script src="./js/config/config.js?v=1663582316568"></script>
29 29
30 <!-- crypto-js --> 30 <!-- crypto-js -->
31 - <script src="./js/plugin/crypto-js/crypto-js.js?v=1660097025459"></script> 31 + <script src="./js/plugin/crypto-js/crypto-js.js?v=1663582316568"></script>
32 32
33 <!-- storage persistent --> 33 <!-- storage persistent -->
34 - <script src="./js/const/persistentStorage.js?v=1660097025459"></script> 34 + <script src="./js/const/persistentStorage.js?v=1663582316568"></script>
35 <!-- Global const --> 35 <!-- Global const -->
36 - <script src="./js/const/const.js?v=1660097025459"></script> 36 + <script src="./js/const/const.js?v=1663582316568"></script>
37 37
38 <!-- Axios --> 38 <!-- Axios -->
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> 39 + <script src="./js/plugin/axios/axios.min.js?v=1663582316568"></script>
  40 + <script src="./js/plugin/axios/DefHttp.js?v=1663582316568"></script>
  41 + <script src="./js/api/index.js?v=1663582316568"></script>
42 42
43 <!-- load script --> 43 <!-- load script -->
44 - <script src="./js/config/loadScript.js?v=1660097025459"></script> 44 + <script src="./js/config/loadScript.js?v=1663582316568"></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=1660097025459"></script> 57 + <script src="./js/plugin/layui/layui.js?v=1663582316568"></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=1660097025459"> 66 + <link rel="stylesheet" href="./styles/formatChange.css?v=1663582316568">
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 = '1660097025459' 309 + const releaseVersion = '1663582316568'
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 () {
1 /** 1 /**
2 * @description load script from oss server prefix 2 * @description load script from oss server prefix
3 */ 3 */
4 -const OSS_Prefix = 'https://oss.yuntengcloud.com/iotdocs/thingskit-scada/' 4 +const OSS_Prefix = 'https://oss.yuntengcloud.com/iotdocs/thingskit-scada-development/'
5 5
6 /** 6 /**
7 * @description enable load script form oss server 7 * @description enable load script form oss server
@@ -12,3 +12,5 @@ const Enable_OSS = true @@ -12,3 +12,5 @@ const Enable_OSS = true
12 * @description 代理配置项 12 * @description 代理配置项
13 */ 13 */
14 const Proxy_Prefix = window.location.pathname.startsWith('/') ? window.location.pathname.replace(/\/$/, '') : window.location.pathname 14 const Proxy_Prefix = window.location.pathname.startsWith('/') ? window.location.pathname.replace(/\/$/, '') : window.location.pathname
  15 +
  16 +
@@ -21,7 +21,7 @@ const GLOBAL_TOKEN = (() => { @@ -21,7 +21,7 @@ const GLOBAL_TOKEN = (() => {
21 /** 21 /**
22 * @description 写权限 key 22 * @description 写权限 key
23 */ 23 */
24 -const CAN_WRITE = 'api:yt:admin:designConfiguration' 24 +const CAN_WRITE = 'api:yt:configuration:center:get_configuration_info:get'
25 25
26 const USER_PERMISSION = { 26 const USER_PERMISSION = {
27 permission: [] 27 permission: []
@@ -4221,6 +4221,7 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) { @@ -4221,6 +4221,7 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
4221 function getUserPermission() { 4221 function getUserPermission() {
4222 defHttp.get('/yt/role/me/permissions') 4222 defHttp.get('/yt/role/me/permissions')
4223 .then(res => { 4223 .then(res => {
  4224 + console.log('enter')
4224 USER_PERMISSION.permission = res 4225 USER_PERMISSION.permission = res
4225 updateButtonContainer() 4226 updateButtonContainer()
4226 // var flag = hasSavePermission() 4227 // var flag = hasSavePermission()
@@ -4233,8 +4234,10 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) { @@ -4233,8 +4234,10 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
4233 4234
4234 // 调用API,获取保存的内容 4235 // 调用API,获取保存的内容
4235 function getSaveContent() { 4236 function getSaveContent() {
4236 - defHttp.get('/yt/configuration/center/getConfigurationInfo/' + Editor.configurationId) 4237 + defHttp.get('/yt/configuration/center/get_configuration_info/' + Editor.configurationId)
4237 .then(function (response) { 4238 .then(function (response) {
  4239 + getUserPermission()
  4240 +
4238 const { platform } = response || {} 4241 const { platform } = response || {}
4239 const pageSizeControl = PageSetupDialog.getFormats 4242 const pageSizeControl = PageSetupDialog.getFormats
4240 PageSetupDialog.getFormats = function () { 4243 PageSetupDialog.getFormats = function () {
@@ -4279,7 +4282,6 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) { @@ -4279,7 +4282,6 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
4279 fn(); 4282 fn();
4280 } 4283 }
4281 4284
4282 - getUserPermission()  
4283 }) 4285 })
4284 .catch(function (error) { 4286 .catch(function (error) {
4285 }); 4287 });
@@ -13529,7 +13529,7 @@ class HandleDataSource { @@ -13529,7 +13529,7 @@ class HandleDataSource {
13529 const { attr } = this.getBindData(subscriptionId) 13529 const { attr } = this.getBindData(subscriptionId)
13530 const [[timespan, receiveValue] = []] = data[attr] || [] 13530 const [[timespan, receiveValue] = []] = data[attr] || []
13531 this.updatePage(() => { 13531 this.updatePage(() => {
13532 - node.setAttribute('label', `<img class="basic-component__image" alt="图片" src="${Proxy_Prefix}/${receiveValue}" />`) 13532 + node.setAttribute('label', `<img class="basic-component__image" alt="图片" src="${receiveValue}" />`)
13533 }, node) 13533 }, node)
13534 } 13534 }
13535 13535