From da9608ab2465b980ffe22ae64f44a1dffe9169f9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 六月 2022 12:27:05 +0800
Subject: [PATCH] 2022-06-21
---
public/options.json | 2
src/mob/components/formdragelement/card.jsx | 2
src/tabviews/zshare/mutilform/index.jsx | 10 ++++-
src/mob/components/formdragelement/index.scss | 10 +++++
src/views/appmanage/index.jsx | 2
src/views/appmanage/submutilform/index.scss | 20 ++++++++++
src/tabviews/zshare/topSearch/index.jsx | 2 +
public/README.txt | 2
src/templates/modalconfig/dragelement/card.jsx | 2
src/views/appmanage/submutilform/index.jsx | 30 +++++++-------
src/utils/option.js | 1
11 files changed, 60 insertions(+), 23 deletions(-)
diff --git a/public/README.txt b/public/README.txt
index c2b7797..6079784 100644
--- a/public/README.txt
+++ b/public/README.txt
@@ -14,4 +14,4 @@
licenseKey -- 璁稿彲瀵嗛挜锛屽湪鍐呴儴缃戠粶涓娇鐢ㄧ郴缁熸椂锛屼細璺宠繃epc楠岃瘉
probation -- 璇曠敤鏈燂紙YYYY-MM-DD锛夛紝鍦ㄦ寮忕郴缁熶腑锛岃瘯鐢ㄦ湡鍐呰皟鐢ㄧ郴缁熸帴鍙ｇ殑鑴氭湰浼氳褰曚笅鏉�
keepPassword -- 璁颁綇瀵嗙爜锛岄粯璁ゅ紑鍚紝褰撳�间负"false"鏃剁鐢�
-platforms -- 绉诲姩绔彲浣跨敤鐨勫钩鍙扮被鍨嬶紝榛樿涓� ["H5", "wechat", "android", "ios"] 鍒嗗埆浠ｈ〃H5椤甸潰銆佸井淇″叕浼楀彿銆佸畨鍗揂PP銆佽嫻鏋淎PP
\ No newline at end of file
+platforms -- 绉诲姩绔彲浣跨敤鐨勫钩鍙扮被鍨嬶紝榛樿涓� ["H5", "wechat", "android", "ios", "wxMiniProgram"] 鍒嗗埆浠ｈ〃H5椤甸潰銆佸井淇″叕浼楀彿銆佸畨鍗揂PP銆佽嫻鏋淎PP銆佸井淇″皬绋嬪簭
\ No newline at end of file
diff --git a/public/options.json b/public/options.json
index 2b6d9b6..32d0ee7 100644
--- a/public/options.json
+++ b/public/options.json
@@ -13,7 +13,7 @@
"licenseKey": "",
"probation": "",
"keepPassword": "true",
- "platforms": ["H5", "wechat", "android", "ios"],
+ "platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
"host": "http://qingqiumarket.cn",
"service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index 99a1ba7..d5b19be 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -193,7 +193,7 @@
</div>
</div>
} else if (card.type === 'formula') {
- formItem = <div className="am-list-item hint">
+ formItem = <div className="am-list-item formula">
<div className="am-list-line">
<div className="am-input-label">{card.label}</div>
<div className="am-input-control">
diff --git a/src/mob/components/formdragelement/index.scss b/src/mob/components/formdragelement/index.scss
index 920d95e..436e4e2 100644
--- a/src/mob/components/formdragelement/index.scss
+++ b/src/mob/components/formdragelement/index.scss
@@ -138,6 +138,16 @@
}
}
}
+ .am-list-item.formula {
+ .am-list-line {
+ .am-input-control {
+ font-size: inherit;
+ font-weight: inherit;
+ color: inherit;
+ padding-right: 0px;
+ }
+ }
+ }
.am-list-item.checkbox {
height: auto;
.am-list-line {
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 2469c8d..446297d 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -229,7 +229,10 @@
}
let _rules = [{
pattern: /^[^']*$/ig,
- message: formRule.input.quotemsg
+ message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
+ }, {
+ pattern: /^[^--]*$/ig,
+ message: '涓嶅彲浣跨敤 -- 锛�'
}, {
required: item.required === 'true',
message: item.label + '涓嶅彲涓虹┖!'
@@ -298,7 +301,10 @@
if (item.encryption !== 'true') {
_rules.push({
pattern: /^[^']*$/ig,
- message: formRule.input.quotemsg
+ message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
+ }, {
+ pattern: /^[^--]*$/ig,
+ message: '涓嶅彲浣跨敤 -- 锛�'
})
}
item.rules = _rules
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 50ba721..58e1ba7 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -661,6 +661,8 @@
} else if (type === 'text' && !error) {
if (/'/ig.test(val)) {
error = `鎼滅储鏉′欢${item.label}涓紝涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙枫�俙
+ } else if (/--/ig.test(val)) {
+ error = `鎼滅储鏉′欢${item.label}涓紝涓嶅彲浣跨敤 -- 銆俙
} else if (/(^|\s)select\s/ig.test(val)) {
error = `鎼滅储鏉′欢${item.label}涓紝涓嶅彲浣跨敤鍏抽敭瀛梥elect銆俙
} else if (/\sfrom(\s|\()/ig.test(val)) {
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index 7871391..ad0d358 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -130,7 +130,7 @@
<Checkbox value="D">D</Checkbox>
</Checkbox.Group>)
} else if (card.type === 'hint') {
- formItem = <div style={{marginTop: '10px', color: 'rgba(0, 0, 0, 0.85)', lineHeight: '1.5', ...card.style}}>{card.message}</div>
+ formItem = <div style={{marginTop: '8px', color: 'rgba(0, 0, 0, 0.85)', lineHeight: '1.5', ...card.style}}>{card.message}</div>
} else if (card.type === 'formula') {
formItem = <div style={{marginTop: '8px', color: 'rgba(0, 0, 0, 0.85)', lineHeight: '1.5', ...card.style}}>{card.formula}{card.postfix || ''}</div>
} else if (card.type === 'split') {
diff --git a/src/utils/option.js b/src/utils/option.js
index 81244bb..3a893d3 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -17,7 +17,6 @@
formMessage: '鏈�澶欯max涓瓧绗︺��', // 鏂囨湰琛ㄥ崟鏈�澶ф彁绀�
numbermsg: '璇疯緭鍏ユ暟瀛楋紒',
lettermsg: '璇疯緭鍏ュ瓧姣嶏紒',
- quotemsg: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒',
funcname: '璇疯緭鍏ユ暟瀛椼�佸瓧姣嶃�佹眽瀛椾互鍙奯'
},
field: { // 瀛楁鍚�
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index bfff01d..7e3734a 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -1238,7 +1238,7 @@
<ScriptForm applist={applist} wrappedComponentRef={(inst) => this.scriptRef = inst} inputSubmit={this.submitScript} />
</Modal>
<Modal
- title={'缂栬緫瀛愬簲鐢�'}
+ title={subVisible === 'plus' ? '娣诲姞瀛愬簲鐢�' : '缂栬緫瀛愬簲鐢�'}
width={'850px'}
maskClosable={false}
visible={subVisible !== false}
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index 168c371..59809f0 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -138,20 +138,20 @@
initialValue: card ? card.css : 'bg_black_style_blue'
})(
<Select>
- <Select.Option value="bg_black_style_blue">钃濊壊</Select.Option>
- <Select.Option value="bg_black_style_red">绾㈣壊</Select.Option>
- <Select.Option value="bg_black_style_orange_red">姗欑孩鑹�</Select.Option>
- <Select.Option value="bg_black_style_orange">姗欒壊</Select.Option>
- <Select.Option value="bg_black_style_orange_yellow">姗欓粍鑹�</Select.Option>
- <Select.Option value="bg_black_style_yellow">榛勮壊</Select.Option>
- <Select.Option value="bg_black_style_yellow_green">榛勭豢鑹�</Select.Option>
- <Select.Option value="bg_black_style_green">缁胯壊</Select.Option>
- <Select.Option value="bg_black_style_cyan">闈掕壊</Select.Option>
- <Select.Option value="bg_black_style_blue_purple">钃濈传鑹�</Select.Option>
- <Select.Option value="bg_black_style_purple">绱壊</Select.Option>
- <Select.Option value="bg_black_style_magenta">娲嬬孩鑹�</Select.Option>
- <Select.Option value="bg_black_style_grass_green">鑽夌豢鑹�</Select.Option>
- <Select.Option value="bg_black_style_deep_red">娣辩孩鑹�</Select.Option>
+ <Select.Option value="bg_black_style_blue"><span className="color-block" style={{background: '#1890ff'}}></span>钃濊壊</Select.Option>
+ <Select.Option value="bg_black_style_red"><span className="color-block" style={{background: '#f5222d'}}></span>绾㈣壊</Select.Option>
+ <Select.Option value="bg_black_style_orange_red"><span className="color-block" style={{background: '#fa541c'}}></span>姗欑孩鑹�</Select.Option>
+ <Select.Option value="bg_black_style_orange"><span className="color-block" style={{background: '#fa8c16'}}></span>姗欒壊</Select.Option>
+ <Select.Option value="bg_black_style_orange_yellow"><span className="color-block" style={{background: '#faad14'}}></span>姗欓粍鑹�</Select.Option>
+ <Select.Option value="bg_black_style_yellow"><span className="color-block" style={{background: '#fadb14'}}></span>榛勮壊</Select.Option>
+ <Select.Option value="bg_black_style_yellow_green"><span className="color-block" style={{background: '#a0d911'}}></span>榛勭豢鑹�</Select.Option>
+ <Select.Option value="bg_black_style_green"><span className="color-block" style={{background: '#52c41a'}}></span>缁胯壊</Select.Option>
+ <Select.Option value="bg_black_style_cyan"><span className="color-block" style={{background: '#13c2c2'}}></span>闈掕壊</Select.Option>
+ <Select.Option value="bg_black_style_blue_purple"><span className="color-block" style={{background: '#2f54eb'}}></span>钃濈传鑹�</Select.Option>
+ <Select.Option value="bg_black_style_purple"><span className="color-block" style={{background: '#722ed1'}}></span>绱壊</Select.Option>
+ <Select.Option value="bg_black_style_magenta"><span className="color-block" style={{background: '#eb2f96'}}></span>娲嬬孩鑹�</Select.Option>
+ <Select.Option value="bg_black_style_grass_green"><span className="color-block" style={{background: '#aeb303'}}></span>鑽夌豢鑹�</Select.Option>
+ <Select.Option value="bg_black_style_deep_red"><span className="color-block" style={{background: '#c32539'}}></span>娣辩孩鑹�</Select.Option>
</Select>
)}
</Form.Item>
@@ -287,7 +287,7 @@
</Tooltip>
}>
{getFieldDecorator('delay', {
- initialValue: card ? card.delay || 0 : 0
+ initialValue: card ? card.delay || 0 : 200
})(<InputNumber min={0} max={5000} precision={0} onPressEnter={this.handleSubmit}/>)}
</Form.Item>
</Col> : null}
diff --git a/src/views/appmanage/submutilform/index.scss b/src/views/appmanage/submutilform/index.scss
index 7b121c8..3bed946 100644
--- a/src/views/appmanage/submutilform/index.scss
+++ b/src/views/appmanage/submutilform/index.scss
@@ -20,4 +20,24 @@
padding-top: 7px;
}
}
+ .color-block {
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ margin-right: 5px;
+ vertical-align: middle;
+ position: relative;
+ top: -2px;
+ }
+}
+.ant-select-dropdown {
+ .color-block {
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ margin-right: 5px;
+ vertical-align: middle;
+ position: relative;
+ top: -2px;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0