From 7d411895979f53d909b8b8026bf195518bfb606c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 09 一月 2023 14:40:18 +0800
Subject: [PATCH] 2023-01-09
---
src/components/tabview/index.jsx | 3 -
src/pc/components/login/normal-login/options.jsx | 18 ++++----
src/menu/components/share/actioncomponent/actionform/index.jsx | 2
src/views/mobdesign/index.scss | 6 +++
src/tabviews/custom/components/card/cardcellList/index.scss | 9 +++-
src/menu/components/share/actioncomponent/formconfig.jsx | 13 ++++++
src/menu/components/card/cardcellcomponent/index.scss | 8 ++++
src/tabviews/zshare/actionList/normalbutton/index.jsx | 2
src/tabviews/custom/components/card/cardItem/index.jsx | 7 +++
src/views/systemfunc/sidemenu/config.jsx | 14 +++---
src/menu/components/card/cardcellcomponent/dragaction/action.jsx | 10 ++++
src/menu/components/card/cardcomponent/options.jsx | 9 ++++
12 files changed, 76 insertions(+), 25 deletions(-)
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index d6f95ae..1b5e633 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -23,7 +23,6 @@
const Iframe = asyncComponent(() => import('@/tabviews/iframe'))
const RoleManage = asyncComponent(() => import('@/tabviews/rolemanage'))
const FormTab = asyncComponent(() => import('@/tabviews/formtab'))
-const TabManage = asyncComponent(() => import('@/tabviews/tabmanage'))
class TabViews extends Component {
static propTpyes = {
@@ -211,8 +210,6 @@
return (<RoleManage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID}/>)
} else if (view.type === 'FormTab') {
return (<FormTab MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
- } else if (view.type === 'TabManage') {
- return (<TabManage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} key={view.MenuID} param={view.param}/>)
} else if (view.type === 'iframe') {
return (<Iframe key={view.MenuID} MenuID={view.MenuID} MenuNo={view.MenuNo} title={view.MenuName} MenuName={view.MenuName} url={window.GLOB.baseurl + 'zh-CN/' + view.LinkUrl}/>)
} else {
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
index 95f0033..6418290 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
@@ -72,6 +72,14 @@
_style_ = {clear: 'left'}
}
+ let className = card.width || ''
+ if (card.hidden === 'true') {
+ className += ' mk-hidden'
+ }
+ if (card.checkType) {
+ className += ' ' + card.checkType
+ }
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
@@ -82,7 +90,7 @@
{hasProfile ? <ProfileOutlined className="profile" title="setting" onClick={() => profileCard(id)} /> : null}
</div>
} trigger="hover">
- <div ref={node => drag(drop(node))} style={_style_} className={'ant-col card-button-cell ant-col-' + card.width + (card.hidden === 'true' ? ' mk-hidden' : '')} onDoubleClick={(e) => {e.stopPropagation(); doubleClickCard(id)}}>
+ <div ref={node => drag(drop(node))} style={_style_} className={'ant-col card-button-cell ant-col-' + className} onDoubleClick={(e) => {e.stopPropagation(); doubleClickCard(id)}}>
<div style={{opacity: isDragging ? 0.3 : 1, ...card.wrapStyle}}>
{btnElement}
</div>
diff --git a/src/menu/components/card/cardcellcomponent/index.scss b/src/menu/components/card/cardcellcomponent/index.scss
index e82bfb9..bd6033c 100644
--- a/src/menu/components/card/cardcellcomponent/index.scss
+++ b/src/menu/components/card/cardcellcomponent/index.scss
@@ -29,6 +29,14 @@
}
}
.ant-checkbox .ant-checkbox-inner {
+ border-color: #b8b8b8;
+ }
+ }
+ .card-button-cell:not(.square) {
+ .ant-checkbox .ant-checkbox-inner {
+ border-radius: 15px;
+ }
+ .ant-checkbox-checked::after {
border-radius: 15px;
}
}
diff --git a/src/menu/components/card/cardcomponent/options.jsx b/src/menu/components/card/cardcomponent/options.jsx
index 40d460f..f93e6f2 100644
--- a/src/menu/components/card/cardcomponent/options.jsx
+++ b/src/menu/components/card/cardcomponent/options.jsx
@@ -103,6 +103,15 @@
forbid: subtype !== 'propcard'
},
{
+ type: 'select',
+ field: 'bgField',
+ label: '鑳屾櫙鍥�',
+ initval: setting.bgField || '',
+ tooltip: '鍔ㄦ�佽儗鏅紝鑳屾櫙鍥剧墖鐢卞瓧娈靛�兼帶鍒躲�傝娉ㄦ剰璋冩暣鑳屾櫙鏍峰紡銆�',
+ required: false,
+ options: columns
+ },
+ {
type: ops.length === 0 ? 'radio' : 'select',
field: 'click',
label: '鐐瑰嚮浜嬩欢',
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 56a2345..6641525 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -241,7 +241,7 @@
if (this.record.formType === 'switch') {
shows.push('field', 'size', 'openVal', 'closeVal', 'openText', 'closeText')
} else if (this.record.formType === 'radio') {
- shows.push('field', 'openVal', 'closeVal')
+ shows.push('field', 'checkType', 'openVal', 'closeVal')
} else {
shows.push('field')
}
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 254577c..efedf7a 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -1000,6 +1000,19 @@
}]
},
{
+ type: 'radio',
+ key: 'checkType',
+ label: '閫夋鏍峰紡',
+ initVal: card.checkType || 'circle',
+ options: [{
+ value: 'circle',
+ text: '鍦嗚'
+ }, {
+ value: 'square',
+ text: '鏂硅'
+ }]
+ },
+ {
type: 'text',
key: 'openVal',
label: '寮�鍚��',
diff --git a/src/pc/components/login/normal-login/options.jsx b/src/pc/components/login/normal-login/options.jsx
index edd2e0c..0c49d34 100644
--- a/src/pc/components/login/normal-login/options.jsx
+++ b/src/pc/components/login/normal-login/options.jsx
@@ -79,15 +79,15 @@
required: false,
options: ['px', 'vh', 'vw', '%']
},
- {
- type: 'styleInput',
- field: 'maxWidth',
- label: '鏈�澶у搴�',
- initval: wrap.maxWidth || '',
- tooltip: '缁勪欢鍗犵敤鐨勬渶澶у搴︼紝鐢ㄤ簬椤甸潰甯冨眬銆�',
- required: false,
- options: ['px', 'vh', 'vw', '%']
- },
+ // {
+ // type: 'styleInput',
+ // field: 'maxWidth',
+ // label: '鏈�澶у搴�',
+ // initval: wrap.maxWidth || '',
+ // tooltip: '缁勪欢鍗犵敤鐨勬渶澶у搴︼紝鐢ㄤ簬椤甸潰甯冨眬銆�',
+ // required: false,
+ // options: ['px', 'vh', 'vw', '%']
+ // },
{
type: 'radio',
field: 'topTip',
diff --git a/src/tabviews/custom/components/card/cardItem/index.jsx b/src/tabviews/custom/components/card/cardItem/index.jsx
index 438e7a8..224438e 100644
--- a/src/tabviews/custom/components/card/cardItem/index.jsx
+++ b/src/tabviews/custom/components/card/cardItem/index.jsx
@@ -162,9 +162,14 @@
render() {
const { card, data, cards } = this.props
+ let style = {...card.style}
+
+ if (card.setting.bgField) {
+ style.backgroundImage = `url('${data[card.setting.bgField] || ''}')`
+ }
return (
- <div className={'card-item-box ' + (card.setting.btnControl || '')} style={card.style} onClick={this.openView} onDoubleClick={this.doubleClick}>
+ <div className={'card-item-box ' + (card.setting.btnControl || '')} style={style} onClick={this.openView} onDoubleClick={this.doubleClick}>
<CardCellComponent data={data} cards={cards} cardCell={card} elements={card.elements}/>
{card.setting.type === 'multi' ? <div className={'back-side ' + card.setting.transform} style={card.backStyle}>
<CardCellComponent data={data} cards={cards} cardCell={card} elements={card.backElements}/>
diff --git a/src/tabviews/custom/components/card/cardcellList/index.scss b/src/tabviews/custom/components/card/cardcellList/index.scss
index 1523314..1eb878d 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.scss
+++ b/src/tabviews/custom/components/card/cardcellList/index.scss
@@ -92,8 +92,13 @@
padding: 0;
overflow: hidden;
}
- .ant-checkbox-inner, .ant-checkbox-checked::after {
- border-radius: 15px;
+ .ant-checkbox-wrapper:not(.square) {
+ .ant-checkbox-inner, .ant-checkbox-checked::after {
+ border-radius: 15px;
+ }
+ }
+ .ant-checkbox-inner {
+ border-color: #b8b8b8;
}
}
.ant-mk-slider {
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 489b48e..44440cc 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2680,7 +2680,7 @@
if (btn.formType === 'switch') {
return <Switch loading={loading} checked={check} disabled={disabled || loading} title={disabled ? (btn.reason || '') : ''} onChange={(val,e) => {e.stopPropagation();this.actionTrigger()}} style={btn.style} className={btn.size === 'large' ? 'ant-switch-large' : ''} size={btn.size} checkedChildren={btn.openText || ''} unCheckedChildren={btn.closeText || ''}/>
} else if (btn.formType === 'radio') {
- return <Checkbox disabled={disabled || loading} title={disabled ? (btn.reason || '') : ''} checked={check} onChange={(e) => {e.stopPropagation();this.actionTrigger()}} style={btn.style}></Checkbox>
+ return <Checkbox className={btn.checkType || ''} disabled={disabled || loading} title={disabled ? (btn.reason || '') : ''} checked={check} onChange={(e) => {e.stopPropagation();this.actionTrigger()}} style={btn.style}></Checkbox>
} else {
return <Button type="link" icon="scan" disabled={true} style={btn.style} onClick={(e) => {e.stopPropagation()}}></Button>
}
diff --git a/src/views/mobdesign/index.scss b/src/views/mobdesign/index.scss
index 11cb042..1e12390 100644
--- a/src/views/mobdesign/index.scss
+++ b/src/views/mobdesign/index.scss
@@ -276,6 +276,12 @@
border: 1px solid rgba(0, 0, 0, 0.07);
background: rgba(0, 0, 0, 0);
}
+ .card-button-cell {
+ .ant-checkbox-inner {
+ width: 20px;
+ height: 20px;
+ }
+ }
}
.mk-mob-view.userbind {
diff --git a/src/views/systemfunc/sidemenu/config.jsx b/src/views/systemfunc/sidemenu/config.jsx
index 1e5c708..c49b74a 100644
--- a/src/views/systemfunc/sidemenu/config.jsx
+++ b/src/views/systemfunc/sidemenu/config.jsx
@@ -32,13 +32,13 @@
MenuID: '1583979633842550imkchl4qt4qppsiv',
MenuNo: 'sVersionMUpgrade',
MenuName: '鐗堟湰鍗囩骇',
- }, {
- src: '',
- PageParam: {OpenType: 'newtab', Template: 'TabManage'},
- type: 'TabManage',
- MenuID: 'TabManageView',
- MenuNo: 'TabManage',
- MenuName: '鏍囩椤电鐞�',
+ // }, {
+ // src: '',
+ // PageParam: {OpenType: 'newtab', Template: 'TabManage'},
+ // type: 'TabManage',
+ // MenuID: 'TabManageView',
+ // MenuNo: 'TabManage',
+ // MenuName: '鏍囩椤电鐞�',
}, {
src: '',
PageParam: {OpenType: 'newtab', Template: 'BaseTable'},
--
Gitblit v1.8.0