From 4fc1eb4913f3302679d88ec01099fc8dd3a80f81 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 三月 2023 23:27:21 +0800
Subject: [PATCH] 2023-03-08
---
public/options.json | 10 ++--
src/tabviews/custom/index.jsx | 9 ++++
src/tabviews/custom/components/editor/braft-editor/index.jsx | 13 ++++++
src/menu/datasource/verifycard/settingform/index.jsx | 2
src/tabviews/custom/components/interfaces/interItem/index.jsx | 40 ++++++++++++++++++-
5 files changed, 65 insertions(+), 9 deletions(-)
diff --git a/public/options.json b/public/options.json
index 4e405d0..bedcbee 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,12 +1,12 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
+ "appId": "202108312122504607B107A83F55B40C98CCF",
+ "appkey": "20210831212235413F287EC3BF489424496C8",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "",
"lineColor": "",
"filter": "false",
- "defaultApp": "mk",
+ "defaultApp": "mkindustry",
"defaultLang": "zh-CN",
"WXAppID": "",
"WXminiAppID": "",
@@ -17,6 +17,6 @@
"transfer": "false",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "http://qingqiumarket.cn",
- "service": "MKWMS/"
+ "host": "http://demo.mk9h.cn",
+ "service": "erp_new/"
}
\ No newline at end of file
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 060d782..de02f21 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -409,7 +409,7 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {!['navbar', 'balcony', 'menubar', 'interface'].includes(config.type) && (!config.wrap || config.wrap.supType !== 'multi') ? <Col span={8}>
+ {!['navbar', 'balcony', 'menubar'].includes(config.type) && (!config.wrap || config.wrap.supType !== 'multi') ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'璇ョ粍浠跺鏋滃彈鍏朵粬缁勪欢鎺у埗锛岃閫夐」鐩稿簲鐨勭粍浠讹紝娌℃湁鏃堕�夆�滄棤鈥濄��'}>
<QuestionCircleOutlined className="mk-form-tip" />
diff --git a/src/tabviews/custom/components/editor/braft-editor/index.jsx b/src/tabviews/custom/components/editor/braft-editor/index.jsx
index 3a2a484..5c41173 100644
--- a/src/tabviews/custom/components/editor/braft-editor/index.jsx
+++ b/src/tabviews/custom/components/editor/braft-editor/index.jsx
@@ -87,6 +87,7 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
+ MKEmitter.addListener('resetSelectLine', this.resetParentParam)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -98,6 +99,7 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
}
/**
@@ -123,6 +125,17 @@
}
}
+ resetParentParam = (MenuID, id) => {
+ const { config } = this.state
+
+ if (!config.setting.supModule || config.setting.supModule !== MenuID) return
+ if (id !== this.state.BID || id !== '') {
+ this.setState({ BID: id }, () => {
+ this.loadData()
+ })
+ }
+ }
+
reloadData = (menuId) => {
const { config } = this.state
diff --git a/src/tabviews/custom/components/interfaces/interItem/index.jsx b/src/tabviews/custom/components/interfaces/interItem/index.jsx
index cffd75b..ab62d9b 100644
--- a/src/tabviews/custom/components/interfaces/interItem/index.jsx
+++ b/src/tabviews/custom/components/interfaces/interItem/index.jsx
@@ -17,20 +17,34 @@
loading = false
- state = {}
+ state = {
+ BID: ''
+ }
componentDidMount () {
- const { config } = this.props
+ const { config, BID } = this.props
if (config.setting.timer) {
this.timer = new TimerTask()
this.timer.init(config.uuid, config.setting.timer, config.setting.timerRepeats, () => {this.loadData()})
}
+
+ if (!config.setting.supModule) {
+ this.setState({ BID: BID || '' })
+ } else {
+ let BData = window.GLOB.CacheData.get(config.setting.supModule)
+
+ if (BData) {
+ this.setState({ BID: BData.$BID || '' })
+ }
+ }
+
setTimeout(() => {
this.loadData()
}, config.setting.delay)
MKEmitter.addListener('reloadData', this.reloadData)
+ MKEmitter.addListener('resetSelectLine', this.resetParentParam)
}
shouldComponentUpdate (nextProps, nextState) { return false }
@@ -44,6 +58,18 @@
}
this.timer && this.timer.stop()
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ }
+
+ resetParentParam = (MenuID, id) => {
+ const { config } = this.props
+
+ if (!config.setting.supModule || config.setting.supModule !== MenuID) return
+ if (id !== this.state.BID || id !== '') {
+ this.setState({ BID: id }, () => {
+ this.loadData()
+ })
+ }
}
reloadData = (publicId) => {
@@ -53,7 +79,15 @@
}
async loadData () {
- const { config, BID } = this.props
+ const { config } = this.props
+ const { BID } = this.state
+
+ if (config.setting.supModule && !BID) {
+ MKEmitter.emit('mkPublicData', config.uuid, { $$empty: true, $$uuid: '' })
+ MKEmitter.emit('resetSelectLine', config.uuid, '', { $$empty: true, $$uuid: '' })
+ this.loading = false
+ return
+ }
if (this.loading) return
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 70c202b..9af6162 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -999,6 +999,15 @@
inter.setting.delay = delay
delay += 15
+ if (inter.setting.supModule) {
+ let pid = inter.setting.supModule.pop()
+ if (pid && pid !== 'empty') {
+ inter.setting.supModule = pid
+ } else {
+ inter.setting.supModule = ''
+ }
+ }
+
if (inter.setting.interType !== 'system') return inter
let _customScript = ''
--
Gitblit v1.8.0