From 98ed63fb6b2380bb8a9f562a8d1fc7783288635e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 06 三月 2023 17:32:19 +0800
Subject: [PATCH] 2023-03-06
---
public/options.json | 10 +++++-----
src/tabviews/zshare/mutilform/index.jsx | 18 ++++++++++--------
src/tabviews/zshare/mutilform/mkRadio/index.jsx | 2 +-
src/tabviews/custom/components/card/prop-card/index.jsx | 6 +++---
src/tabviews/zshare/mutilform/mkSelect/index.jsx | 2 +-
src/tabviews/zshare/actionList/normalbutton/index.jsx | 8 ++++++++
src/utils/utils-custom.js | 7 +++++++
7 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/public/options.json b/public/options.json
index bedcbee..4e405d0 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,12 +1,12 @@
{
- "appId": "202108312122504607B107A83F55B40C98CCF",
- "appkey": "20210831212235413F287EC3BF489424496C8",
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "",
"lineColor": "",
"filter": "false",
- "defaultApp": "mkindustry",
+ "defaultApp": "mk",
"defaultLang": "zh-CN",
"WXAppID": "",
"WXminiAppID": "",
@@ -17,6 +17,6 @@
"transfer": "false",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "http://demo.mk9h.cn",
- "service": "erp_new/"
+ "host": "http://qingqiumarket.cn",
+ "service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 87567ec..aac9321 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -134,7 +134,7 @@
}, 200)
}
- if (_config.wrap.datatype === 'dynamic') {
+ if (_config.wrap.datatype === 'dynamic' && this.loaded) {
this.autoExec()
}
if (!_config.wrap.cardType && _data.$$uuid) {
@@ -252,10 +252,10 @@
autoExec = () => {
const { config, data } = this.state
- if (!config.wrap.autoExec || data.$$empty) return
+ if (!config.wrap.autoExec) return
setTimeout(() => {
- MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [data])
+ MKEmitter.emit('triggerBtnId', config.wrap.autoExec, data.$$empty ? [] : [data])
}, 200)
}
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 24144ed..29ac925 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1453,6 +1453,14 @@
sql = _prevCustomScript + sql
sql = sql + _backCustomScript
+ sql = sql.replace(/@ID@/ig, `'${record.ID || ''}'`)
+ sql = sql.replace(/@BID@/ig, `'${this.props.BID || ''}'`)
+ sql = sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ sql = sql.replace(/@typename@/ig, `'admin'`)
+
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
}
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 445b601..b68d21f 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -449,17 +449,19 @@
item.options = item.oriOptions.filter(option => option.ParentID === item.supInitVal || option.value === '')
}
- if (['select', 'link', 'radio'].includes(item.type) && item.resourceType === '0') { // 閫変腑绗竴椤�
+ if (['select', 'link', 'radio'].includes(item.type)) { // 閫変腑绗竴椤�
if (typeof(item.initval) === 'string' && item.initval.indexOf('$first') > -1) {
- item.initval = item.options[0] ? item.options[0].value : ''
+ item.$first = true
+ item.initval = ''
+ }
+ if (item.resourceType === '0') { // 閫変腑绗竴椤�
+ if (item.$first) {
+ item.initval = item.options[0] ? item.options[0].value : ''
+ }
}
}
- if (typeof(item.initval) === 'string' && item.initval.indexOf('$first') > -1) {
- record[item.field] = ''
- } else {
- record[item.field] = item.initval
- }
+ record[item.field] = item.initval
if (linkFields[item.field]) {
item.linkFields = linkFields[item.field]
@@ -784,7 +786,7 @@
item.options = item.oriOptions
}
- if (['select', 'link', 'radio'].includes(item.type) && typeof(item.initval) === 'string' && item.initval.indexOf('$first') > -1) { // 閫変腑绗竴椤�
+ if (['select', 'link', 'radio'].includes(item.type) && item.$first) { // 閫変腑绗竴椤�
item.initval = item.options[0] ? item.options[0].value : ''
this.record[item.field] = item.initval
}
diff --git a/src/tabviews/zshare/mutilform/mkRadio/index.jsx b/src/tabviews/zshare/mutilform/mkRadio/index.jsx
index 9bb5800..a541852 100644
--- a/src/tabviews/zshare/mutilform/mkRadio/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkRadio/index.jsx
@@ -52,7 +52,7 @@
options: fromJS(nextProps.config.options).toJS()
})
- if (typeof(config.initval) === 'string' && config.initval.indexOf('$first') > -1) {
+ if (config.$first) {
this.setState({
value: nextProps.config.initval,
})
diff --git a/src/tabviews/zshare/mutilform/mkSelect/index.jsx b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
index 821fb89..c46e4ed 100644
--- a/src/tabviews/zshare/mutilform/mkSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkSelect/index.jsx
@@ -57,7 +57,7 @@
options: fromJS(nextProps.config.options).toJS()
})
- if (typeof(config.initval) === 'string' && config.initval.indexOf('$first') > -1) {
+ if (config.$first) {
this.setState({
value: nextProps.config.initval,
})
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 3d8f378..87f5cee 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -429,6 +429,9 @@
if (item.wrap.datatype === 'public' && item.wrap.publicId) {
item.wrap.publicId = md5(commonId + item.wrap.publicId)
}
+ if (item.wrap.autoExec) {
+ item.wrap.autoExec = md5(commonId + item.wrap.autoExec)
+ }
if (item.supNodes && item.supNodes.length > 0) {
item.supNodes = item.supNodes.map(cell => {
@@ -729,6 +732,10 @@
return cell
})
} else if (['card', 'carousel', 'timeline'].includes(item.type)) {
+ if (item.wrap.autoExec) {
+ item.wrap.autoExec = md5(commonId + item.wrap.autoExec)
+ }
+
item.subcards.forEach(card => {
card.uuid = this.getuuid()
--
Gitblit v1.8.0