From 64b4a25f578dbe459002d356e60a1a3657cb4595 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 一月 2023 00:57:23 +0800
Subject: [PATCH] 2023-01-12
---
src/views/sso/index.jsx | 2
src/mob/components/navbar/normal-navbar/index.jsx | 2
src/tabviews/custom/components/card/cardcellList/index.jsx | 16 ++++-
src/assets/css/viewstyle.scss | 8 +-
src/components/normalform/modalform/styleInput/index.jsx | 2
src/components/normalform/modalform/index.jsx | 1
src/templates/zshare/verifycard/index.jsx | 2
src/mob/components/navbar/normal-navbar/index.scss | 56 ++++++++++++------
src/components/header/resetpwd/index.jsx | 2
src/mob/components/navbar/normal-navbar/options.jsx | 26 +++++---
src/templates/zshare/createinterface/index.jsx | 2
src/tabviews/custom/components/card/data-card/index.scss | 2
src/components/normalform/modalform/styleInput/index.scss | 3
src/utils/utils.js | 7 +
src/views/login/index.jsx | 2
15 files changed, 85 insertions(+), 48 deletions(-)
diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index d08bf40..d18d02f 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -74,7 +74,7 @@
> .card-item-box {
border-color: $color6!important;
background-color: $color1!important;
- .ant-mk-text, .ant-mk-date {
+ .ant-mk-text:not(.sign-font) {
color: $color6;
}
}
@@ -84,7 +84,7 @@
.mk-card:hover, .mk-card.active, .mk-card.selected {
> .card-item-box {
border-color: $color6!important;
- .ant-mk-text, .ant-mk-date {
+ .ant-mk-text:not(.sign-font) {
color: $color6;
}
}
@@ -104,7 +104,7 @@
}
.mk-card:hover {
> .card-item-box {
- .ant-mk-text, .ant-mk-date {
+ .ant-mk-text:not(.sign-font) {
color: $color6;
}
}
@@ -112,7 +112,7 @@
.mk-card.active, .mk-card.selected {
> .card-item-box {
border-bottom-color: $color6!important;
- .ant-mk-text, .ant-mk-date {
+ .ant-mk-text:not(.sign-font) {
color: $color6;
}
}
diff --git a/src/components/header/resetpwd/index.jsx b/src/components/header/resetpwd/index.jsx
index 5db93ce..f796811 100644
--- a/src/components/header/resetpwd/index.jsx
+++ b/src/components/header/resetpwd/index.jsx
@@ -73,7 +73,7 @@
if (level === 'letter_num' && value && /^[0-9a-zA-Z!@#$%^&*()_]*$/.test(value) && /^([^0-9]*|[^a-zA-Z]*)$/.test(value)) {
callback('瀵嗙爜涓繀椤诲惈鏈夋暟瀛楀拰瀛楁瘝銆�')
- } else if ((level === 'char_num' || level === 'char_num_90') && value && /^[0-9a-zA-Z!@#$%^&*()_]*$/.test(value) && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(value)) {
+ } else if ((level === 'char_num' || level === 'char_num_90' || level === 'char_num_90_sms') && value && /^[0-9a-zA-Z!@#$%^&*()_]*$/.test(value) && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(value)) {
callback('瀵嗙爜涓繀椤诲惈鏈夋暟瀛椼�佸瓧姣嶅拰鐗规畩瀛楃銆�')
} else {
callback()
diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx
index 6a2636b..eb177a9 100644
--- a/src/components/normalform/modalform/index.jsx
+++ b/src/components/normalform/modalform/index.jsx
@@ -105,7 +105,6 @@
let supItem = fieldMap.get(key)
let fields = []
-
controlFields[key].forEach(item => {
if (!fieldMap.has(item.field)) return
diff --git a/src/components/normalform/modalform/styleInput/index.jsx b/src/components/normalform/modalform/styleInput/index.jsx
index c6d6b45..f372a4a 100644
--- a/src/components/normalform/modalform/styleInput/index.jsx
+++ b/src/components/normalform/modalform/styleInput/index.jsx
@@ -128,7 +128,7 @@
const { value, options, unit } = this.state
return (
- <div className="style-input-wrap">
+ <div className="mk-style-input-wrap">
<Input value={value} addonAfter={
options.length > 1 ?
<Select value={unit} onChange={this.changeUnit}>
diff --git a/src/components/normalform/modalform/styleInput/index.scss b/src/components/normalform/modalform/styleInput/index.scss
index fc0085d..5dbf186 100644
--- a/src/components/normalform/modalform/styleInput/index.scss
+++ b/src/components/normalform/modalform/styleInput/index.scss
@@ -1,4 +1,4 @@
-.style-input-wrap {
+.mk-style-input-wrap {
line-height: 32px;
.ant-select {
width: 60px!important;
@@ -6,7 +6,6 @@
.single-unit {
width: 38px;
text-align: left;
- color: rgba(255, 255, 255, 0.65);
}
div[title="vh"], div[title="vw"] {
color: #1890ff;
diff --git a/src/mob/components/navbar/normal-navbar/index.jsx b/src/mob/components/navbar/normal-navbar/index.jsx
index 71a53d9..e33ea48 100644
--- a/src/mob/components/navbar/normal-navbar/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/index.jsx
@@ -123,7 +123,7 @@
_style.height = card.wrap.height
return (
- <div className="normal-navbar-edit-box" style={_style} id={card.uuid}>
+ <div className={'normal-navbar-edit-box ' + (card.wrap.menuStyle || '')} style={_style} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<PlusOutlined className="plus" title="娣诲姞鑿滃崟" onClick={() => MKEmitter.emit('addmobmenu')}/>
diff --git a/src/mob/components/navbar/normal-navbar/index.scss b/src/mob/components/navbar/normal-navbar/index.scss
index 6414525..0a0851d 100644
--- a/src/mob/components/navbar/normal-navbar/index.scss
+++ b/src/mob/components/navbar/normal-navbar/index.scss
@@ -41,24 +41,7 @@
margin-bottom: 0;
}
}
- .am-tab-bar-tab.tab-zoomIn {
- .am-tab-bar-tab-icon {
- padding: 10px;
- display: inline-block;
- background: #1890ff;
- color: #ffffff;
- border-radius: 40px;
- width: 42px;
- height: 42px;
- font-size: 15px;
- transform: translate(0px, -25px);
- }
- .am-tab-bar-tab-title {
- font-size: 1.2em;
- color: #1890ff;
- transform: translate(0px, -22px);
- }
- }
+
}
.anticon-tool {
@@ -72,6 +55,43 @@
background: rgba(255, 255, 255, 0.55);
}
}
+
+.normal-navbar-edit-box:not(.class1) {
+ .menu .am-tab-bar-tab.tab-zoomIn {
+ .am-tab-bar-tab-icon {
+ padding: 10px;
+ display: inline-block;
+ background: #1890ff;
+ color: #ffffff;
+ border-radius: 40px;
+ width: 42px;
+ height: 42px;
+ font-size: 15px;
+ transform: translate(0px, -25px);
+ }
+ .am-tab-bar-tab-title {
+ font-size: 1.2em;
+ color: #1890ff;
+ transform: translate(0px, -22px);
+ }
+ }
+}
+.normal-navbar-edit-box.class1 {
+ background-color: #1890ff!important;
+ border-top-left-radius: 40px;
+ border-top-right-radius: 40px;
+ .am-tab-bar-tab-icon {
+ color: #ffffff;
+ position: relative;
+ top: 5px;
+ }
+ .menu .am-tab-bar-tab .anticon {
+ font-size: 20px;
+ }
+ .am-tab-bar-tab-title {
+ display: none;
+ }
+}
.normal-navbar-edit-box::after {
display: block;
content: ' ';
diff --git a/src/mob/components/navbar/normal-navbar/options.jsx b/src/mob/components/navbar/normal-navbar/options.jsx
index d8eadc8..ee01650 100644
--- a/src/mob/components/navbar/normal-navbar/options.jsx
+++ b/src/mob/components/navbar/normal-navbar/options.jsx
@@ -30,14 +30,12 @@
]
},
{
- type: 'number',
+ type: 'styleInput',
field: 'height',
label: '楂樺害',
initval: wrap.height || 50,
- min: 30,
- max: 200,
- precision: 0,
- required: true
+ required: true,
+ options: ['px']
},
{
type: 'radio',
@@ -52,7 +50,6 @@
],
controlFields: [
{field: 'position', values: ['tab']},
- {field: 'selectStyle', values: ['tab']},
]
},
{
@@ -65,14 +62,17 @@
{value: 'bottom', label: '搴曢儴'},
{value: 'left', label: '宸︿晶'},
{value: 'right', label: '鍙充晶'},
+ ],
+ controlFields: [
+ {field: 'marginTop', values: ['left', 'right']},
]
},
{
type: 'radio',
- field: 'selectStyle',
+ field: 'menuStyle',
label: '鑿滃崟鏍峰紡',
- initval: wrap.selectStyle || 'default',
- tooltip: '鍏蜂綋鏍峰紡璇峰湪绯荤粺杩愯鐜鏌ョ湅銆�',
+ initval: wrap.menuStyle || 'default',
+ tooltip: '浣跨敤APP涓師鐢熻彍鍗曟爮鏃舵棤鏁堛��',
required: false,
options: [
{value: 'default', label: '榛樿'},
@@ -80,6 +80,14 @@
]
},
{
+ type: 'styleInput',
+ field: 'marginTop',
+ label: '椤堕儴缂╄繘',
+ initval: wrap.marginTop || '',
+ required: false,
+ options: ['px', 'vh']
+ },
+ {
type: 'radio',
field: 'permission',
label: '鏉冮檺楠岃瘉',
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index acf17c2..f9464f7 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -237,6 +237,7 @@
if (card.eleType === 'sequence') {
let _style = {}
+ let className = ''
if (card.marks) {
_style.width = card.innerHeight
_style.height = card.innerHeight
@@ -245,11 +246,12 @@
let mark = getMark(card.marks, data, _style)
_style = mark.style
+ className = mark.signType
}
contents.push(
<Col key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
- <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
+ <div className={'ant-mk-text line1' + className} style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
</div>
</Col>
)
@@ -362,6 +364,7 @@
}
}
+ let className = ''
if (card.marks) {
let mark = getMark(card.marks, data, _style)
@@ -374,6 +377,7 @@
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
+ className = mark.signType
}
if (card.link || (card.anchors && card.anchors.length > 0)) {
@@ -387,7 +391,7 @@
contents.push(
<Col key={card.uuid} style={_style_} span={card.width}>
<div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
- <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
</Col>
)
@@ -437,6 +441,7 @@
}
}
+ let className = ''
if (card.marks) {
let mark = getMark(card.marks, data, _style)
@@ -449,12 +454,13 @@
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
+ className = mark.signType
}
contents.push(
<Col key={card.uuid} style={_style_} span={card.width}>
<div style={_style}>
- <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
</Col>
)
@@ -747,6 +753,7 @@
}
}
+ let className = ''
if (card.marks) {
let mark = getMark(card.marks, data, _style)
@@ -759,12 +766,13 @@
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
+ className = mark.signType
}
contents.push(
<Col key={card.uuid} style={_style_} span={card.width}>
<div style={_style}>
- <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
</Col>
)
diff --git a/src/tabviews/custom/components/card/data-card/index.scss b/src/tabviews/custom/components/card/data-card/index.scss
index 1b7e271..77c2788 100644
--- a/src/tabviews/custom/components/card/data-card/index.scss
+++ b/src/tabviews/custom/components/card/data-card/index.scss
@@ -24,7 +24,7 @@
>.card-item-box {
cursor: not-allowed;
color: #bcbcbc;
- .ant-mk-text, .ant-mk-date, .anticon {
+ .ant-mk-text, .anticon {
color: #bcbcbc!important;
span {
color: #bcbcbc!important;
diff --git a/src/templates/zshare/createinterface/index.jsx b/src/templates/zshare/createinterface/index.jsx
index e8a565b..ab76039 100644
--- a/src/templates/zshare/createinterface/index.jsx
+++ b/src/templates/zshare/createinterface/index.jsx
@@ -1064,7 +1064,7 @@
} else if (_actionType === 'LogicDelete') { // 閫昏緫鍒犻櫎
_sql += `
/* 榛樿sql */
- update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifyuserid=@userid@ where ${primaryKey}=@${primaryKey}@;`
+ update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@ where ${primaryKey}=@${primaryKey}@;`
} else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
let _msg = ''
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index a8cbb97..ff35d14 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -921,7 +921,7 @@
if (_verify.voucher && _verify.voucher.enabled) {
_voucher = ',BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear'
}
- _defaultsql = `update ${card.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifyuserid=@userid@${_voucher} where ${_primaryKey}${card.Ot !== 'requiredOnce' ? '=@ID@' : ' in (select ID from dbo.SplitComma(@ID@))'};`
+ _defaultsql = `update ${card.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@${_voucher} where ${_primaryKey}${card.Ot !== 'requiredOnce' ? '=@ID@' : ' in (select ID from dbo.SplitComma(@ID@))'};`
} else if (card.sqlType === 'delete') {
let _msg = ''
if (columns && columns.length > 0 && card.Ot !== 'notRequired' && card.Ot !== 'requiredOnce') {
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 8616197..0cfe180 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -2042,7 +2042,7 @@
_sql += `
/* 榛樿sql */
- update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifyuserid=@userid@ where ${primaryKey}${_ID};`
+ update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@ where ${primaryKey}${_ID};`
} else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
let _msg = ''
@@ -2149,6 +2149,7 @@
let icon = null
let innerStyle = null
let position = null
+ let signType = ''
style = JSON.parse(JSON.stringify(style))
marks.some(mark => {
@@ -2186,6 +2187,7 @@
if (type === 'font') {
style.color = mark.color
innerStyle = {color: mark.color}
+ signType = ' sign-font'
} else if (type === 'background') {
style.backgroundColor = mark.color
if (mark.fontColor) {
@@ -2217,7 +2219,8 @@
style,
icon,
innerStyle,
- position
+ position,
+ signType
}
}
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 9b220fc..7110358 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -122,7 +122,7 @@
let level = localStorage.getItem(_href + 'pwdlevel')
- if (level) {
+ if (level && process.env.NODE_ENV === 'production') {
let visible = false
let tip = '瀵嗙爜寮哄害涓嶅锛岃淇敼瀵嗙爜锛�'
if (param.password.length < 8) {
diff --git a/src/views/sso/index.jsx b/src/views/sso/index.jsx
index 03a6f7c..24c8648 100644
--- a/src/views/sso/index.jsx
+++ b/src/views/sso/index.jsx
@@ -95,7 +95,7 @@
let level = res.pwd_level || ''
- if (level && !['letter_num', 'char_num', 'char_num_90'].includes(level)) {
+ if (level && !['letter_num', 'char_num', 'char_num_90', 'char_num_90_sms'].includes(level)) {
level = ''
}
--
Gitblit v1.8.0