From cb52ff0fd9fdf3ebfbde2314539998f3fedd9854 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 九月 2024 10:16:46 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/billprint/index.jsx | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 112e0b5..f708040 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -2,6 +2,7 @@
import { is, fromJS } from 'immutable'
import { Col, Row, Spin, notification, Button, Modal } from 'antd'
import moment from 'moment'
+import md5 from 'md5'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -65,6 +66,7 @@
let param = JSON.parse(window.decodeURIComponent(window.atob(params.param)))
sessionStorage.setItem('dataM', param.dataM || '')
+
this.setState({
BID: param.id || '',
tempId: param.tempId,
@@ -303,6 +305,22 @@
config.components = config.components.filter(item => !['tabs', 'search'].includes(item.type))
+ if (window.backend && config.allSqls) {
+ let urlparam = urlParam || {}
+ let keys = Object.keys(urlparam)
+ config.allSqls.forEach(item => {
+ item.id = md5(window.GLOB.appkey + item.v_id)
+ if (item.type === 'datasource' || item.type === 'excelOut') {
+ item.urlkeys = keys
+ item.urlparam = urlparam
+ if (config.flow_code) {
+ item.works_flow_code = config.flow_code
+ }
+ }
+ window.GLOB.CacheData.set('sql_' + item.uuid, item)
+ })
+ }
+
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
@@ -487,6 +505,8 @@
component.setting.sync = 'false'
return component
}
+
+ component.setting.uuid = component.uuid
let _customScript = ''
let _tailScript = ''
@@ -532,6 +552,12 @@
component.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
component.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
+
+ if (window.backend && config.allSqls) {
+ component.setting.sync = 'false'
+ } else if (_tailScript) {
+ component.setting.sync = 'false'
+ }
// floor 缁勪欢鐨勫眰绾�
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
@@ -682,6 +708,8 @@
}
return
}
+
+ inter.setting.uuid = inter.uuid
let _customScript = ''
let _tailScript = ''
@@ -1091,6 +1119,14 @@
reloadTabs = () => {
if (this.reloading) return
+ let time = new Date().getTime()
+
+ let oldTime = sessionStorage.getItem('mk_reloadTabs')
+
+ if (oldTime && time - oldTime < 180000) return
+
+ sessionStorage.setItem('mk_reloadTabs', time)
+
this.reloading = true
Api.getAppVersion(true).then(() => {
--
Gitblit v1.8.0