From 0844cf7a0de1b38ff9649e7958adbfffe1b3532d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 九月 2023 10:09:48 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/utils.jsx | 6
src/menu/components/calendar/board/index.scss | 15 -
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 24 +-
src/tabviews/custom/components/card/double-data-card/index.scss | 28 --
src/tabviews/custom/components/module/account/index.jsx | 24 -
src/components/header/index.jsx | 9
src/tabviews/custom/components/card/double-data-card/index.jsx | 22 -
src/tabviews/custom/components/chart/antv-G6/index.jsx | 24 +-
src/tabviews/custom/components/card/cardItem/index.jsx | 35 +--
src/views/mkiframe/index.jsx | 4
src/templates/zshare/verifycard/customscript/index.jsx | 23 +
src/tabviews/custom/components/group/normal-group/index.scss | 12 -
src/tabviews/custom/components/carousel/data-card/index.jsx | 2
src/tabviews/custom/popview/index.jsx | 2
src/tabviews/basetable/index.jsx | 2
src/tabviews/custom/components/calendar/board/index.jsx | 20 -
src/tabviews/home/index.jsx | 2
src/tabviews/custom/components/form/simple-form/index.jsx | 2
src/tabviews/subtable/index.jsx | 2
src/tabviews/commontable/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 20
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 122 +++++++---
src/menu/components/group/normal-group/index.scss | 8
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 65 +++++
src/index.js | 2
src/tabviews/custom/components/form/tab-form/index.jsx | 2
src/tabviews/custom/components/card/table-card/index.jsx | 27 -
src/tabviews/zshare/actionList/tabbutton/index.jsx | 17
src/menu/components/card/double-data-card/options.jsx | 26 -
src/tabviews/custom/components/calendar/board/index.scss | 15 -
src/tabviews/custom/components/carousel/cardItem/index.jsx | 35 +-
src/menu/datasource/verifycard/settingform/index.jsx | 2
src/templates/zshare/verifycard/index.jsx | 2
src/tabviews/custom/components/chart/antv-pie/index.jsx | 11
src/tabviews/custom/components/chart/antv-X6/index.jsx | 17
src/tabviews/custom/components/carousel/prop-card/index.jsx | 2
src/tabviews/custom/components/form/step-form/index.jsx | 2
src/tabviews/custom/index.jsx | 2
src/tabviews/custom/components/module/voucher/saveAsTemp/index.jsx | 8
src/menu/components/group/normal-group/index.jsx | 1
40 files changed, 318 insertions(+), 328 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 4ad3d8a..069be85 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -60,7 +60,7 @@
if (e.key === 'getSessionStorage' && e.newValue === window.GLOB.appkey) {
localStorage.setItem('sessionStorage', JSON.stringify(sessionStorage))
} else if (e.key === 'getSysPermission' && e.newValue === window.GLOB.appkey) {
- localStorage.setItem('sysPermissions', JSON.stringify({mkThdMenus: window.GLOB.mkThdMenus, mkActions: window.GLOB.mkActions}))
+ localStorage.setItem('sysPermissions', JSON.stringify({mkThdMenus: this.state.thdMenuList, mkActions: window.GLOB.mkActions}))
} else if (e.key === 'menuUpdate') {
let vals = e.newValue.split(',')
let menuId = vals[1]
@@ -180,7 +180,12 @@
}
window.GLOB.mainMenu = mainMenu
- window.GLOB.mkThdMenus = [...thdMenuList, {MenuID: 'home_page_id', EasyCode: '', MenuName: 'home', type: 'CustomPage'}]
+
+ thdMenuList.forEach(item => {
+ window.GLOB.mkThdMenus.set(item.MenuID, item)
+ })
+
+ window.GLOB.mkThdMenus.set('home_page_id', {MenuID: 'home_page_id', EasyCode: '', MenuName: 'home', type: 'CustomPage'})
MKEmitter.emit('mainMenuChange')
diff --git a/src/index.js b/src/index.js
index addc05c..2e62f85 100644
--- a/src/index.js
+++ b/src/index.js
@@ -241,7 +241,6 @@
let lang = localStorage.getItem(_href + 'lang') || (config.defaultLang !== 'en-US' ? 'zh-CN' : 'en-US')
sessionStorage.setItem('lang', lang)
- GLOB.mkThdMenus = [] // 涓夌骇鑿滃崟
GLOB.mkActions = {} // 鎸夐挳鏉冮檺闆�
Object.defineProperty(GLOB, 'appId', {
@@ -309,6 +308,7 @@
window.GLOB.CacheData = new Map() // 瀛樺偍閫変腑鏁版嵁
window.GLOB.SearchBox = new Map() // 瀛樺偍鎼滅储鏉′欢
window.GLOB.SyncData = new Map() // 瀛樺偍鍚屾鏌ヨ鏁版嵁
+ window.GLOB.mkThdMenus = new Map() // 涓夌骇鑿滃崟
render(Route)
})
diff --git a/src/menu/components/calendar/board/index.scss b/src/menu/components/calendar/board/index.scss
index a81b171..9758bdc 100644
--- a/src/menu/components/calendar/board/index.scss
+++ b/src/menu/components/calendar/board/index.scss
@@ -4,21 +4,6 @@
padding: 20px;
color: rgba(0, 0, 0, 0.85);
- .loading-data {
- position: absolute;
- top: 0;
- left: 20px;
- right: 20px;
- bottom: 0;
- z-index: 2;
- opacity: 0.5;
- background: #ffffff;
- .ant-spin-spinning {
- position: absolute;
- left: 50%;
- top: 270px;
- }
- }
.mk-calendar-control {
text-align: right;
.ant-select {
diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index dac4c9e..3bdc566 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -60,22 +60,6 @@
precision: 0,
required: true
},
- // {
- // type: 'radio',
- // field: 'layout',
- // label: '鍗＄墖甯冨眬',
- // initval: wrap.layout || 'grid',
- // tooltip: appType === 'mob' ? '寮规�у竷灞�鏃讹紝婊戝姩鍔犺浇鏃犳晥' : '',
- // required: false,
- // options: [
- // {value: 'grid', label: '鏍呮牸甯冨眬'},
- // {value: 'flex', label: '寮规�у竷灞�'},
- // ],
- // controlFields: [
- // {field: 'printHeight', values: ['flex']},
- // {field: 'cardFloat', values: ['grid']},
- // ]
- // },
{
type: 'radio',
field: 'pagestyle',
@@ -127,14 +111,14 @@
type: 'select',
field: 'selStyle',
label: '閫変腑椋庢牸',
- initval: wrap.selStyle || 'active',
- tooltip: '瀛樺湪杈规鏃讹紝杈规浼氫娇鐢ㄧ郴缁熻壊銆�',
+ initval: wrap.selStyle || 'check',
+ // tooltip: '瀛樺湪杈规鏃讹紝杈规浼氫娇鐢ㄧ郴缁熻壊銆�',
required: false,
options: [
{value: 'none', label: '鏃�'},
- {value: 'active', label: '澶栭槾褰�'},
- {value: 'backFont', label: '鑳屾櫙+鏂囧瓧'},
- {value: 'font', label: '鏂囧瓧'},
+ // {value: 'active', label: '澶栭槾褰�'},
+ // {value: 'backFont', label: '鑳屾櫙+鏂囧瓧'},
+ // {value: 'font', label: '鏂囧瓧'},
{value: 'check', label: '鍕鹃�夛紙鍦嗘锛�'},
{value: 'check square', label: '鍕鹃�夛紙鏂规锛�'}
]
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index 2786f97..ae1d50b 100644
--- a/src/menu/components/group/normal-group/index.jsx
+++ b/src/menu/components/group/normal-group/index.jsx
@@ -187,7 +187,6 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- {/* {group.setting && group.setting.print === 'true' ? <Button className="print-button" onClick={this.print}><PrinterOutlined /></Button> : null} */}
<GroupComponents config={group} handleList={this.updateComponent} deleteCard={this.deleteCard} />
</div>
)
diff --git a/src/menu/components/group/normal-group/index.scss b/src/menu/components/group/normal-group/index.scss
index 63a4dd9..f616fad 100644
--- a/src/menu/components/group/normal-group/index.scss
+++ b/src/menu/components/group/normal-group/index.scss
@@ -17,14 +17,6 @@
padding: 5px;
background: rgba(255, 255, 255, 0.55);
}
- .print-button, .print-button:hover, .print-button:focus, .print-button:active {
- position: absolute;
- right: 40px;
- top: 0px;
- border: 0;
- background: transparent;
- color: #bcbcbc;
- }
}
.menu-group-edit-box.padding:before {
content: ' ';
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 3255937..e0ae04b 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -183,7 +183,7 @@
addProcess = () => {
let _sql = this.props.form.getFieldValue('dataresource')
- _sql = _sql + `\n/* select a.*,case when isnull(w.remark,'')='' then a.remark else w.remark end as remark_w,case when isnull(w.statusname,'')='' then a.statusname else w.statusname end as statusname_w,w.status as status_w from 鏁版嵁婧� a left join (select * from s_my_works_flow where works_flow_code='娴佺▼缂栫爜' and deleted=0) w on a.id=w.works_flow_id where isnull(w.status,0)=0 */`
+ _sql = _sql + `\n/* select a.*, w.remark as remark_w, w.statusname as statusname_w,w.status as status_w from 鏁版嵁婧� a inner join (select * from s_my_works_flow where works_flow_code=@works_flow_code@ and status=0 and deleted=0) w on a.id=w.works_flow_id */`
this.props.form.setFieldsValue({
dataresource: _sql
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 71bb2b5..b04140c 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -55,6 +55,12 @@
_customScript = _customScript.replace(/@\$|\$@/ig, '')
_tailScript = _tailScript.replace(/@\$|\$@/ig, '')
+ if (window.GLOB.process) {
+ _dataresource = _dataresource.replace(/@works_flow_code@/ig, `'${timestamp}'`)
+ _customScript = _customScript.replace(/@works_flow_code@/ig, `'${timestamp}'`)
+ _tailScript = _tailScript.replace(/@works_flow_code@/ig, `'${timestamp}'`)
+ }
+
_dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
_customScript = _customScript.replace(/@select\$|\$select@/ig, '')
_customScript = _customScript.replace(/@sum\$|\$sum@/ig, '')
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index e6b4a31..b66f32f 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -416,7 +416,7 @@
if (col.linkmenu && col.linkmenu.length > 0) {
let menu_id = col.linkmenu.pop()
- col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
}
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index b688628..865ed68 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -349,7 +349,7 @@
if (col.linkmenu && col.linkmenu.length > 0) {
let menu_id = col.linkmenu.slice(-1)[0]
- col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
}
diff --git a/src/tabviews/custom/components/calendar/board/index.jsx b/src/tabviews/custom/components/calendar/board/index.jsx
index 77727e6..fddbe03 100644
--- a/src/tabviews/custom/components/calendar/board/index.jsx
+++ b/src/tabviews/custom/components/calendar/board/index.jsx
@@ -493,31 +493,29 @@
MKEmitter.emit('modifyTabs', newtab, true)
} else if (config.wrap.click === 'menu') {
- let menuId = config.wrap.MenuID || config.wrap.menu.slice(-1)[0]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menuId = config.wrap.menu.slice(-1)[0]
+ let menu = null
- if (!menu && config.wrap.MenuName && config.wrap.tabType) {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (config.wrap.MenuID) {
menu = {
- MenuID: menuId,
+ MenuID: config.wrap.MenuID,
MenuName: config.wrap.MenuName,
- MenuNo: config.wrap.MenuNo || '',
type: config.wrap.tabType
}
}
if (!menu) return
- let newtab = {
- ...menu,
- param: {$BID: data.$$uuid || ''}
- }
+ menu.param = {$BID: data.$$uuid || ''}
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
+ menu.param[key] = data[key]
})
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
}
}
diff --git a/src/tabviews/custom/components/calendar/board/index.scss b/src/tabviews/custom/components/calendar/board/index.scss
index 3957fc3..583e54d 100644
--- a/src/tabviews/custom/components/calendar/board/index.scss
+++ b/src/tabviews/custom/components/calendar/board/index.scss
@@ -4,21 +4,6 @@
padding: 20px;
color: rgba(0, 0, 0, 0.85);
- .loading-data {
- position: absolute;
- top: 0;
- left: 20px;
- right: 20px;
- bottom: 0;
- z-index: 2;
- opacity: 0.5;
- background: #ffffff;
- .ant-spin-spinning {
- position: absolute;
- left: 50%;
- top: 270px;
- }
- }
.mk-calendar-control {
text-align: right;
.ant-select {
diff --git a/src/tabviews/custom/components/card/cardItem/index.jsx b/src/tabviews/custom/components/card/cardItem/index.jsx
index d7d8a72..b601bc9 100644
--- a/src/tabviews/custom/components/card/cardItem/index.jsx
+++ b/src/tabviews/custom/components/card/cardItem/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { notification } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -15,8 +14,6 @@
card: PropTypes.object, // 鍗＄墖閰嶇疆淇℃伅
data: PropTypes.object,
}
-
- state = {}
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.props.data), fromJS(nextProps.data))
@@ -55,7 +52,6 @@
let newtab = {
MenuID: menu.MenuID,
MenuName: menu.MenuName,
- MenuNo: menu.MenuNo || '',
type: menu.tabType,
param: {}
}
@@ -72,43 +68,34 @@
MKEmitter.emit('modifyTabs', newtab, true)
} else if (card.setting.click === 'menu') {
- let menuId = card.setting.MenuID || card.setting.menu.slice(-1)[0]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menuId = card.setting.menu.slice(-1)[0]
+ let menu = null
- if (!menu && card.setting.MenuName && card.setting.tabType) {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (card.setting.MenuID) {
menu = {
- MenuID: menuId,
+ MenuID: card.setting.MenuID,
MenuName: card.setting.MenuName,
- MenuNo: card.setting.MenuNo || '',
type: card.setting.tabType
}
}
- if (!menu) {
- notification.warning({
- top: 92,
- message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
- duration: 5
- })
- return
- }
+ if (!menu) return
- let newtab = {
- ...menu,
- param: {}
- }
+ menu.param = {}
if (card.setting.joint === 'true') {
- newtab.param.$BID = data.$$uuid || ''
+ menu.param.$BID = data.$$uuid || ''
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
if (key === 'children') return
- newtab.param[key] = data[key]
+ menu.param[key] = data[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
} else if (card.setting.click === 'link') {
let src = card.setting.linkurl
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index 53048cb..d803a09 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -1033,36 +1033,34 @@
if (subcard.setting.click || card.setting.position !== 'inner' || card.setting.click !== 'menu') return
- let menuId = card.setting.MenuID || card.setting.menu.slice(-1)[0]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menuId = card.setting.menu.slice(-1)[0]
+ let menu = null
- if (!menu && card.setting.MenuName && card.setting.tabType) {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (card.setting.MenuID) {
menu = {
- MenuID: menuId,
+ MenuID: card.setting.MenuID,
MenuName: card.setting.MenuName,
- MenuNo: card.setting.MenuNo || '',
type: card.setting.tabType
}
}
if (!menu) return
- let newtab = {
- ...menu,
- param: {}
- }
+ menu.param = {}
if (card.setting.joint === 'true') {
- newtab.param.$BID = item.$$uuid || ''
+ menu.param.$BID = item.$$uuid || ''
Object.keys(item).forEach(key => {
if (/^\$/.test(key)) return
if (key === 'children') return
- newtab.param[key] = item[key]
+ menu.param[key] = item[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
}
onDoubleClick = (i, subClass) => {
diff --git a/src/tabviews/custom/components/card/double-data-card/index.scss b/src/tabviews/custom/components/card/double-data-card/index.scss
index c6a13e8..e0b3f63 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.scss
+++ b/src/tabviews/custom/components/card/double-data-card/index.scss
@@ -22,16 +22,6 @@
}
}
}
- .data-zoom.scale {
- .card-row-list {
- .mk-card:hover {
- >.card-item-box {
- z-index: 1;
- transform: scale(1.05);
- }
- }
- }
- }
.card-row-list {
flex: 10;
max-width: 100%;
@@ -42,24 +32,6 @@
>.ant-col {
width: 5%;
flex: 1;
- }
- }
- .card-row-list.float-center {
- text-align: center;
- >.ant-col {
- display: inline-block;
- float: none;
- text-align: left;
- vertical-align: top;
- }
- }
- .card-row-list.float-right {
- text-align: right;
- >.ant-col {
- display: inline-block;
- float: none;
- text-align: left;
- vertical-align: top;
}
}
.card-item-box {
diff --git a/src/tabviews/custom/components/card/table-card/index.jsx b/src/tabviews/custom/components/card/table-card/index.jsx
index f131f2c..8dcb134 100644
--- a/src/tabviews/custom/components/card/table-card/index.jsx
+++ b/src/tabviews/custom/components/card/table-card/index.jsx
@@ -462,41 +462,32 @@
openView = (card, data) => {
if (card.setting.click === 'menu' && card.setting.menu) {
let menuId = card.setting.menu.slice(-1)[0]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menu = null
- if (!menu && card.setting.MenuName && card.setting.MenuID) {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (card.setting.MenuID) {
menu = {
MenuID: card.setting.MenuID,
MenuName: card.setting.MenuName,
- MenuNo: card.setting.MenuNo || '',
type: card.setting.tabType
}
}
- if (!menu) {
- notification.warning({
- top: 92,
- message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
- duration: 5
- })
- return
- }
+ if (!menu) return
- let newtab = {
- ...menu,
- param: {}
- }
+ menu.param = {}
if (card.setting.joint === 'true') {
- newtab.param.$BID = data.$$uuid || ''
+ menu.param.$BID = data.$$uuid || ''
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
+ menu.param[key] = data[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
} else if (card.setting.click === 'link') {
let src = card.setting.linkurl
diff --git a/src/tabviews/custom/components/carousel/cardItem/index.jsx b/src/tabviews/custom/components/carousel/cardItem/index.jsx
index e502391..1ed6197 100644
--- a/src/tabviews/custom/components/carousel/cardItem/index.jsx
+++ b/src/tabviews/custom/components/carousel/cardItem/index.jsx
@@ -16,10 +16,6 @@
data: PropTypes.object,
}
- state = {
- card: null, // 鍗＄墖淇℃伅锛屽寘鎷鍙嶉潰
- }
-
/**
* @description 鎼滅储鏉′欢鍒濆鍖�
*/
@@ -45,29 +41,34 @@
if (!card.setting.click || data.$disabled) return
- if (card.setting.click === 'menu' && card.setting.MenuID) {
- let menu = {
- MenuID: card.setting.MenuID,
- MenuName: card.setting.MenuName,
- MenuNo: card.setting.MenuNo,
- type: card.setting.tabType
+ if (card.setting.click === 'menu') {
+ let menuId = card.setting.menu.slice(-1)[0]
+ let menu = null
+
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (card.setting.MenuID) {
+ menu = {
+ MenuID: card.setting.MenuID,
+ MenuName: card.setting.MenuName,
+ type: card.setting.tabType
+ }
}
- let newtab = {
- ...menu,
- param: {}
- }
+ if (!menu) return
+
+ menu.param = {}
if (card.setting.joint === 'true') {
- newtab.param.$BID = data.$$uuid || ''
+ menu.param.$BID = data.$$uuid || ''
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
+ menu.param[key] = data[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
} else if (card.setting.click === 'link') {
let src = card.setting.linkurl
diff --git a/src/tabviews/custom/components/carousel/data-card/index.jsx b/src/tabviews/custom/components/carousel/data-card/index.jsx
index dcdd491..45a3656 100644
--- a/src/tabviews/custom/components/carousel/data-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/data-card/index.jsx
@@ -82,8 +82,8 @@
if (!_config.wrap.height) { // 鍏煎
_config.wrap.height = _config.style.height || '300px'
- delete _config.style.height
}
+ delete _config.style.height
_card.style.height = _config.wrap.height
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index 273c51a..572b869 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -74,8 +74,8 @@
if (!_config.wrap.height) { // 鍏煎
_config.wrap.height = _config.style.height || '300px'
- delete _config.style.height
}
+ delete _config.style.height
_config.subcards.forEach(card => {
card.style.height = _config.wrap.height
diff --git a/src/tabviews/custom/components/chart/antv-G6/index.jsx b/src/tabviews/custom/components/chart/antv-G6/index.jsx
index 9fdeb1e..64536d5 100644
--- a/src/tabviews/custom/components/chart/antv-G6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-G6/index.jsx
@@ -1660,34 +1660,32 @@
if (!data) return
let menuId = plot.menu.slice(-1)[0]
- let newtab = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menu = null
- if (!newtab && plot.MenuID) {
- newtab = {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (plot.MenuID) {
+ menu = {
MenuID: plot.MenuID,
MenuName: plot.MenuName,
- MenuNo: plot.MenuNo,
type: plot.tabType
}
- } else if (!newtab) {
- return
}
- newtab = {
- ...newtab,
- param: {}
- }
+ if (!menu) return
+
+ menu.param = {}
if (plot.joint === 'true') {
- newtab.param.$BID = data.$$uuid || ''
+ menu.param.$BID = data.$$uuid || ''
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
+ menu.param[key] = data[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
} else {
if (data) {
this.selectedId = data.$$uuid || ''
diff --git a/src/tabviews/custom/components/chart/antv-X6/index.jsx b/src/tabviews/custom/components/chart/antv-X6/index.jsx
index 32267f3..3b654c5 100644
--- a/src/tabviews/custom/components/chart/antv-X6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/index.jsx
@@ -1939,20 +1939,23 @@
MKEmitter.emit('modifyTabs', newtab, true)
} else if (plot.click === 'menu') {
let menuId = plot.menu.slice(-1)[0]
- let newtab = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menu = null
- if (!newtab && plot.MenuID) {
- newtab = {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (plot.MenuID) {
+ menu = {
MenuID: plot.MenuID,
MenuName: plot.MenuName,
- MenuNo: plot.MenuNo,
type: plot.tabType
}
- } else if (!newtab) {
- return
}
- MKEmitter.emit('modifyTabs', {...newtab, param: {$BID: sign}}, true)
+ if (!menu) return
+
+ menu.param = {$BID: sign}
+
+ MKEmitter.emit('modifyTabs', menu, true)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, sign, {})
}
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index 7f2b2cf..46c4260 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -1875,34 +1875,32 @@
MKEmitter.emit('modifyTabs', newtab, true)
} else if (plot.click === 'menu') {
let menuId = plot.menu.slice(-1)[0]
- let newtab = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menu = null
- if (!newtab && plot.MenuID) {
- newtab = {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (plot.MenuID) {
+ menu = {
MenuID: plot.MenuID,
MenuName: plot.MenuName,
- MenuNo: plot.MenuNo,
type: plot.tabType
}
- } else if (!newtab) {
- return
}
+
+ if (!menu) return
- newtab = {
- ...newtab,
- param: {}
- }
+ menu.param = {}
if (plot.joint === 'true') {
- newtab.param.$BID = data.$$uuid || ''
+ menu.param.$BID = data.$$uuid || ''
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
+ menu.param[key] = data[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), data)
}
diff --git a/src/tabviews/custom/components/chart/antv-pie/index.jsx b/src/tabviews/custom/components/chart/antv-pie/index.jsx
index 3605b32..f589d40 100644
--- a/src/tabviews/custom/components/chart/antv-pie/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-pie/index.jsx
@@ -1031,16 +1031,9 @@
let menu_id = plot.linkmenu.slice(-1)[0]
chart.on('element:dblclick', (ev) => {
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ let menu = window.GLOB.mkThdMenus.get(menu_id) || ''
- if (!menu) {
- notification.warning({
- top: 92,
- message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
- duration: 5
- })
- return
- }
+ if (!menu) return
try {
let data = ev.data.data
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 73ca3d9..8115aea 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -207,7 +207,7 @@
execSuccess = (btn, id) => {
if (btn.linkmenu && btn.linkmenu.length > 0) {
let menu_id = btn.linkmenu[btn.linkmenu.length - 1]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ let menu = window.GLOB.mkThdMenus.get(menu_id) || ''
if (!menu) return
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index cd83384..895ff53 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -268,7 +268,7 @@
if (btn.linkmenu && btn.linkmenu.length > 0) {
let menu_id = btn.linkmenu[btn.linkmenu.length - 1]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ let menu = window.GLOB.mkThdMenus.get(menu_id) || ''
if (!menu) return
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 6286532..01a21ed 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -221,7 +221,7 @@
execSuccess = (btn, id) => {
if (btn.linkmenu && btn.linkmenu.length > 0) {
let menu_id = btn.linkmenu[btn.linkmenu.length - 1]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ let menu = window.GLOB.mkThdMenus.get(menu_id) || ''
if (!menu) return
diff --git a/src/tabviews/custom/components/group/normal-group/index.scss b/src/tabviews/custom/components/group/normal-group/index.scss
index cafae68..3869386 100644
--- a/src/tabviews/custom/components/group/normal-group/index.scss
+++ b/src/tabviews/custom/components/group/normal-group/index.scss
@@ -1,16 +1,4 @@
.normal-group-wrap {
- .print-button, .print-button:hover, .print-button:focus, .print-button:active {
- position: absolute;
- right: 0px;
- top: 0px;
- z-index: 2;
- border: 0;
- background: transparent;
- }
- .print-button:hover, .print-button:focus, .print-button:active {
- color: var(--mk-sys-color5);
- }
-
.group-header {
position: relative;
height: 45px;
diff --git a/src/tabviews/custom/components/module/account/index.jsx b/src/tabviews/custom/components/module/account/index.jsx
index a4f2cb1..24d04ca 100644
--- a/src/tabviews/custom/components/module/account/index.jsx
+++ b/src/tabviews/custom/components/module/account/index.jsx
@@ -160,24 +160,18 @@
addBook = () => {
const { config } = this.props
- let menuId = config.wrap.MenuID
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
-
- if (!menu && config.wrap.MenuNo) {
- menu = {
- MenuID: menuId,
- MenuName: config.wrap.MenuName,
- MenuNo: config.wrap.MenuNo || '',
- type: config.wrap.tabType
- }
- }
-
- let newtab = {
- ...menu,
+ let menu = {
+ MenuID: config.wrap.MenuID,
+ MenuName: config.wrap.MenuName,
+ type: config.wrap.tabType,
param: {}
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ if (window.GLOB.mkThdMenus.has(config.wrap.MenuID)) {
+ menu = {...window.GLOB.mkThdMenus.get(config.wrap.MenuID), param: {}}
+ }
+
+ MKEmitter.emit('modifyTabs', menu, true)
}
render() {
diff --git a/src/tabviews/custom/components/module/voucher/saveAsTemp/index.jsx b/src/tabviews/custom/components/module/voucher/saveAsTemp/index.jsx
index 6c5c151..4c629f2 100644
--- a/src/tabviews/custom/components/module/voucher/saveAsTemp/index.jsx
+++ b/src/tabviews/custom/components/module/voucher/saveAsTemp/index.jsx
@@ -18,15 +18,13 @@
UNSAFE_componentWillMount() {
let menuId = '16289973311406f3ko9nm8ehotdmu80o'
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menu = window.GLOB.mkThdMenus.get(menuId)
if (menu) {
- let newtab = {
+ this.setState({menu: {
...menu,
param: {}
- }
-
- this.setState({menu: newtab})
+ }})
}
}
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 7d5f9c3..6d63982 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -642,7 +642,7 @@
if (col.linkmenu && col.linkmenu.length > 0) {
let menu_id = col.linkmenu.pop()
- col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
}
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 4555cbd..a3219f7 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -395,7 +395,7 @@
if (col.linkmenu && col.linkmenu.length > 0) {
let menu_id = col.linkmenu.pop()
- col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
}
diff --git a/src/tabviews/home/index.jsx b/src/tabviews/home/index.jsx
index d91ecef..d8b8d6c 100644
--- a/src/tabviews/home/index.jsx
+++ b/src/tabviews/home/index.jsx
@@ -39,7 +39,7 @@
check = (times) => {
times++
- if ((window.GLOB.mkThdMenus.length > 0 && window.GLOB.mkActions.loaded) || times > 50) {
+ if ((window.GLOB.mkThdMenus.size > 0 && window.GLOB.mkActions.loaded) || times > 50) {
this.setState({
waiting: false
})
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 64cc21a..9f16abd 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -165,7 +165,7 @@
if (col.linkmenu && col.linkmenu.length > 0) {
let menu_id = col.linkmenu.slice(-1)[0]
- col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
}
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index a3785f0..9a8519f 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -2200,22 +2200,22 @@
if (btn.openmenu && Array.isArray(btn.openmenu) && btn.openmenu.length > 0 && sign !== '@no_target_menu@') {
let menuId = btn.openmenu.slice(-1)[0]
- let newtab = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menu = null
- if (!newtab && btn.MenuID) {
- newtab = {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId), param: { $BID: id }}
+ } else if (btn.MenuID) {
+ menu = {
MenuID: btn.MenuID,
MenuName: btn.MenuName,
- MenuNo: btn.MenuNo,
- type: btn.tabType
+ type: btn.tabType,
+ param: { $BID: id }
}
- } else if (!newtab) {
- return
}
- newtab = {...newtab, param: { $BID: id }}
-
- MKEmitter.emit('modifyTabs', newtab, true)
+ if (menu) {
+ MKEmitter.emit('modifyTabs', menu, true)
+ }
}
if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
diff --git a/src/tabviews/zshare/actionList/tabbutton/index.jsx b/src/tabviews/zshare/actionList/tabbutton/index.jsx
index 184f2c8..c34cf31 100644
--- a/src/tabviews/zshare/actionList/tabbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/tabbutton/index.jsx
@@ -146,14 +146,16 @@
}
} else if (btn.linkmenu && btn.linkmenu.length > 0) {
let menuId = btn.linkmenu.slice(-1)[0]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menu = null
- if (!menu && btn.MenuName && btn.MenuID) {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId), param: { $BID: primaryId }}
+ } else if (btn.MenuID) {
menu = {
MenuID: btn.MenuID,
MenuName: btn.MenuName,
- MenuNo: btn.MenuNo,
- type: btn.tabType
+ type: btn.tabType,
+ param: { $BID: primaryId }
}
}
@@ -166,12 +168,7 @@
return
}
- newtab = {
- ...menu,
- param: {
- $BID: primaryId
- }
- }
+ newtab = menu
}
if (btn.openTab === 'view') {
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index cb4990f..7b474da 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -388,48 +388,100 @@
const { verify } = this.state
let _columns = JSON.parse(JSON.stringify(verify.columns))
+ let _names = {}
+ let _cols = _columns.map(item => {
+ let key = item.Column.toLowerCase()
+ _names[key] = item.Text
- let _cols = _columns.map(col => col.Column)
+ return key
+ })
+ let names = {$up: false}
columns.forEach(col => {
- if (col.field && !_cols.includes(col.field)) {
- let _type = 'Nvarchar(50)'
- let _limit = '50'
- if (col.type === 'number' && !col.decimal) {
- _type = 'Int'
- _limit = ''
- } else if (col.type === 'number') {
- _type = 'Decimal(18,' + col.decimal + ')'
- _limit = col.decimal
+ if (!col.field) return
+ let key = col.field.toLowerCase()
+ if (_cols.includes(key)) {
+ if (_names[key] !== col.label) {
+ names.$up = true
+ names[key] = col.label
}
-
- let _cell = {
- uuid: col.uuid,
- Column: col.field,
- Text: col.label,
- type: _type,
- limit: _limit,
- import: 'true',
- required: 'true'
- }
-
- if (_type !== 'Nvarchar(50)') {
- _cell.min = 0
- _cell.max = 999999
- }
-
- _columns.push(_cell)
+ return
}
+
+ let _type = 'Nvarchar(50)'
+ let _limit = '50'
+ if (col.type === 'number' && !col.decimal) {
+ _type = 'Int'
+ _limit = ''
+ } else if (col.type === 'number') {
+ _type = 'Decimal(18,' + col.decimal + ')'
+ _limit = col.decimal
+ }
+
+ let _cell = {
+ uuid: col.uuid,
+ Column: col.field,
+ Text: col.label,
+ type: _type,
+ limit: _limit,
+ import: 'true',
+ required: 'true'
+ }
+
+ if (_type !== 'Nvarchar(50)') {
+ _cell.min = 0
+ _cell.max = 999999
+ }
+
+ _columns.push(_cell)
})
- this.setState({
- verify: {
- ...verify,
- columns: _columns
- }
- }, () => {
- this.resetUniqueColumns()
- })
+ if (names.$up) {
+ const that = this
+
+ confirm({
+ content: '閮ㄥ垎瀛楁鍚嶇О涓庢樉绀哄垪涓嶄竴鑷达紝鏄惁鏇存柊锛�',
+ onOk() {
+ _columns = _columns.map(item => {
+ let key = item.Column.toLowerCase()
+
+ if (names[key]) {
+ item.Text = names[key]
+ }
+
+ return item
+ })
+
+ that.setState({
+ verify: {
+ ...verify,
+ columns: _columns
+ }
+ }, () => {
+ that.resetUniqueColumns()
+ })
+ },
+ onCancel() {
+ that.setState({
+ verify: {
+ ...verify,
+ columns: _columns
+ }
+ }, () => {
+ that.resetUniqueColumns()
+ })
+ }
+ })
+ } else {
+ this.setState({
+ verify: {
+ ...verify,
+ columns: _columns
+ }
+ }, () => {
+ this.resetUniqueColumns()
+ })
+ }
}
clearField = () => {
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index ebce7e5..beddccf 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -600,11 +600,25 @@
const { verify } = this.state
let columns = fromJS(verify.columns).toJS()
- let fields = columns.map(item => item.Column)
+ let _names = {}
+ let fields = columns.map(item => {
+ let key = item.Column.toLowerCase()
+ _names[key] = item.Text
+
+ return key
+ })
+ let names = {$up: false}
config.columns.forEach(item => {
- if (fields.includes(item.field) || !item.field) return
- fields.push(item.field)
+ if (!item.field) return
+ let key = item.field.toLowerCase()
+ if (fields.includes(key)) {
+ if (_names[key] !== item.label) {
+ names.$up = true
+ names[key] = item.label
+ }
+ return
+ }
let cell = {
Column: item.field,
@@ -627,8 +641,15 @@
if (config.subtype === 'dualdatacard') {
config.subColumns.forEach(item => {
- if (fields.includes(item.field) || !item.field) return
- fields.push(item.field)
+ if (!item.field) return
+ let key = item.field.toLowerCase()
+ if (fields.includes(key)) {
+ if (_names[key] !== item.label) {
+ names.$up = true
+ names[key] = item.label
+ }
+ return
+ }
let cell = {
Column: item.field,
@@ -650,9 +671,37 @@
})
}
- this.setState({
- verify: {...verify, columns: columns}
- })
+ if (names.$up) {
+ const that = this
+
+ confirm({
+ content: '閮ㄥ垎瀛楁鍚嶇О涓庢樉绀哄垪涓嶄竴鑷达紝鏄惁鏇存柊锛�',
+ onOk() {
+ columns = columns.map(item => {
+ let key = item.Column.toLowerCase()
+
+ if (names[key]) {
+ item.Text = names[key]
+ }
+
+ return item
+ })
+
+ that.setState({
+ verify: {...verify, columns: columns}
+ })
+ },
+ onCancel() {
+ that.setState({
+ verify: {...verify, columns: columns}
+ })
+ }
+ })
+ } else {
+ this.setState({
+ verify: {...verify, columns: columns}
+ })
+ }
}
clearField = () => {
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index 5d49e8c..3f41300 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -45,7 +45,7 @@
}
handleConfirm = () => {
- const { type } = this.props
+ const { type, workFlow } = this.props
const { editItem, skip } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
@@ -198,6 +198,13 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.LText = param.LText.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'${param.timestamp}'`)
+ if (window.GLOB.process && workFlow === 'true') {
+ param.LText = param.LText.replace(/@works_flow_code@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/@works_flow_name@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/@works_flow_param@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/@works_flow_detail_id@/ig, `'${param.timestamp}'`)
+ }
+
console.info(`/* sql 楠岃瘉 */\n${param.LText.replace(/\n\s{6,20}/ig, '\n')}`)
param.LText = param.LText.replace(/\n/g, ' ')
@@ -251,7 +258,7 @@
}
selectScript = (value, option) => {
- // const { flowType } = this.props
+ const { flowType } = this.props
if (!value || !option) return
@@ -266,8 +273,16 @@
}
if (value === 'flowSql') {
- value = `insert into s_my_works_flow ( works_flow_id,works_flow_code,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
- select @ID@,'娴佺▼缂栫爜','涓嬩竴姝ヨ鐢ㄥ埌鐨勫弬鏁颁覆','鑱屽憳鍒嗙粍','娴佺▼鑺傜偣id','鑱屽憳绛夌骇',@bid@,@UserID@,@UserName,@FullName`
+ if (flowType === 'start') {
+ value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
+ select @ID@,@works_flow_code@,@works_flow_param@,'鑱屽憳鍒嗙粍',@works_flow_detail_id@,'鑱屽憳绛夌骇',@bid@,@UserID@,@UserName,@FullName
+ insert into s_my_works_flow_log (works_flow_id,works_flow_code,works_flow_name,status,statuscharone,statuschartwo,StatusCharThree,StatusCharFour,StatusCharFive,statusname,remark,CreateUserID,CreateUser,CreateStaff,works_flow_detail_id,sort,upid,work_group,work_grade,typecharone,deleted,statusname_suc,statusname_back )`
+ } else {
+ value = `insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_param,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff)
+ select @ID@,@works_flow_code@,@works_flow_param@,'鑱屽憳鍒嗙粍',@works_flow_detail_id@,'鑱屽憳绛夌骇',@bid@,@UserID@,@UserName,@FullName`
+ }
+
+ value = value.replace(/\n\s{8}/g, '\n')
}
_sql = _sql.replace(/\s{6}$/, '')
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 477f98b..3103749 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -573,7 +573,7 @@
if (window.GLOB.process) {
_verify.workFlow = _verify.workFlow || 'false'
- _verify.flowType = _verify.flowType || 'approval'
+ _verify.flowType = _verify.flowType || (card.sqlType === 'insert' ? 'start' : 'approval')
_verify.flowSql = _verify.flowSql || 'true'
} else {
delete _verify.workFlow
diff --git a/src/views/mkiframe/index.jsx b/src/views/mkiframe/index.jsx
index 3f11727..d8ca857 100644
--- a/src/views/mkiframe/index.jsx
+++ b/src/views/mkiframe/index.jsx
@@ -32,8 +32,10 @@
let values = event.newValue
values = JSON.parse(values)
- window.GLOB.mkThdMenus = values.mkThdMenus
window.GLOB.mkActions = values.mkActions
+ values.mkThdMenus && values.mkThdMenus.forEach(item => {
+ window.GLOB.mkThdMenus.set(item.MenuID, item)
+ })
} else if (event.key === 'menuUpdate') {
let vals = event.newValue.split(',')
let MenuId = vals[1]
--
Gitblit v1.8.0