From d1f19b794216b37417e114b71c1cd7a2ac3d7748 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 三月 2023 01:14:29 +0800
Subject: [PATCH] 2023-03-02
---
src/tabviews/zshare/mutilform/mkInput/index.scss | 2
src/templates/zshare/modalform/index.jsx | 2
src/tabviews/custom/components/form/tab-form/index.scss | 2
src/tabviews/custom/components/module/account/index.jsx | 6
src/menu/components/form/tab-form/index.scss | 1
src/mob/components/topbar/normal-navbar/options.jsx | 9 ++
src/menu/components/form/dragtitle/index.jsx | 3
src/menu/components/card/balcony/index.scss | 7 +
src/tabviews/custom/components/form/step-form/index.scss | 2
src/menu/components/form/step-form/index.scss | 2
src/tabviews/zshare/mutilform/mkInput/index.jsx | 4 +
src/menu/components/form/step-form/options.jsx | 16 +++
src/utils/utils.js | 29 +++++++
src/tabviews/custom/components/form/tab-form/index.jsx | 8 +
src/menu/components/card/balcony/index.jsx | 3
src/menu/components/form/step-form/index.jsx | 8 +
src/menu/components/form/dragtitle/index.scss | 4 +
src/templates/modalconfig/settingform/index.jsx | 12 +++
src/templates/zshare/formconfig.jsx | 14 +++
src/menu/components/form/tab-form/index.jsx | 8 +
src/menu/components/share/actioncomponent/formconfig.jsx | 9 ++
src/tabviews/zshare/mutilform/index.jsx | 23 +++--
src/menu/components/share/actioncomponent/actionform/index.jsx | 2
src/tabviews/custom/components/form/step-form/index.jsx | 14 +++
src/menu/components/form/dragtitle/card.jsx | 10 +
25 files changed, 174 insertions(+), 26 deletions(-)
diff --git a/src/menu/components/card/balcony/index.jsx b/src/menu/components/card/balcony/index.jsx
index c0986a3..d495918 100644
--- a/src/menu/components/card/balcony/index.jsx
+++ b/src/menu/components/card/balcony/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Popover, Checkbox, message } from 'antd'
-import { PlusOutlined, PlusSquareOutlined, EditOutlined, FontColorsOutlined, DeleteOutlined, SettingOutlined, ToolOutlined, ClockCircleOutlined } from '@ant-design/icons'
+import { PlusOutlined, PlusSquareOutlined, EditOutlined, FontColorsOutlined, DeleteOutlined, SettingOutlined, ToolOutlined, ClockCircleOutlined, ColumnHeightOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -285,6 +285,7 @@
return (
<div className="menu-balcony-edit-box" style={_style} id={card.uuid}>
+ {card.style.height ? <ColumnHeightOutlined className="fixed-height" title="瀹氶珮" /> : null}
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} />
diff --git a/src/menu/components/card/balcony/index.scss b/src/menu/components/card/balcony/index.scss
index 6d5f095..3aaefbb 100644
--- a/src/menu/components/card/balcony/index.scss
+++ b/src/menu/components/card/balcony/index.scss
@@ -47,6 +47,13 @@
right: -30px;
font-size: 16px;
}
+ .fixed-height {
+ position: absolute;
+ bottom: 3px;
+ right: 3px;
+ font-size: 10px;
+ color: orange;
+ }
}
.menu-balcony-edit-box::after {
display: block;
diff --git a/src/menu/components/form/dragtitle/card.jsx b/src/menu/components/form/dragtitle/card.jsx
index 090ccd1..bfcbe4a 100644
--- a/src/menu/components/form/dragtitle/card.jsx
+++ b/src/menu/components/form/dragtitle/card.jsx
@@ -11,7 +11,7 @@
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
-const Card = ({ id, card, sort, active, moveCard, findCard, closeCard, selectCard, updateGroup }) => {
+const Card = ({ id, card, sort, labelSize, active, moveCard, findCard, closeCard, selectCard, updateGroup }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'form', id, originalIndex },
@@ -68,6 +68,10 @@
updateGroup(_card)
}
+ let style = {fontSize: labelSize}
+ let s = labelSize * 1.5 + 'px'
+ let sortStyle = {width: s, height: s, lineHeight: s, borderRadius: s}
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
@@ -79,8 +83,8 @@
</div>
} trigger="hover">
<div className={'page-card ' + (active ? 'active' : '')} onClick={select} style={{ opacity: opacity}}>
- <div ref={node => drag(drop(node))}>
- <span className="form-sort">{sort}</span>
+ <div ref={node => drag(drop(node))} style={style}>
+ <span className="form-sort" style={sortStyle}>{sort}</span>
{card.setting.title}
</div>
</div>
diff --git a/src/menu/components/form/dragtitle/index.jsx b/src/menu/components/form/dragtitle/index.jsx
index 96a6e7f..008d237 100644
--- a/src/menu/components/form/dragtitle/index.jsx
+++ b/src/menu/components/form/dragtitle/index.jsx
@@ -4,7 +4,7 @@
import Card from './card'
import './index.scss'
-const Container = ({list, selectId, tabtype, handleList, handleGroup, closeGroup, selectGroup}) => {
+const Container = ({list, labelSize, selectId, tabtype, handleList, handleGroup, closeGroup, selectGroup}) => {
const [cards, setCards] = useState(list)
const moveCard = (id, atIndex) => {
const { card, index } = findCard(id)
@@ -45,6 +45,7 @@
id={card.uuid}
key={card.uuid}
sort={i + 1}
+ labelSize={labelSize}
active={card.uuid === selectId}
card={card}
moveCard={moveCard}
diff --git a/src/menu/components/form/dragtitle/index.scss b/src/menu/components/form/dragtitle/index.scss
index 9921c52..f1c1799 100644
--- a/src/menu/components/form/dragtitle/index.scss
+++ b/src/menu/components/form/dragtitle/index.scss
@@ -2,6 +2,10 @@
display: flex;
line-height: 30px;
min-height: 50px;
+ font-weight: inherit;
+ div {
+ font-weight: inherit;
+ }
.page-card {
position: relative;
flex: 1;
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index b16532c..32bc1f9 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -201,7 +201,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', ['height', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle)
+ MKEmitter.emit('changeStyle', ['height', 'font1', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle)
}
getStyle = (style) => {
@@ -704,6 +704,11 @@
render() {
const { card, group, appType } = this.state
+ let labelSize = 14
+ if (card.style.fontSize) {
+ labelSize = parseInt(card.style.fontSize)
+ }
+
return (
<div className="menu-normal-form-edit-box" style={resetStyle(card.style)} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
@@ -725,6 +730,7 @@
</Popover>
<FormTitle
list={card.subcards}
+ labelSize={labelSize}
selectId={group ? group.uuid : ''}
handleList={this.changecards}
handleGroup={this.changeGroup}
diff --git a/src/menu/components/form/step-form/index.scss b/src/menu/components/form/step-form/index.scss
index 8ca4c7c..40539f2 100644
--- a/src/menu/components/form/step-form/index.scss
+++ b/src/menu/components/form/step-form/index.scss
@@ -15,6 +15,7 @@
top: 1px;
cursor: pointer;
padding: 5px;
+ color: rgba(0, 0, 0, 0.65);
background: rgba(255, 255, 255, 0.55);
}
@@ -25,6 +26,7 @@
}
.form-area {
position: relative;
+ font-size: 14px;
.page-card {
background: transparent;
}
diff --git a/src/menu/components/form/step-form/options.jsx b/src/menu/components/form/step-form/options.jsx
index 48f3daf..482fa21 100644
--- a/src/menu/components/form/step-form/options.jsx
+++ b/src/menu/components/form/step-form/options.jsx
@@ -84,8 +84,22 @@
options: [
{value: 'show', label: '鏄剧ず'},
{value: 'hidden', label: '闅愯棌'},
- ]
+ ],
+ // controlFields: [
+ // {field: 'labelSize', values: ['show']},
+ // ]
},
+ // {
+ // type: 'number',
+ // field: 'labelSize',
+ // label: '鍚嶇О澶у皬',
+ // initval: wrap.labelSize || '',
+ // tooltip: '鍒嗙粍鍚嶇О瀛椾綋澶у皬銆�',
+ // min: 12,
+ // max: 50,
+ // precision: 0,
+ // required: false
+ // },
{
type: 'radio',
field: 'tabtype',
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index cc18525..1de74ec 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -213,7 +213,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', ['height', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle)
+ MKEmitter.emit('changeStyle', ['height', 'font1', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle)
}
getStyle = (style) => {
@@ -729,6 +729,11 @@
render() {
const { card, group, appType } = this.state
+ let labelSize = 14
+ if (card.style.fontSize) {
+ labelSize = parseInt(card.style.fontSize)
+ }
+
return (
<div className="menu-normal-form-edit-box" style={resetStyle(card.style)} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
@@ -750,6 +755,7 @@
</Popover>
<FormTitle
list={card.subcards}
+ labelSize={labelSize}
tabtype={card.wrap.tabtype || ''}
selectId={group ? group.uuid : ''}
handleList={this.changecards}
diff --git a/src/menu/components/form/tab-form/index.scss b/src/menu/components/form/tab-form/index.scss
index 8ca4c7c..ffb7696 100644
--- a/src/menu/components/form/tab-form/index.scss
+++ b/src/menu/components/form/tab-form/index.scss
@@ -25,6 +25,7 @@
}
.form-area {
position: relative;
+ font-size: 14px;
.page-card {
background: transparent;
}
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 0beb228..740b4a2 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -437,7 +437,7 @@
} else if (_funcType === 'closetab') {
shows.push('refreshTab')
} else if (_funcType === 'scan') {
- shows.push('linkmenu')
+ shows.push('linkmenu', 'prefix')
reRequired.linkmenu = false
reTooltip.linkmenu = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��'
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 1eab40a..c1f4bd9 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -137,6 +137,7 @@
{ value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
{ value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
{ value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
+ { value: 'clearCache', text: '娓呯┖鏈湴閰嶇疆' },
{ value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
{ value: 'logout', text: '閫�鍑�' },
{ value: 'goBack', text: '杩斿洖' },
@@ -384,6 +385,14 @@
options: isApp ? appMenus : menulist
},
{
+ type: 'text',
+ key: 'prefix',
+ label: '鍓嶇紑',
+ initVal: card.prefix || '',
+ tooltip: '鎵爜淇℃伅灏嗕笌鍓嶇紑鎷兼帴鍚庢墽琛屻�傛敞锛氳烦杞彍鍗曢渶浠kbid寮�澶淬��',
+ required: false
+ },
+ {
type: 'textarea',
key: 'url',
label: '椤甸潰鍦板潃',
diff --git a/src/mob/components/topbar/normal-navbar/options.jsx b/src/mob/components/topbar/normal-navbar/options.jsx
index 2a395e0..5fbab72 100644
--- a/src/mob/components/topbar/normal-navbar/options.jsx
+++ b/src/mob/components/topbar/normal-navbar/options.jsx
@@ -87,6 +87,7 @@
controlFields: [
{field: 'reload', values: ['back']},
{field: 'linkmenu', values: ['scan']},
+ {field: 'prefix', values: ['scan']},
],
span: 24
},
@@ -179,6 +180,14 @@
options: menulist
},
{
+ type: 'text',
+ field: 'prefix',
+ label: '鍓嶇紑',
+ initval: wrap.prefix || '',
+ tooltip: '鎵爜淇℃伅灏嗕笌鍓嶇紑鎷兼帴鍚庢墽琛屻�傛敞锛氳烦杞彍鍗曢渶浠kbid寮�澶淬��',
+ required: false
+ },
+ {
type: 'radio',
field: 'minishow',
label: '灏忕▼搴忎腑',
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index c5c8315..7c72f10 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -104,6 +104,16 @@
_group = _groups || _group
}
+ config.titleStyle = {}
+ config.sortStyle = {}
+
+ if (config.style.fontSize) {
+ let size = parseInt(config.style.fontSize)
+ config.titleStyle = {fontSize: size}
+ let s = size * 1.5 + 'px'
+ config.sortStyle = {width: s, height: s, lineHeight: s, borderRadius: s}
+ }
+
this.setState({
sync: _sync,
data: _data,
@@ -390,8 +400,8 @@
}
{config.wrap.groupLabel !== 'hidden' ? <div className="mk-normal-form-title">
{config.subcards.map(card => (
- <div key={card.uuid} className={'form-title' + (card.sort <= step ? ' active' : '')}>
- <span className="form-sort" style={{background: config.wrap.color}}>{card.sort}</span>
+ <div key={card.uuid} style={config.titleStyle} className={'form-title' + (card.sort <= step ? ' active' : '')}>
+ <span className="form-sort" style={{background: config.wrap.color, ...config.sortStyle}}>{card.sort}</span>
<span className="before-line" style={{background: config.wrap.color}}></span>
<span className="after-line" style={{background: config.wrap.color}}></span>
{card.setting.title}
diff --git a/src/tabviews/custom/components/form/step-form/index.scss b/src/tabviews/custom/components/form/step-form/index.scss
index 06b56f4..12ca54d 100644
--- a/src/tabviews/custom/components/form/step-form/index.scss
+++ b/src/tabviews/custom/components/form/step-form/index.scss
@@ -11,10 +11,12 @@
line-height: 30px;
min-height: 50px;
margin-bottom: 20px;
+ font-weight: inherit;
.form-title {
position: relative;
flex: 1;
text-align: center;
+ font-weight: inherit;
.form-sort {
background: #d8d8d8;
display: block;
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 66e5dd2..0195383 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -83,6 +83,12 @@
return group
})
+ config.titleStyle = {}
+
+ if (config.style.fontSize) {
+ config.titleStyle = {fontSize: parseInt(config.style.fontSize)}
+ }
+
this.setState({
sync: _sync,
data: _data,
@@ -310,7 +316,7 @@
}
{config.wrap.groupLabel !== 'hidden' ? <div className={'mk-normal-form-title ' + config.wrap.tabtype}>
{config.subcards.map(card => (
- <div key={card.uuid} onClick={() => this.changeGroup(card)} className={'form-title' + (group && group.uuid === card.uuid ? ' active' : '')}>
+ <div key={card.uuid} onClick={() => this.changeGroup(card)} style={config.titleStyle} className={'form-title' + (group && group.uuid === card.uuid ? ' active' : '')}>
{card.setting.title}
</div>))
}
diff --git a/src/tabviews/custom/components/form/tab-form/index.scss b/src/tabviews/custom/components/form/tab-form/index.scss
index 370f64a..a079e22 100644
--- a/src/tabviews/custom/components/form/tab-form/index.scss
+++ b/src/tabviews/custom/components/form/tab-form/index.scss
@@ -12,11 +12,13 @@
min-height: 36px;
margin-bottom: 20px;
font-size: 16px;
+ font-weight: inherit;
.form-title {
position: relative;
flex: 1;
text-align: center;
cursor: pointer;
+ font-weight: inherit;
}
}
.mk-normal-form-title.mkbtn {
diff --git a/src/tabviews/custom/components/module/account/index.jsx b/src/tabviews/custom/components/module/account/index.jsx
index 14f4937..4996d2c 100644
--- a/src/tabviews/custom/components/module/account/index.jsx
+++ b/src/tabviews/custom/components/module/account/index.jsx
@@ -90,13 +90,13 @@
if (!activeItem && Item) {
this.setBook(Item)
} else if (Item) {
- const _this = this
+ const that = this
confirm({
title: '纭畾鍒囨崲璐﹀鍚楋紵',
content: '鍒囨崲璐﹀鏃剁郴缁熼渶瑕佸埛鏂般��',
onOk() {
return new Promise(resolve => {
- _this.setBook(Item, resolve)
+ that.setBook(Item, resolve)
})
},
onCancel() {}
@@ -115,7 +115,7 @@
let sid = localStorage.getItem('SessionUid') || ''
let param = {
func: 'sPC_TableData_InUpDe',
- LText: `delete tmp_session_show_key where createuserid='${userid}' and createuser='${sid}' and key_type='fcc_years'
+ LText: `delete tmp_session_show_key where createuserid='${userid}' and key_type='fcc_years'
insert into tmp_session_show_key ( key_id,key_type,createuserid,CreateUser,CreateStaff)
select '${item.id}','fcc_years','${userid}','${sid}','${sessionStorage.getItem('Full_Name') || ''}'`,
exec_type: 'y'
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 325f5ab..445b601 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -545,6 +545,10 @@
if (item.database === 'sso') {
let sql = _sso + item.base_sql
_sso = ''
+
+ sql = sql.replace(/@ID@/ig, `'${this.state.ID || ''}'`)
+ sql = sql.replace(/@BID@/ig, `'${BID}'`)
+
if (debug) {
console.info(sql)
}
@@ -552,6 +556,10 @@
} else {
let sql = _sql + item.base_sql
_sql = ''
+
+ sql = sql.replace(/@ID@/ig, `'${this.state.ID || ''}'`)
+ sql = sql.replace(/@BID@/ig, `'${BID}'`)
+
if (debug) {
console.info(sql)
}
@@ -565,9 +573,7 @@
LText: localItems.join(' union all '),
obj_name: '',
arr_field: '',
- table_type: 'Y',
- BID: BID || '',
- ID: this.state.ID || ''
+ table_type: 'Y'
}
if (param.LText) {
@@ -601,9 +607,7 @@
LText: mainItems.join(' union all '),
obj_name: '',
arr_field: '',
- table_type: 'Y',
- BID: BID || '',
- ID: this.state.ID || ''
+ table_type: 'Y'
}
if (mainparam.LText) {
@@ -663,11 +667,12 @@
func: 'sPC_Get_SelectedList',
LText: _sql + form.base_sql,
obj_name: form.field,
- arr_field: form.arr_field,
- BID: this.props.BID || '',
- ID: this.state.ID || ''
+ arr_field: form.arr_field
}
+ param.LText = param.LText.replace(/@ID@/ig, `'${this.state.ID || ''}'`)
+ param.LText = param.LText.replace(/@BID@/ig, `'${this.props.BID || ''}'`)
+
if (debug) {
console.info(param.LText)
}
diff --git a/src/tabviews/zshare/mutilform/mkInput/index.jsx b/src/tabviews/zshare/mutilform/mkInput/index.jsx
index 7bd5605..2092679 100644
--- a/src/tabviews/zshare/mutilform/mkInput/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkInput/index.jsx
@@ -131,6 +131,10 @@
const { config } = this.props
const { value } = this.state
+ if (config.inputType === 'password') {
+ return <Input.Password ref={this.inputRef} className="mk-form-input" placeholder={config.placeholder || ''} value={value} autoComplete="off" disabled={config.readonly} onChange={this.handleChange} onPressEnter={this.handleInputSubmit}/>
+ }
+
return <Input ref={this.inputRef} className="mk-form-input" allowClear placeholder={config.placeholder || ''} value={value} autoComplete="off" disabled={config.readonly} onChange={this.handleChange} onPressEnter={this.handleInputSubmit} />
}
}
diff --git a/src/tabviews/zshare/mutilform/mkInput/index.scss b/src/tabviews/zshare/mutilform/mkInput/index.scss
index 21a1344..7161e2d 100644
--- a/src/tabviews/zshare/mutilform/mkInput/index.scss
+++ b/src/tabviews/zshare/mutilform/mkInput/index.scss
@@ -1,4 +1,4 @@
-.mk-form-input {
+.mk-form-input:not(.ant-input-password) {
.ant-input-suffix {
opacity: 0;
transition: opacity 0.3s;
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index ab2adf7..b459117 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -142,6 +142,18 @@
})(<InputNumber min={10} max={2000} precision={0} onPressEnter={this.handleSubmit}/>)}
</Form.Item>
</Col> : null}
+ {display === 'dialog' && appType === 'mob' ? <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="灏忎簬100鏃朵负鐧惧垎鐜囷紝澶т簬100鏃朵负缁濆鍊笺�傜┖鍊兼椂瀹藉害鑷�傚簲銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 瀹藉害
+ </Tooltip>
+ }>
+ {getFieldDecorator('width', {
+ initialValue: config.setting.width || ''
+ })(<InputNumber min={10} max={2000} precision={0} onPressEnter={this.handleSubmit}/>)}
+ </Form.Item>
+ </Col> : null}
{['dialog', 'drawer', 'modal'].includes(display) ? <Col span={12}>
<Form.Item label="鍒濆鐒︾偣">
{getFieldDecorator('focus', {
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index d11afb9..d211ba0 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3386,6 +3386,20 @@
},
{
type: 'radio',
+ key: 'inputType',
+ label: '鍔犲瘑鏄剧ず',
+ initVal: card.inputType || 'text',
+ required: false,
+ options: [{
+ value: 'text',
+ text: '鍚�'
+ }, {
+ value: 'password',
+ text: '鏄�'
+ }]
+ },
+ {
+ type: 'radio',
key: 'interception',
label: '鎴彇绌烘牸',
initVal: card.interception || 'true',
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 6bd3be2..9843550 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -19,7 +19,7 @@
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const modalTypeOptions = {
- text: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'regular', 'interception', 'span', 'labelwidth', 'encryption', 'tooltip', 'extra', 'enter', 'cursor', 'scan', 'splitline', 'placeholder', 'place', 'marginTop', 'marginBottom', 'lenControl'],
+ text: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'regular', 'interception', 'span', 'labelwidth', 'encryption', 'tooltip', 'extra', 'enter', 'cursor', 'scan', 'splitline', 'placeholder', 'place', 'marginTop', 'marginBottom', 'lenControl', 'inputType'],
number: ['initval', 'readonly', 'hidden', 'decimal', 'min', 'max', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'splitline', 'place', 'marginTop', 'marginBottom'],
select: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'declare', 'setAll', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter', 'splitline', 'dropdown', 'marginTop', 'marginBottom', 'empty'],
checkbox: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'fieldlength', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'arrange', 'marginTop', 'marginBottom', 'empty'],
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 29a248c..09aede5 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -206,6 +206,35 @@
return value
}
+ // /**
+ // * @description sql瑙ｅ瘑
+ // * @return {String} value
+ // */
+ // static unFormatOptions (value) {
+ // if (!value) return ''
+
+ // value = window.atob(value)
+ // value = value.replace('minKe', '')
+ // value = window.decodeURIComponent(window.atob(value))
+
+ // // 澶栬仈鏁版嵁搴撴浛鎹�
+ // if (window.GLOB.externalDatabase !== null && window.GLOB.externalDatabase) {
+ // value = value.replace(window.GLOB.externalDatabase, '@db@')
+ // }
+
+ // value = value.replace(/ mpercent /ig, '%')
+
+ // // 鏇挎崲鍏抽敭瀛�
+ // formatKeys.forEach(item => {
+ // let reg = new RegExp('(\\s)?' + item.value.replace(/\s/g, '') + '(\\s)?', 'ig')
+ // value = value.replace(reg, ' ' + item.key + ' ')
+ // })
+
+ // // value = value.replace(/\n/ig, ' \n ')
+
+ // return value
+ // }
+
/**
* @description sPC_TableData_InUpDe sql鍔犲瘑
* @return {String} value
--
Gitblit v1.8.0