From 5d7990fdaf2c9c60dfc697f00089ba809255df08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 22 十一月 2022 16:00:18 +0800
Subject: [PATCH] 2022-11-22
---
src/mob/components/topbar/normal-navbar/index.scss | 11 ++++-------
src/mob/components/topbar/normal-navbar/index.jsx | 2 +-
src/views/billprint/index.jsx | 12 ++++++++++++
src/utils/utils-custom.js | 2 +-
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/mob/components/topbar/normal-navbar/index.jsx b/src/mob/components/topbar/normal-navbar/index.jsx
index d711391..9f6efb1 100644
--- a/src/mob/components/topbar/normal-navbar/index.jsx
+++ b/src/mob/components/topbar/normal-navbar/index.jsx
@@ -125,7 +125,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', ['font', 'background', 'border', 'padding', 'shadow'], card.style, this.getStyle)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'shadow'], card.style, this.getStyle)
}
changeTitleStyle = () => {
diff --git a/src/mob/components/topbar/normal-navbar/index.scss b/src/mob/components/topbar/normal-navbar/index.scss
index 46e93c6..80403dc 100644
--- a/src/mob/components/topbar/normal-navbar/index.scss
+++ b/src/mob/components/topbar/normal-navbar/index.scss
@@ -15,10 +15,10 @@
position: absolute;
z-index: 2;
font-size: 16px;
- right: 1px;
- top: 1px;
+ right: 0px;
+ top: 0px;
cursor: pointer;
- padding: 5px;
+ padding: 4px;
background: rgba(255, 255, 255, 0.55);
color: rgba(0, 0, 0, 0.65);
}
@@ -34,7 +34,7 @@
font-size: 20px;
line-height: 50px;
.anticon-left {
- margin: 0 8px 0 5px;
+ margin: 0 10px;
}
.img {
width: 30px;
@@ -48,8 +48,6 @@
}
.am-navbar-title {
text-align: center;
- font-style: inherit;
- font-weight: inherit;
flex: 1;
}
.am-navbar-search {
@@ -76,7 +74,6 @@
min-width: 10px;
font-size: 20px;
line-height: 50px;
- margin-right: 10px;
.anticon-search {
margin-right: 5px;
padding: 5px;
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index be31708..a7a4398 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -901,7 +901,7 @@
if (config.setting && (!config.wrap || !config.wrap.datatype || config.wrap.datatype === 'dynamic')) {
if (config.setting.interType === 'system') {
- if (config.setting.execute !== 'false') {
+ if (config.setting.execute !== 'false' && config.setting.dataresource) {
let tbs = config.setting.dataresource.match(cutreg)
tbs && cuts.push(...tbs)
}
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index bd9e5b0..e935685 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -308,6 +308,8 @@
})
}
+ window.GLOB.CacheData.set(tempId, {$BID: BID})
+
config.components = config.components.map(component => {
if (component.action) component.action = []
if (component.search) component.search = []
@@ -317,6 +319,16 @@
component.type = 'card'
}
+ component.$pageId = tempId
+ if (component.setting && component.setting.supModule) {
+ let pid = component.setting.supModule.pop()
+ if (pid && pid !== 'empty') {
+ component.setting.supModule = pid
+ } else {
+ component.setting.supModule = ''
+ }
+ }
+
if (component.type === 'table') {
let getColumns = (cols) => {
return cols.map(item => {
--
Gitblit v1.8.0