From 43008f1240d6568a3364721bb01fc7e31b33d147 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十二月 2023 23:39:51 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/billprint/index.jsx | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 0c287de..fd83600 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -325,7 +325,7 @@
let initInters = []
- this.formatInterSetting(config.interfaces, regs, initInters, params, BID)
+ this.formatInterSetting(config.interfaces, regs, initInters, params, BID, config.MenuName)
config.components = config.components.map(component => {
if (component.action) {
@@ -341,6 +341,8 @@
component.$searches = []
}
component.data = [] // 鍒濆鍖栨暟鎹负绌�
+
+ component.$menuname = (config.MenuName || '') + '-' + (component.name || '')
if (component.subtype === 'tablecard') { // 鍏煎
component.type = 'card'
@@ -466,6 +468,7 @@
component.setting.arr_field = component.columns ? component.columns.map(col => col.field).join(',') : ''
component.setting.laypage = false // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
+ component.setting.$name = component.$menuname
if (component.format === 'object') {
component.setting.$top = true
@@ -539,7 +542,7 @@
return component
})
- _pars = this.getFormatParam(_pars)
+ _pars = this.getFormatParam(_pars, config.MenuName)
if (_pars) {
_pars.componentId = 'union'
@@ -640,7 +643,7 @@
return cell
}
- formatInterSetting = (inters, regs, initInters, params, BID) => {
+ formatInterSetting = (inters, regs, initInters, params, BID, MenuName) => {
if (!inters) return []
let delay = 15
@@ -652,6 +655,7 @@
inter.setting.supModule = ''
inter.setting.arr_field = inter.columns.map(col => col.field).join(',')
+ inter.setting.$name = (MenuName || '') + '-鍏叡鏁版嵁婧�-' + inter.setting.name
if (inter.setting.interType !== 'system') {
let param = UtilsDM.getQueryDataParams(inter.setting, [], inter.setting.order || '', 1, 1000, BID)
@@ -683,7 +687,6 @@
})
delete inter.scripts
- inter.setting.$name = '鍏叡鏁版嵁婧�-' + inter.setting.name
inter.setting.execute = inter.setting.execute !== 'false'
inter.setting.laypage = false
inter.setting.$top = true
@@ -771,7 +774,7 @@
}
}
- getFormatParam = (params) => {
+ getFormatParam = (params, MenuName) => {
const { BID } = this.state
if (!params || params.length === 0) return ''
@@ -841,6 +844,10 @@
fullName: fullName
}
+ if (MenuName) {
+ param.menuname = MenuName
+ }
+
param.LText = Utils.formatOptions(param.LText)
param.LText_field = Utils.formatOptions(param.LText_field)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
--
Gitblit v1.8.0