From 213e3c760dfdb052da626172425e4dbea6be4592 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 七月 2023 19:47:37 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/billprint/index.jsx | 5 ++++-
src/views/menudesign/index.jsx | 4 ++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index a52fd05..86b8204 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -664,7 +664,10 @@
item.dataArray = fromJS(res.data).toJS()
} else if (res.componentId === 'union' && res[item.dataName]) {
item.data = res[item.dataName]
- item.dataArray = fromJS(res[item.dataName]).toJS()
+ if (!Array.isArray(item.data)) {
+ item.data = [item.data]
+ }
+ item.dataArray = fromJS(item.data).toJS()
}
})
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index fdf22ba..1a52162 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -651,6 +651,8 @@
comloading: false,
needUpdate: true
})
+
+ window.GLOB.customMenu = config
return
}
@@ -729,6 +731,8 @@
config.components = this.setPopView(config.components, parents, popbtns)
this.setState({ delButtons: bts, config, comloading: false })
+
+ window.GLOB.customMenu = config
})
}
--
Gitblit v1.8.0