From 3d39c26a7e0a04fd2cabc91c72462e554c2262c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 一月 2022 18:18:27 +0800
Subject: [PATCH] 2022-01-25
---
public/options.json | 14 +++---
src/mob/components/topbar/normal-navbar/options.jsx | 33 ++++++++++++++++
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 8 +++
src/menu/components/share/actioncomponent/actionform/index.jsx | 4 +-
src/components/normalform/modalform/mkTable/index.jsx | 4 +-
src/menu/components/share/actioncomponent/formconfig.jsx | 4 +-
6 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/public/options.json b/public/options.json
index f317ad5..0f5b891 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,17 +1,17 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
+ "appId": "202108312122504607B107A83F55B40C98CCF",
+ "appkey": "20210831212235413F287EC3BF489424496C8",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mk",
+ "defaultApp": "mkindustry",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "",
- "probation": "",
- "host": "http://qingqiumarket.cn",
- "service": "MKWMS/"
+ "licenseKey": "7EFE13KIKKILIJ7C8CFC",
+ "probation": "2021-12-31",
+ "host": "http://demo.mk9h.cn",
+ "service": "erp_new/"
}
\ No newline at end of file
diff --git a/src/components/normalform/modalform/mkTable/index.jsx b/src/components/normalform/modalform/mkTable/index.jsx
index 2760640..28dafc3 100644
--- a/src/components/normalform/modalform/mkTable/index.jsx
+++ b/src/components/normalform/modalform/mkTable/index.jsx
@@ -86,8 +86,8 @@
return <MkEditIcon allowClear/>
} else if (inputType === 'select') {
return (
- <Select>
- {options.map((item, i) => (<Select.Option key={i} value={item.field || item.value}> {item.label || item.text} </Select.Option>))}
+ <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
+ {options.map((item, i) => (<Select.Option key={i} value={item.field || item.value}>{item.label || item.text}</Select.Option>))}
</Select>
)
} else if (inputType === 'multiStr') {
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index 9b75923..6dfcf7b 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -27,6 +27,7 @@
'5:1': '20%', '6:1': '16.67%', '7:1': '14.29%', '8:1': '12.5%', '9:1': '11.11%',
'10:1': '10%', '3:4': '133.33%', '2:3': '150%', '9:16': '177.78%'
}
+const appType = sessionStorage.getItem('appType')
const Card = ({ id, parent, fields, card, moveCard, findCard, editCard, delCard, copyCard, changeStyle, updateMarks }) => {
const originalIndex = findCard(id).index
@@ -162,6 +163,11 @@
}
}
+ let able = true
+ if ((appType === 'mob' || appType === 'pc') && parent && (parent.setting.click === 'menu' || parent.setting.click === 'menus')) {
+ able = false
+ }
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
@@ -173,7 +179,7 @@
</div>
} trigger="hover">
<div ref={node => drag(drop(node))} className={'ant-col card-cell ant-col-' + card.width}>
- <div style={_style} onClick={clickComponent} id={card.uuid}>
+ <div style={_style} onClick={clickComponent} onDoubleClick={() => able && editCard(id)} id={card.uuid}>
{getContent()}
</div>
</div>
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index d9bb436..0d4b95f 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -198,9 +198,9 @@
} else {
reOptions.sqlType = this.state.insertUpdateOptions
}
- if (this.record.execSuccess === 'goback') {
+ // if (this.record.execSuccess === 'goback') {
shows.push('reload')
- }
+ // }
} else if (openType === 'form') {
let intertype = this.record.intertype
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 2516398..b0fe85c 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -738,9 +738,9 @@
{
type: 'radio',
key: 'reload',
- label: '杩斿洖鍚�',
+ label: '涓婁竴椤�',
initVal: card.reload || 'false',
- tooltip: '杩斿洖鍚庢槸鍚﹀埛鏂版暟鎹�傛敞锛氬湪鏄庣浜慉PP鎴栧皬绋嬪簭涓湁鏁堛��',
+ tooltip: '鎴愬姛鍚庢槸鍚﹀埛鏂颁笂椤电殑鏁版嵁銆傛敞锛氬湪鏄庣浜慉PP鎴栧皬绋嬪簭涓湁鏁堛��',
forbid: appType !== 'mob',
options: [{
value: 'false',
diff --git a/src/mob/components/topbar/normal-navbar/options.jsx b/src/mob/components/topbar/normal-navbar/options.jsx
index 3185952..f9f3c7d 100644
--- a/src/mob/components/topbar/normal-navbar/options.jsx
+++ b/src/mob/components/topbar/normal-navbar/options.jsx
@@ -1,3 +1,6 @@
+import React from 'react'
+import MkIcon from '@/components/mk-icon'
+
/**
* @description Wrap琛ㄥ崟閰嶇疆淇℃伅
*/
@@ -122,6 +125,36 @@
label: '鍒锋柊'
}]
},
+ {
+ type: 'table',
+ field: 'menus',
+ label: '鑷畾涔夎彍鍗�',
+ initval: wrap.menus || [],
+ required: false,
+ span: 24,
+ columns: [
+ {
+ title: '鍥炬爣',
+ dataIndex: 'icon',
+ inputType: 'icon',
+ editable: true,
+ required: true,
+ render: (text, record) => <MkIcon type={text}/>,
+ width: '35%'
+ },
+ {
+ title: '鑿滃崟',
+ dataIndex: 'menu',
+ inputType: 'select',
+ editable: true,
+ required: true,
+ extends: [{key: 'label', value: 'label'}],
+ width: '35%',
+ render: (text, record) => record.label,
+ options: menulist
+ }
+ ]
+ }
]
return topbarWrapForm
--
Gitblit v1.8.0