From c547c75fce3c2d9badcb496da7d8e5443e22dbfc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 八月 2024 17:10:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/utils-datamanage.js | 14 +-
src/tabviews/zshare/actionList/funcbutton/index.jsx | 4
src/tabviews/zshare/topSearch/index.jsx | 4
public/options.json | 2
src/tabviews/custom/popview/index.jsx | 2
src/tabviews/basetable/index.jsx | 2
src/api/index.js | 2
src/tabviews/custom/components/module/invoice/index.jsx | 6
src/tabviews/custom/components/share/normalTable/index.jsx | 2
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 4
src/views/billprint/index.jsx | 4
src/tabviews/zshare/actionList/normalbutton/index.jsx | 8 +-
public/README.txt | 4
src/views/mobdesign/index.jsx | 4 +
src/menu/datasource/verifycard/index.jsx | 2
src/utils/utils.js | 12 +-
src/index.js | 30 +++++++
src/tabviews/custom/components/card/cardcellList/index.jsx | 4
public/index.html | 4 +
src/views/interface/workspace/request/index.jsx | 4
public/manifest.json | 2
src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx | 4
src/menu/datasource/verifycard/settingform/index.jsx | 12 +++
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 8 +-
src/tabviews/zshare/actionList/printbutton/index.jsx | 4
src/tabviews/zshare/mutilform/mkPopSelect/index.jsx | 4
src/tabviews/zshare/mutilform/index.jsx | 6
src/tabviews/custom/index.jsx | 4
src/views/appmanage/index.jsx | 2
src/menu/debug/index.jsx | 10 +
src/views/appmanage/submutilform/index.jsx | 15 +++
31 files changed, 128 insertions(+), 61 deletions(-)
diff --git a/public/README.txt b/public/README.txt
index e4607b2..797760b 100644
--- a/public/README.txt
+++ b/public/README.txt
@@ -16,6 +16,7 @@
WXApps -- 瀛樺湪澶氫釜鍏紬鍙枫�佸皬绋嬪簭鎴栧晢鎴锋椂鍙娇鐢ㄥ井淇PP鍒楄〃锛屾敞鎰忓～鍐欓粯璁ゅ叕浼楀彿銆佸皬绋嬪簭涓庡晢鎴峰彿锛屾牸寮� [{"appId": "", "appName": "", "appType": "public/miniProgram/merchant"}]
nginx -- 鏄惁寮�鍚簡nginx鏈嶅姟锛屽�间负 true 鏃跺紑鍚紝濡傞渶浣跨敤寰俊妯℃澘娑堟伅绛夋湇鍔★紝璇峰厛璁剧疆nginx鏈嶅姟骞跺紑鍚閰嶇疆
debugger -- 鍊间负 true 鏃跺紑鍚皟璇曟ā寮忥紝寮�鍚悗绉诲姩绔瓙搴旂敤涓細鏈夋帶鍒跺彴
+devTools -- 鍊间负 false 鏃朵笉鍏佽浣跨敤璋冭瘯妯″紡
licenseKey -- 璁稿彲瀵嗛挜锛屽湪鍐呴儴缃戠粶涓娇鐢ㄧ郴缁熸椂锛屼細璺宠繃epc楠岃瘉
storeKey -- 鐢靛瓙妗ｆ鏈湴鎺堟潈鐮侊紝浣跨敤鏈湴璁稿彲瀵嗛挜鏃舵湁鏁�
probation -- 璇曠敤鏈燂紙YYYY-MM-DD锛夛紝鍦ㄦ寮忕郴缁熶腑锛岃瘯鐢ㄦ湡鍐呰皟鐢ㄧ郴缁熸帴鍙ｇ殑鑴氭湰浼氳褰曚笅鏉�
@@ -23,5 +24,4 @@
keepPassword -- 璁颁綇瀵嗙爜锛岄粯璁ゅ紑鍚紝褰撳�间负 false 鏃剁鐢�
execType -- 鑴氭湰浼犺緭鏂瑰紡锛屽�间负x鏃讹紝鍚敤AES鍔犲瘑
updateStatus -- 鏄惁鏇存柊寮�鍙戠姸鎬侊紝榛樿寮�鍚紝褰撳�间负 false 鏃剁鐢�
-forcedUpdate -- 浼犺緭鍙峰崌绾ф椂锛屾槸鍚﹁嚜鍔ㄩ��鍑猴紝鏍煎紡涓猴紙YYYY-MM-DD锛夛紝鐢ㄤ簬鍗囩骇鍚庡埛鏂扮敤鎴锋湰鍦伴厤缃�
-platforms -- 绉诲姩绔彲浣跨敤鐨勫钩鍙扮被鍨嬶紝榛樿涓� ["H5", "wechat", "android", "ios", "wxMiniProgram"] 鍒嗗埆浠ｈ〃H5椤甸潰銆佸井淇″叕浼楀彿銆佸畨鍗揂PP銆佽嫻鏋淎PP銆佸井淇″皬绋嬪簭
\ No newline at end of file
+forcedUpdate -- 浼犺緭鍙峰崌绾ф椂锛屾槸鍚﹁嚜鍔ㄩ��鍑猴紝鏍煎紡涓猴紙YYYY-MM-DD锛夛紝鐢ㄤ簬鍗囩骇鍚庡埛鏂扮敤鎴锋湰鍦伴厤缃�
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 3da241a..7719992 100644
--- a/public/index.html
+++ b/public/index.html
@@ -58,6 +58,10 @@
}
})
}
+
+ window.mkInfo = function(value, color = '') {
+ console.info(value, color)
+ }
</script>
</head>
<body>
diff --git a/public/manifest.json b/public/manifest.json
index 425eba5..d252b77 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -6,5 +6,5 @@
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff",
- "mk_version": "20240701"
+ "mk_version": "20240801"
}
diff --git a/public/options.json b/public/options.json
index 8a77372..65dcc59 100644
--- a/public/options.json
+++ b/public/options.json
@@ -14,13 +14,13 @@
"WXNotice": "true",
"nginx": "true",
"debugger": false,
+ "devTools": true,
"licenseKey": "",
"storeKey": "",
"probation": "",
"transfer": "false",
"keepPassword": "true",
"execType": "x",
- "platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
"host": "http://qingqiumarket.cn",
"service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/api/index.js b/src/api/index.js
index 3717fe7..7d3ae5f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1102,7 +1102,7 @@
sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
}
- console.info(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
+ window.mkInfo(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
sql = sql.replace(/\n/ig, ' ')
diff --git a/src/index.js b/src/index.js
index f25a249..ff118aa 100644
--- a/src/index.js
+++ b/src/index.js
@@ -343,6 +343,35 @@
GLOB.memberLevel = 0
}
+ if (config.devTools === false) {
+ sessionStorage.removeItem('breakpoint')
+ GLOB.debugger = false
+
+ let getVal = () => {
+ let _i = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight
+ let _h = window.outerHeight - _i - 200
+ let _w = window.outerWidth - window.innerWidth - 100
+
+ return Math.max(_h, _w)
+ }
+
+ if (getVal() > 0) {
+ document.body.innerHTML = '<div style="text-align: center; font-size: 30px; padding-top: 40vh;">鏈郴缁熺姝娇鐢ㄦ帶鍒跺彴锛岃鍏抽棴鎺у埗鍙伴噸鏂板埛鏂帮紒</div>'
+ return
+ } else {
+ let timer = null
+ window.addEventListener('resize', () => {
+ timer && clearTimeout(timer)
+
+ if (getVal() > 0) {
+ timer = setTimeout(() => {
+ document.body.innerHTML = '<div style="text-align: center; font-size: 30px; padding-top: 40vh;">鏈郴缁熺姝娇鐢ㄦ帶鍒跺彴锛岃鍏抽棴鎺у埗鍙伴噸鏂板埛鏂帮紒</div>'
+ }, 100)
+ }
+ })
+ }
+ }
+
if (GLOB.sysType === 'cloud') {
Object.defineProperty(GLOB, 'debugger', {
writable: false,
@@ -385,7 +414,6 @@
document.getElementById('root')
)
}
-
})
serviceWorker.unregister()
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index b59417f..c7078db 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -985,7 +985,7 @@
})
if (window.debugger) {
- console.info('select ' + s.join(', '))
+ window.mkInfo('select ' + s.join(', '))
}
let extend = ''
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index bb68f55..56093f1 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -691,6 +691,18 @@
)}
</Form.Item>
</Col> : null}
+ {setting.onload !== 'false' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鍙欢杩熷垵濮嬪寲鏁版嵁鐨勫姞杞芥椂闂达紝鍗曚綅姣锛坢s锛夈��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 寤舵椂鍔犺浇
+ </Tooltip>
+ }>
+ {getFieldDecorator('delay', {
+ initialValue: setting.delay,
+ })(<InputNumber min={0} max={60000} precision={0} />)}
+ </Form.Item>
+ </Col> : null}
</Row>
</Form>
<Modal
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index 91caad6..3b440ad 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -720,8 +720,10 @@
_item.type = 'text'
} else if (_item.type === 'number' || _item.type === 'rate') {
_item.fieldlen = item.decimal || 0
- } else if (_item.type === 'date') {
+ } else if (_item.type === 'date') {
_item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ } else if (_item.type === 'datetime') {
+ _item.type = 'date'
} else if (item.declare === 'decimal') {
_item.type = 'number'
_item.fieldlen = item.decimal || 0
@@ -767,8 +769,10 @@
_item.type = 'text'
} else if (_item.type === 'number' || _item.type === 'rate') {
_item.fieldlen = item.decimal || 0
- } else if (_item.type === 'date') {
+ } else if (_item.type === 'date') {
_item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ } else if (_item.type === 'datetime') {
+ _item.type = 'date'
} else if (item.declare === 'decimal') {
_item.type = 'number'
_item.fieldlen = item.decimal || 0
@@ -2199,7 +2203,7 @@
this.setState({status: this.verSqls.length > 0 ? 'loading' : 'over', execId: item.uuid})
- console.info(`/* 缁勪欢锛�${item.name} 妫�楠岄」锛�${item.label} */`)
+ window.mkInfo(`/* 缁勪欢锛�${item.name} 妫�楠岄」锛�${item.label} */`)
Api.sDebug(item.sql).then(result => {
if (result.status || result.ErrCode === '-2') {
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index ea98f50..49e94b0 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -679,7 +679,7 @@
component.forbidLine = true
}
- component.setting.delay = delay
+ component.setting.delay = delay + (component.setting.delay || 0)
delay += 20
return component
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 6c25c60..f585b93 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -944,7 +944,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = 0
}
@@ -994,7 +994,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = ''
}
diff --git a/src/tabviews/custom/components/module/invoice/index.jsx b/src/tabviews/custom/components/module/invoice/index.jsx
index 1575193..06fe3f8 100644
--- a/src/tabviews/custom/components/module/invoice/index.jsx
+++ b/src/tabviews/custom/components/module/invoice/index.jsx
@@ -728,7 +728,7 @@
}
if (window.GLOB.debugger === true) {
- console.info(sql.replace(/\n\s{6}/ig, '\n'))
+ window.mkInfo(sql.replace(/\n\s{6}/ig, '\n'))
}
return sql
@@ -968,8 +968,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + config.name + '(鍥炶皟)', 'color: blue')
- console.info(sql.replace(/\n\s{8}/ig, '\n'))
+ window.mkInfo('%c' + config.name + '(鍥炶皟)', 'color: blue')
+ window.mkInfo(sql.replace(/\n\s{8}/ig, '\n'))
}
param.LText = sql
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 6ef27dd..9631dcc 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -428,7 +428,7 @@
content = ''
}
} catch (e) {
- console.info(content)
+ window.mkInfo(content)
console.warn(e)
content = ''
}
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 9529a8e..40cc3e9 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -956,7 +956,7 @@
// eslint-disable-next-line
content = eval(content)
} catch (e) {
- console.info(content)
+ window.mkInfo(content)
console.warn(e)
content = ''
}
@@ -1275,7 +1275,7 @@
// eslint-disable-next-line
content = eval(content)
} catch (e) {
- console.info(content)
+ window.mkInfo(content)
console.warn(e)
content = ''
}
@@ -1892,7 +1892,7 @@
sql = sql.replace(/@BID@/ig, `'${BID}'`)
if (debug) {
- console.info(sql)
+ window.mkInfo(sql)
}
sql = sql.replace(/%/ig, ' mpercent ')
@@ -1905,7 +1905,7 @@
sql = sql.replace(/@BID@/ig, `'${BID}'`)
if (debug) {
- console.info(sql)
+ window.mkInfo(sql)
}
sql = sql.replace(/%/ig, ' mpercent ')
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
index d74157b..6493202 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
@@ -84,8 +84,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- console.info(`/*${config.label} 鏁版嵁婧�*/\n` + sql.replace(/\n\s{6}/ig, '\n'))
- DateCount && console.info(`/*${config.label} 鎬绘暟鏌ヨ*/\n` + DateCount.replace(/\n\s{6}/ig, '\n'))
+ window.mkInfo(`/*${config.label} 鏁版嵁婧�*/\n` + sql.replace(/\n\s{6}/ig, '\n'))
+ DateCount && window.mkInfo(`/*${config.label} 鎬绘暟鏌ヨ*/\n` + DateCount.replace(/\n\s{6}/ig, '\n'))
}
param.LText = Utils.formatOptions(sql, param.exec_type)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index b3f0872..b16ea86 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -1234,7 +1234,7 @@
}
}
- component.setting.delay = delay
+ component.setting.delay = delay + (component.setting.delay || 0)
delay += 20
return component
@@ -1260,7 +1260,7 @@
let delay = 15
return interfaces.map(inter => {
inter.MenuID = MenuID
- inter.setting.delay = delay
+ inter.setting.delay = delay + (inter.setting.delay || 0)
inter.$searchId = MenuID
delay += 15
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 1b097d4..9fbcb3a 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -912,7 +912,7 @@
}
}
- component.setting.delay = delay
+ component.setting.delay = delay + (component.setting.delay || 0)
delay += 20
return component
diff --git a/src/tabviews/zshare/actionList/funcbutton/index.jsx b/src/tabviews/zshare/actionList/funcbutton/index.jsx
index 53fc63a..251ecff 100644
--- a/src/tabviews/zshare/actionList/funcbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/funcbutton/index.jsx
@@ -348,8 +348,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(_sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(_sql)
}
return _sql
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index a3ca370..943d8a9 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -516,8 +516,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(_sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(_sql)
}
return _sql
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index b1555d2..be2ee38 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1344,7 +1344,7 @@
// Api.directRequest('http://localhost:3001/test.xml', 'get', null, 'true').then(res => {
// let $x2js = new x2js()
// let jsonObj = $x2js.xml2js(res);
- // console.info(jsonObj)
+ // window.mkInfo(jsonObj)
// })
/**
@@ -1731,8 +1731,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel + '(鍥炶皟)', 'color: blue')
- console.info(sql.replace(/\n\s{8}/ig, '\n'))
+ window.mkInfo('%c' + btn.logLabel + '(鍥炶皟)', 'color: blue')
+ window.mkInfo(sql.replace(/\n\s{8}/ig, '\n'))
}
param.LText = sql
@@ -1766,7 +1766,7 @@
`)}
`))
sql = sql.join('')
- console.info(sql.replace(/\n\s{10}/ig, '\n'))
+ window.mkInfo(sql.replace(/\n\s{10}/ig, '\n'))
}
}
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index c27c005..34e1669 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -1160,8 +1160,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- _customScript && console.info(`${btn.logLabel ? `/*${btn.logLabel} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.info(`${btn.logLabel ? `/*${btn.logLabel} 鏁版嵁婧�*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
+ _customScript && window.mkInfo(`${btn.logLabel ? `/*${btn.logLabel} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && window.mkInfo(`${btn.logLabel ? `/*${btn.logLabel} 鏁版嵁婧�*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
}
if (btn.logLabel) {
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 2558a9c..d92f54b7 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -873,7 +873,7 @@
sql = sql.replace(/@BID@/ig, `'${BID}'`)
if (window.GLOB.debugger === true) {
- console.info(sql)
+ window.mkInfo(sql)
}
sql = sql.replace(/%/ig, ' mpercent ')
@@ -887,7 +887,7 @@
sql = sql.replace(/@BID@/ig, `'${BID}'`)
if (window.GLOB.debugger === true) {
- console.info(sql)
+ window.mkInfo(sql)
}
sql = sql.replace(/%/ig, ' mpercent ')
@@ -1011,7 +1011,7 @@
param.LText = param.LText.replace(/@BID@/ig, `'${this.props.BID || ''}'`)
if (window.GLOB.debugger) {
- console.info(param.LText)
+ window.mkInfo(param.LText)
}
if (window.GLOB.execType === 'x') {
diff --git a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
index 4d3b9a4..4099ef3 100644
--- a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
@@ -164,8 +164,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- console.info(`/*${config.label} 鏁版嵁婧�*/\n` + sql.replace(/\n\s{6}/ig, '\n'))
- DateCount && console.info(`/*${config.label} 鎬绘暟鏌ヨ*/\n` + DateCount.replace(/\n\s{6}/ig, '\n'))
+ window.mkInfo(`/*${config.label} 鏁版嵁婧�*/\n` + sql.replace(/\n\s{6}/ig, '\n'))
+ DateCount && window.mkInfo(`/*${config.label} 鎬绘暟鏌ヨ*/\n` + DateCount.replace(/\n\s{6}/ig, '\n'))
}
param.LText = Utils.formatOptions(sql, param.exec_type)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index f169891..032ca25 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -203,7 +203,7 @@
let _sql = _option.sql.replace(/@BID@/ig, `'${BID || ''}'`)
if (window.GLOB.debugger === true) {
- console.info(_declare + _sql)
+ window.mkInfo(_declare + _sql)
}
// 娴嬭瘯绯荤粺鍗曚釜璇锋眰
@@ -342,7 +342,7 @@
let sql = item.sql.replace(/@BID@/ig, `'${BID || ''}'`)
if (window.GLOB.debugger === true) {
- console.info(sql)
+ window.mkInfo(sql)
}
deForms.push({
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 0415658..26f08c9 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -280,9 +280,9 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
- DateCount && console.info(`${setting.$name ? `/*${setting.$name} 鎬绘暟鏌ヨ*/\n` : ''}` + DateCount.replace(/\n\s{8}/ig, '\n'))
+ _customScript && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
+ DateCount && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鎬绘暟鏌ヨ*/\n` : ''}` + DateCount.replace(/\n\s{8}/ig, '\n'))
}
if (setting.$name) {
@@ -419,8 +419,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- _customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈� 缁熻鏌ヨ*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧� 缁熻鏌ヨ*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
+ _customScript && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈� 缁熻鏌ヨ*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ LText && window.mkInfo(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧� 缁熻鏌ヨ*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
}
if (setting.$name) {
@@ -606,8 +606,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- _script && console.info(`${item.$name ? `/*${item.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_sql ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_script}`)
- _sql && console.info(`${item.$name ? `/*${item.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _sql)
+ _script && window.mkInfo(`${item.$name ? `/*${item.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_sql ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_script}`)
+ _sql && window.mkInfo(`${item.$name ? `/*${item.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _sql)
}
item.columns.forEach(cell => {
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2b7f1d6..35fb3a8 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1340,8 +1340,8 @@
sql = sql.replace(/\n\s{6}/ig, '\n')
if (window.GLOB.debugger === true) {
- console.info('%c' + item.logLabel, 'color: blue')
- console.info(sql)
+ window.mkInfo('%c' + item.logLabel, 'color: blue')
+ window.mkInfo(sql)
}
} else {
for(let i = 0; i < _Ltext.length; i += 20) {
@@ -1585,8 +1585,8 @@
sql = sql.replace(/\n\s{6}/ig, '\n')
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(sql)
}
} else {
for(let i = 0; i < _Ltext.length; i += 20) {
@@ -2701,8 +2701,8 @@
}
if (window.GLOB.debugger === true) {
- console.info('%c' + btn.logLabel, 'color: blue')
- console.info(_sql)
+ window.mkInfo('%c' + btn.logLabel, 'color: blue')
+ window.mkInfo(_sql)
}
if (retmsg) {
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index 4cfee37..92426bc 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -1353,7 +1353,7 @@
</Modal>
<Modal
title={subVisible === 'plus' ? '娣诲姞瀛愬簲鐢�' : '缂栬緫瀛愬簲鐢�'}
- width={'850px'}
+ width={'970px'}
maskClosable={false}
visible={subVisible !== false}
onCancel={() => this.setState({subVisible: false, confirmloading: false})}
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index cef73e2..369b47f 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -39,6 +39,12 @@
typename = card.typename || 'mob'
adapters = card.adapter ? card.adapter.split(',') : []
+ if (!adapters.includes('fbdH5')) {
+ adapters.unshift('H5')
+ }
+
+ adapters = adapters.filter(n => n !== 'fbdH5')
+
if (typename !== 'pc') {
if (card.user_binding === 'true') {
exts.push('user_binding')
@@ -47,6 +53,8 @@
exts.push('share')
}
}
+ } else {
+ adapters = ['H5']
}
let WXApps = null
@@ -74,6 +82,12 @@
return new Promise(resolve => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
+ if (values.adapter) {
+ if (!values.adapter.includes('H5')) {
+ values.adapter.unshift('fbdH5')
+ }
+ }
+
values.adapter = values.adapter ? values.adapter.join(',') : ''
if (values.exts) {
@@ -196,6 +210,7 @@
initialValue: adapters
})(
<Checkbox.Group onChange={this.onAdapterChange}>
+ <Checkbox value="H5">H5</Checkbox>
<Checkbox value="app">app</Checkbox>
<Checkbox value="weixin">鍏紬鍙�</Checkbox>
<Checkbox value="wxmini">灏忕▼搴�</Checkbox>
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 9346380..1969680 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -838,8 +838,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if (window.GLOB.debugger === true) {
- _script && console.info(`${_sql ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_script}`)
- _sql && console.info(_sql)
+ _script && window.mkInfo(`${_sql ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_script}`)
+ _sql && window.mkInfo(_sql)
}
item.columns.forEach(cell => {
diff --git a/src/views/interface/workspace/request/index.jsx b/src/views/interface/workspace/request/index.jsx
index c93b196..a73885e 100644
--- a/src/views/interface/workspace/request/index.jsx
+++ b/src/views/interface/workspace/request/index.jsx
@@ -226,8 +226,8 @@
param.sign = md5(values)
param.t = param.t || new Date().getTime()
- console.info(values)
- console.info(param.sign)
+ window.mkInfo(values)
+ window.mkInfo(param.sign)
return param
}
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index ebeda0b..e466da9 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1325,6 +1325,7 @@
let traversal = (components) => {
return components.map(item => {
+ item.miniStyle = ''
if (item.style) {
item.miniStyle = this.transferStyle(item.style)
}
@@ -1340,6 +1341,9 @@
}
if (item.type === 'tabs') {
+ if (item.setting.backgroundColor) {
+ item.miniStyle += `--tabs-header-background: ${item.setting.backgroundColor};`
+ }
item.subtabs.forEach(tab => {
tab.components = traversal(tab.components)
})
--
Gitblit v1.8.0