From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 六月 2023 15:59:04 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 1140 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 771 insertions(+), 369 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 7b31de2..f49846b 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import moment from 'moment'
+import qs from 'qs'
import { is, fromJS } from 'immutable'
import { Button, Modal, notification, message, Drawer, Switch, Checkbox, Progress } from 'antd'
@@ -13,6 +14,7 @@
import { updateForm } from '@/utils/utils-update.js'
import MKEmitter from '@/utils/events.js'
import MkIcon from '@/components/mk-icon'
+import MkCounter from './mkcounter'
// import './index.scss'
const MutilForm = asyncSpinComponent(() => import('@/tabviews/zshare/mutilform'))
@@ -24,11 +26,9 @@
BData: PropTypes.any, // 涓昏〃鏁版嵁
style: PropTypes.any, // 鎸夐挳鏍峰紡
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
- Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
btn: PropTypes.object, // 鎸夐挳
columns: PropTypes.any, // 瀛楁鍒�
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
- ContainerId: PropTypes.any, // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
disabled: PropTypes.any, // 琛屾寜閽鐢�
}
@@ -44,44 +44,36 @@
loadingTotal: '',
disabled: false,
hidden: false,
- checkParam: null,
autoMatic: false,
- check: false
+ check: false,
+ count: 0
}
moduleParams = null
UNSAFE_componentWillMount () {
- const { btn, selectedData, BData } = this.props
- let disabled = false
+ const { btn, selectedData, BData, disabled } = this.props
- if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
- selectedData.forEach(item => {
- let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
- disabled = true
- }
- })
- this.setState({hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent') {
- if (!BData || !BData.hasOwnProperty(btn.controlField)) {
- this.setState({hidden: true})
- } else {
- let s = BData[btn.controlField] + ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
- this.setState({hidden: true})
- } else {
- this.setState({hidden: false})
- }
- }
- }
- if (this.props.disabled || disabled) {
+ if (btn.controlField) {
+ this.setStatus(btn, selectedData || [], BData, disabled)
+ } else if (disabled) {
this.setState({disabled: true})
}
if (btn.OpenType === 'form') {
let data = selectedData && selectedData[0] ? selectedData[0] : null
- this.setState({check: data && data[btn.field] === btn.openVal})
+ if (btn.formType === 'counter' || btn.formType === 'count_line') {
+ let count = 0
+ if (data && data[btn.field]) {
+ count = +data[btn.field]
+ if (isNaN(count)) {
+ count = 0
+ }
+ }
+ this.setState({count: count })
+ } else {
+ this.setState({check: data && data[btn.field] === btn.openVal})
+ }
} else if (btn.OpenType === 'formSubmit') {
this.setState({
selines: selectedData || []
@@ -107,41 +99,28 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData, BData } = this.props
+ const { btn } = this.props
- let disabled = false
- if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
- if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
- nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
- disabled = true
- }
- })
- }
- this.setState({hidden: disabled && btn.control === 'hidden'})
- } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
- if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
- this.setState({hidden: true})
- } else {
- let s = nextProps.BData[btn.controlField] + ''
- if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
- this.setState({hidden: true})
- } else {
- this.setState({hidden: false})
- }
- }
- }
-
- if (nextProps.disabled || disabled) {
- this.setState({disabled: true})
+ if (btn.controlField) {
+ this.setStatus(btn, nextProps.selectedData || [], nextProps.BData, nextProps.disabled)
} else {
- this.setState({disabled: false})
+ this.setState({disabled: nextProps.disabled === true})
}
if (btn.OpenType === 'form') {
let data = nextProps.selectedData && nextProps.selectedData[0] ? nextProps.selectedData[0] : null
- this.setState({check: data && data[btn.field] === btn.openVal})
+ if (btn.formType === 'counter' || btn.formType === 'count_line') {
+ let count = 0
+ if (data && data[btn.field]) {
+ count = +data[btn.field]
+ if (isNaN(count)) {
+ count = 0
+ }
+ }
+ this.setState({count: count })
+ } else {
+ this.setState({check: data && data[btn.field] === btn.openVal})
+ }
} else if (btn.OpenType === 'formSubmit') {
this.setState({
selines: nextProps.selectedData || []
@@ -156,6 +135,43 @@
MKEmitter.removeListener('triggerBtnId', this.actionTrigger)
MKEmitter.removeListener('triggerFormSubmit', this.actionSubmit)
MKEmitter.removeListener('triggerBtnPopSubmit', this.triggerBtnPopSubmit)
+ }
+
+ setStatus = (btn, data, BData, disprop) => {
+ let disabled = false
+ let hidden = false
+
+ if (btn.control !== 'parent') {
+ if (data.length > 0) {
+ data.forEach(item => {
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
+ if (btn.controlVals.includes(s) || item.$lock) {
+ disabled = true
+ }
+ })
+ } else if (btn.controlVals.includes('')) {
+ disabled = true
+ }
+ } else {
+ if (!BData || !BData.hasOwnProperty(btn.controlField)) {
+ hidden = true
+ } else {
+ let s = BData[btn.controlField] + ''
+ if (btn.controlVals.includes(s)) {
+ hidden = true
+ }
+ }
+ }
+
+ if (disabled && btn.control === 'hidden') {
+ hidden = true
+ }
+
+ if (disprop) {
+ disabled = true
+ }
+
+ this.setState({hidden, disabled})
}
triggerBtnPopSubmit = (id) => {
@@ -217,13 +233,13 @@
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
actionTrigger = (triggerId, record, type) => {
- const { Tab, BID, btn, selectedData, setting } = this.props
+ const { BID, btn, selectedData, setting } = this.props
const { loading, disabled } = this.state
if (loading || disabled) return
if (triggerId && btn.uuid !== triggerId) return
- if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
+ if (setting.supModule && !BID) {
notification.warning({
top: 92,
message: '闇�瑕佷笂绾т富閿�硷紒',
@@ -314,6 +330,9 @@
return
}
} else if (!['inner', 'outer', 'system', 'custom'].includes(btn.intertype)) {
+ if (btn.OpenType === 'form' && btn.formType === 'count_line') {
+ return
+ }
// 鎺ュ彛绫诲瀷閿欒
notification.warning({
top: 92,
@@ -361,30 +380,41 @@
this.improveAction()
})
} else if (btn.OpenType === 'form') {
- this.setState({
- loading: true,
- check: !this.state.check
- }, () => {
- let type = 'text'
- let fieldlen = 50
- let value = this.state.check ? btn.openVal : btn.closeVal
-
- if (typeof(value) === 'number') {
- type = 'number'
- fieldlen = 0
- }
-
+ if (btn.formType === 'counter') {
let item = {
- type: type,
- readonly: false,
+ type: 'number',
readin: true,
writein: true,
- fieldlen: fieldlen,
+ fieldlen: btn.decimal || 0,
key: btn.field,
- value: value
+ value: this.state.count
}
- this.execSubmit(data, () => { this.setState({loading: false})}, [item])
- })
+ this.execSubmit(data, () => {}, [item])
+ } else {
+ this.setState({
+ loading: true,
+ check: !this.state.check
+ }, () => {
+ let type = 'text'
+ let fieldlen = 50
+ let value = this.state.check ? btn.openVal : btn.closeVal
+
+ if (typeof(value) === 'number') {
+ type = 'number'
+ fieldlen = 0
+ }
+
+ let item = {
+ type: type,
+ readin: true,
+ writein: true,
+ fieldlen: fieldlen,
+ key: btn.field,
+ value: value
+ }
+ this.execSubmit(data, () => { this.setState({loading: false})}, [item])
+ })
+ }
}
if (window.GLOB.systemType === 'production') {
@@ -405,7 +435,6 @@
let param = { // 绯荤粺瀛樺偍杩囩▼
func: 'sPC_TableData_InUpDe'
}
- let check_param = null
if (this.props.BID) {
param.BID = this.props.BID
@@ -423,11 +452,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, data[0], columns, this.props.Tab, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, data[0], columns, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, data[0], columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, '', param, data[0], columns, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -445,11 +474,9 @@
param.secretkey = Utils.encrypt('', param.timestamp)
if (/\$check@|@check\$/ig.test(param.LText)) {
- check_param = fromJS(param).toJS()
- check_param.LText = check_param.LText.replace(/\$check@/ig, '/*')
- check_param.LText = check_param.LText.replace(/@check\$/ig, '*/')
- check_param.LText = Utils.formatOptions(check_param.LText)
-
+ if (btn.intertype === 'system') {
+ param.$unCheckParam = fromJS(param).toJS()
+ }
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
@@ -468,11 +495,11 @@
param.ID = primaryId || Utils.getguid()
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, this.props.Tab, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -490,11 +517,9 @@
param.secretkey = Utils.encrypt('', param.timestamp)
if (/\$check@|@check\$/ig.test(param.LText)) {
- check_param = fromJS(param).toJS()
- check_param.LText = check_param.LText.replace(/\$check@/ig, '/*')
- check_param.LText = check_param.LText.replace(/@check\$/ig, '*/')
- check_param.LText = Utils.formatOptions(check_param.LText)
-
+ if (btn.intertype === 'system') {
+ param.$unCheckParam = fromJS(param).toJS()
+ }
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
@@ -503,11 +528,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, this.props.Tab, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, data[0], columns, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -525,11 +550,9 @@
param.secretkey = Utils.encrypt('', param.timestamp)
if (/\$check@|@check\$/ig.test(param.LText)) {
- check_param = fromJS(param).toJS()
- check_param.LText = check_param.LText.replace(/\$check@/ig, '/*')
- check_param.LText = check_param.LText.replace(/@check\$/ig, '*/')
- check_param.LText = Utils.formatOptions(check_param.LText)
-
+ if (btn.intertype === 'system') {
+ param.$unCheckParam = fromJS(param).toJS()
+ }
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
}
@@ -539,9 +562,6 @@
if (window.GLOB.mkHS) { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
- if (check_param) {
- check_param.open_key = Utils.encryptOpenKey(check_param.secretkey, check_param.timestamp)
- }
}
param.menuname = btn.logLabel
@@ -550,9 +570,18 @@
param.s_debug_type = 'Y'
}
- if (check_param) {
- check_param.menuname = btn.logLabel
- this.setState({checkParam: check_param})
+ if (window.GLOB.breakpoint) {
+ param.func = 'sPC_TableData_InUpDe_debug'
+ }
+
+ if (param.$unCheckParam) {
+ param.$unCheckParam.LText = param.$unCheckParam.LText.replace(/\$check@/ig, '/*').replace(/@check\$/ig, '*/')
+ param.$unCheckParam.LText = Utils.formatOptions(param.$unCheckParam.LText)
+ param.$unCheckParam.menuname = btn.logLabel
+
+ if (window.GLOB.probation) {
+ param.$unCheckParam.s_debug_type = 'Y'
+ }
}
_params.push(param)
@@ -572,11 +601,11 @@
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, cell, columns, this.props.Tab, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, '', param, cell, columns, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -588,11 +617,18 @@
} else {
param.LText = param.LText.replace(/@\$|\$@/ig, '')
}
- param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
+
+ if (/\$check@|@check\$/ig.test(param.LText)) {
+ if (btn.intertype === 'system') {
+ param.$unCheckParam = fromJS(param).toJS()
+ }
+ param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
+ }
+
param.LText = Utils.formatOptions(param.LText)
} else if (btn.OpenType === 'pop') { // 琛ㄥ崟
if (index !== 0) {
@@ -612,11 +648,11 @@
param.ID = Utils.getguid()
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, this.props.Tab, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -628,21 +664,28 @@
} else {
param.LText = param.LText.replace(/@\$|\$@/ig, '')
}
- param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
+
+ if (/\$check@|@check\$/ig.test(param.LText)) {
+ if (btn.intertype === 'system') {
+ param.$unCheckParam = fromJS(param).toJS()
+ }
+ param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
+ }
+
param.LText = Utils.formatOptions(param.LText)
} else {
param.ID = primaryId
if (retmsg) {
- const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, this.props.Tab, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ const { sql, callbacksql } = getSysDefaultSql(btn, setting, formdata, param, cell, columns, retmsg, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, this.props.Tab, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
+ param.LText = getSysDefaultSql(btn, setting, formdata, param, cell, columns, false, this.moduleParams, Utils.getAllSearchOptions) // 鏁版嵁婧�
if (btn.output) {
param.key_back_type = 'Y'
}
@@ -654,11 +697,18 @@
} else {
param.LText = param.LText.replace(/@\$|\$@/ig, '')
}
- param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
+
+ if (/\$check@|@check\$/ig.test(param.LText)) {
+ if (btn.intertype === 'system') {
+ param.$unCheckParam = fromJS(param).toJS()
+ }
+ param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
+ }
+
param.LText = Utils.formatOptions(param.LText)
}
}
@@ -670,6 +720,20 @@
param.menuname = btn.logLabel
if (window.GLOB.probation) {
param.s_debug_type = 'Y'
+ }
+
+ if (window.GLOB.breakpoint) {
+ param.func = 'sPC_TableData_InUpDe_debug'
+ }
+
+ if (param.$unCheckParam) {
+ param.$unCheckParam.LText = param.$unCheckParam.LText.replace(/\$check@/ig, '/*').replace(/@check\$/ig, '*/')
+ param.$unCheckParam.LText = Utils.formatOptions(param.$unCheckParam.LText)
+ param.$unCheckParam.menuname = btn.logLabel
+
+ if (window.GLOB.probation) {
+ param.$unCheckParam.s_debug_type = 'Y'
+ }
}
return param
@@ -684,8 +748,10 @@
let _params = []
if ( btn.Ot === 'notRequired' || btn.Ot === 'requiredSgl' || btn.Ot === 'requiredOnce' ) {
- let param = {
- func: btn.innerFunc || ''
+ let param = {}
+
+ if (btn.innerFunc) {
+ param.func = btn.innerFunc
}
if (this.props.BID) {
@@ -698,9 +764,7 @@
let ids = data.map(d => { return d[setting.primaryKey] || ''})
ids = ids.filter(Boolean)
primaryId = ids.join(',')
- }
- if (setting.primaryKey) {
param[setting.primaryKey] = primaryId // 璁剧疆涓婚敭鍙傛暟
}
@@ -717,7 +781,7 @@
}
if (retmsg) {
- param.$callbacksql = this.getSysDeclareSql(btn, formdata, data[0], columns)
+ param.$callbacksql = this.getSysDeclareSql(btn, formdata, data[0], columns, primaryId, this.props.BID)
}
_params.push(param)
@@ -762,7 +826,7 @@
}
if (retmsg) {
- param.$callbacksql = this.getSysDeclareSql(btn, formdata, cell, columns)
+ param.$callbacksql = this.getSysDeclareSql(btn, formdata, cell, columns, primaryId, this.props.BID)
}
return param
@@ -775,10 +839,10 @@
/**
* @description 鑾峰彇鍥炶皟鑴氭湰鐨勫瓧娈靛畾涔�
*/
- getSysDeclareSql = (btn, formdata, data, columns) => {
+ getSysDeclareSql = (btn, formdata, data, columns, primaryId, BID = '') => {
let datavars = {} // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
- let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'bid']
+ let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode', 'roleid', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'mk_deleted', 'bid']
// sql璇彞
let _sql = ''
@@ -795,20 +859,24 @@
if (!_initvars.includes(_key)) {
_initvars.push(_key)
+ let val = form.value
if (form.type === 'number' || form.type === 'rate') {
- let val = form.value
- if (typeof(val) !== 'number') {
- val = parseFloat(val)
- if (isNaN(val)) {
- val = 0
- }
+ if (isNaN(val)) {
+ val = 0
}
_initFormfields.push(`@${_key}=${val}`)
- } else if (['date', 'datemonth', 'datetime'].includes(form.type)) {
- _initFormfields.push(`@${_key}='${form.value || '1949-10-01'}'`)
+ } else if (['date', 'datemonth'].includes(form.type)) {
+ _initFormfields.push(`@${_key}='${val || '1949-10-01'}'`)
} else {
- _initFormfields.push(`@${_key}='${form.value}'`)
+ if (/'/.test(val)) {
+ val = val.replace(/'/ig, '"')
+ }
+ if (form.isconst) {
+ _initFormfields.push(`@${_key}=N'${val}'`)
+ } else {
+ _initFormfields.push(`@${_key}='${val}'`)
+ }
}
}
@@ -833,15 +901,16 @@
}
})
+ let _data = {}
if (data) {
Object.keys(data).forEach(key => {
- data[key.toLowerCase()] = data[key]
+ _data[key.toLowerCase()] = data[key]
})
}
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
- if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
- datavars = {...data, ...datavars}
+ if (data && btn.Ot !== 'notRequired' && columns && columns.length > 0) {
+ datavars = {..._data, ...datavars}
const setField = (col) => {
if (!col.field) return
@@ -852,6 +921,10 @@
if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
_val = '1949-10-01'
+ }
+
+ if (/'/.test(_val)) {
+ _val = _val.replace(/'/ig, '"')
}
_initvars.push(_key)
@@ -882,17 +955,15 @@
}
}
- if (columns && columns.length > 0) {
- columns.forEach(col => {
- if (col.type === 'colspan' || col.type === 'old_colspan') {
- col.subcols.forEach(cell => {
- setField(cell)
- })
- } else {
- setField(col)
- }
- })
- }
+ columns.forEach(col => {
+ if (col.type === 'colspan' || col.type === 'old_colspan') {
+ col.subcols.forEach(cell => {
+ setField(cell)
+ })
+ } else {
+ setField(col)
+ }
+ })
}
// 鍙橀噺澹版槑
@@ -901,7 +972,7 @@
_declarefields = ',' + _declarefields
}
_sql = `/* 绯荤粺鐢熸垚 */
- Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@bid nvarchar(50)${_declarefields}
+ Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@mk_deleted int,@bid nvarchar(50)${_declarefields}
`
let userName = sessionStorage.getItem('User_Name') || ''
@@ -924,7 +995,7 @@
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `
/* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
- select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @BillCode='', @ModularDetailCode=''
+ select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @BillCode='', @ModularDetailCode=''
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -941,6 +1012,14 @@
select ${_initColfields.join(',')}
`
}
+
+ _sql = _sql.replace(/@ID@/ig, `'${primaryId || ''}'`)
+ _sql = _sql.replace(/@BID@/ig, `'${BID}'`)
+ _sql = _sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ _sql = _sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ _sql = _sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ _sql = _sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ _sql = _sql.replace(/@typename@/ig, `'admin'`)
return _sql
}
@@ -967,9 +1046,9 @@
}
execRealSubmit = (data, _resolve, formdata) => {
- const { setting, btn, Tab, BID } = this.props
+ const { setting, btn, BID } = this.props
- if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
+ if (setting.supModule && !BID) {
notification.warning({
top: 92,
message: '闇�瑕佷笂绾т富閿�硷紒',
@@ -988,37 +1067,51 @@
params = this.getInnerParam(data, formdata)
}
- if (params.length <= 20) {
+ if (params[0].$unCheckParam) {
+ this.checkLoopRequest(params, _resolve)
+ } else if (btn.preFunc && params.length === 1) {
+ let param = params[0]
+ let _param = fromJS(param).toJS()
+ _param.func = btn.preFunc
+
+ Api.genericInterface(_param).then(res => {
+ if (res.status) {
+ if (res.ErrCode !== '-1') {
+ param = {...param, ...res}
+
+ delete param.status
+ delete param.ErrCode
+ delete param.ErrMesg
+ delete param.message
+
+ setTimeout(() => {
+ Api.genericInterface(param).then(result => {
+ if (!result.status) {
+ notification.warning({
+ top: 92,
+ message: result.message,
+ duration: 5
+ })
+ }
+ })
+ }, 600)
+ }
+
+ this.triggerNote(res) // 娑堟伅
+ this.execSuccess(res)
+ } else {
+ this.execError(res)
+ }
+ _resolve()
+ }, () => {
+ this.updateStatus()
+ _resolve()
+ })
+ } else if (params.length <= 20 && btn.execType !== 'single') {
let deffers = params.map((param, i) => {
return new Promise(resolve => {
setTimeout(() => {
- let _param = null
- if (btn.preFunc) {
- _param = fromJS(param).toJS()
- param.func = btn.preFunc
- }
Api.genericInterface(param).then(res => {
- if (btn.preFunc && res.status && res.ErrCode !== '-1') {
- _param = {..._param, ...res}
-
- delete _param.status
- delete _param.ErrCode
- delete _param.ErrMesg
- delete _param.message
-
- setTimeout(() => {
- Api.genericInterface(_param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- }, 600)
- }
-
if (res.status) {
this.triggerNote(res) // 娑堟伅
}
@@ -1034,6 +1127,7 @@
let iserror = false
let errorMsg = ''
result.forEach(res => {
+ if (iserror) return
if (res.status) {
errorMsg = res
} else {
@@ -1049,7 +1143,7 @@
_resolve()
})
} else { // 瓒呭嚭20涓姹傛椂寰幆鎵ц
- if (btn.progress === 'progressbar' && btn.$toolbtn) {
+ if (btn.progress === 'progressbar' && btn.$toolbtn && params.length > 1) {
this.setState({
loadingTotal: params.length
})
@@ -1179,7 +1273,46 @@
param[key] = result[key]
})
- Api.directRequest(url, btn.method, param, btn.cross).then(res => {
+ let _params = {
+ url: url,
+ method: btn.method || 'post'
+ }
+
+ if (btn.cross === 'true') {
+ if (JSON.stringify(param) !== '{}') {
+ if (btn.stringify === 'qs') {
+ _params.data = qs.stringify(param)
+ } else if (btn.stringify === 'JSON') {
+ _params.data = param
+ } else {
+ _params.data = JSON.stringify(param)
+ }
+ }
+ } else {
+ let _url = url
+ if (JSON.stringify(param) !== '{}') {
+ if (_params.method === 'get') {
+ let keys = Object.keys(param).map(key => `${key}=${param[key]}`)
+ _url = _url + '?' + keys.join('&')
+ } else if (_params.method === 'post') {
+ if (btn.stringify === 'qs') {
+ _params.data = qs.stringify(param)
+ } else if (btn.stringify === 'JSON') {
+ _params.data = param
+ } else {
+ _params.data = JSON.stringify(param)
+ }
+ }
+ }
+
+ _url = _url.replace(/&/ig, '%26')
+
+ _params.url = '/trans/redirect?rd=' + _url + '&method=' + _params.method
+
+ _params.method = 'post'
+ }
+
+ Api.directRequest(_params).then(res => {
if (typeof(res) !== 'object') {
let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
@@ -1273,6 +1406,10 @@
}
return
+ }
+
+ if (param.menuname) {
+ param.menuname = param.menuname + '(鍥炶皟)'
}
Api.genericInterface(param).then(res => {
@@ -1419,6 +1556,14 @@
sql = _prevCustomScript + sql
sql = sql + _backCustomScript
+ sql = sql.replace(/@ID@/ig, `'${record.ID || ''}'`)
+ sql = sql.replace(/@BID@/ig, `'${this.props.BID || ''}'`)
+ sql = sql.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ sql = sql.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ sql = sql.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ sql = sql.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ sql = sql.replace(/@typename@/ig, `'admin'`)
+
if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
}
@@ -1480,36 +1625,8 @@
loadingNumber: params.length
})
- let _param = null
-
- if (btn.preFunc) {
- _param = fromJS(param).toJS()
- param.func = btn.preFunc
- }
-
Api.genericInterface(param).then(res => {
if (res.status) {
- if (btn.preFunc && res.ErrCode !== '-1') {
- _param = {..._param, ...res}
-
- delete _param.status
- delete _param.ErrCode
- delete _param.ErrMesg
- delete _param.message
-
- setTimeout(() => {
- Api.genericInterface(_param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- }, 600)
- }
-
this.triggerNote(res) // 娑堟伅
if (params.length === 0) {
@@ -1518,6 +1635,69 @@
} else {
this.innerLoopRequest(params, btn, _resolve)
}
+ } else {
+ this.execError(res)
+ _resolve()
+ }
+ }, () => {
+ this.updateStatus()
+ _resolve()
+ })
+ }
+
+ /**
+ * @description 鏁版嵁妫�楠屽惊鐜墽琛�
+ */
+ checkLoopRequest = (params, _resolve) => {
+ let param = params.shift()
+ let unCheckParam = param.$unCheckParam
+
+ delete param.$unCheckParam
+
+ this.setState({
+ loadingNumber: params.length
+ })
+
+ Api.genericInterface(param).then(res => {
+ if (res.status) {
+ this.triggerNote(res) // 娑堟伅
+
+ if (params.length === 0) {
+ this.execSuccess(res)
+ _resolve()
+ } else {
+ this.checkLoopRequest(params, _resolve)
+ }
+ } else if (res.ErrCode === 'C') {
+ const _this = this
+ confirm({
+ title: '缁х画鎵ц锛�',
+ content: res.message,
+ onOk() {
+ return new Promise(resolve => {
+ Api.genericInterface(unCheckParam).then(result => {
+ if (result.status) {
+ _this.triggerNote(result) // 娑堟伅
+
+ if (params.length === 0) {
+ _this.execSuccess(result)
+ _resolve()
+ } else {
+ _this.checkLoopRequest(params, _resolve)
+ }
+ } else {
+ _this.execError(result)
+ _resolve()
+ }
+ resolve()
+ })
+ })
+ },
+ onCancel() {
+ _this.execError(res)
+ _resolve()
+ }
+ })
} else {
this.execError(res)
_resolve()
@@ -1593,6 +1773,7 @@
outerOuterRequest = (params, result, record, _resolve) => {
const { btn } = this.props
let outParam = JSON.parse(JSON.stringify(result))
+ let ver_token = false
if (btn.outerFunc) {
result.func = btn.outerFunc
@@ -1621,9 +1802,18 @@
result.open_key = Utils.encryptOpenKey(result.secretkey, result.timestamp)
}
} else {
- if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- result.rduri = window.GLOB.mainSystemApi
- } else if (btn.sysInterface !== 'true') {
+ if (btn.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ result.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (btn.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ result.$token = btn.exProInterface || ''
+ } else {
+ result.$token = btn.exInterface || ''
+ }
+ ver_token = true
+ } else {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
result.rduri = btn.proInterface
} else {
@@ -1639,6 +1829,10 @@
Api.genericInterface(result).then(res => {
if (!res) return // LoginError鏃朵腑鏂姹�
+ if (ver_token && res.ErrMesg === 'token_error') {
+ this.execError(res)
+ return
+ }
this.outerCallbackRequest(params, res, record, outParam, _resolve)
}, () => {
this.outerCallbackRequest(params, {status: false, message: 500, ErrCode: 'E', ErrMesg: 500}, record, outParam, _resolve)
@@ -1714,6 +1908,10 @@
}
return
+ }
+
+ if (param.menuname) {
+ param.menuname = param.menuname + '(鍥炶皟)'
}
Api.genericInterface(param).then(res => {
@@ -1805,21 +2003,44 @@
* 4銆佹ā鎬佹鎵ц鎴愬姛鍚庢槸鍚﹀叧闂�
* 5銆侀�氱煡涓诲垪琛ㄥ埛鏂�
*/
- execSuccess = (res) => {
+ execSuccess = (res = {}) => {
const { btn } = this.props
const { btnconfig, autoMatic } = this.state
- if ((res && (res.ErrCode === 'S' || !res.ErrCode)) || autoMatic) { // 鎵ц鎴愬姛
- notification.success({
- top: 92,
- message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
- duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
- })
- } else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
+ let sign = ''
+ if (/^@speak@/i.test(res.message)) {
+ res.message = res.message.replace(/^@speak@/i, '')
+ let val = res.message.match(/<<.*>>/)
+ res.message = res.message.replace(/\s*<<.*>>\s*/g, '')
+ val = val ? val[0].replace(/<<|>>/g, '') : ''
+
+ if (/^http/.test(val)) {
+ let audio = document.createElement('audio')
+ audio.src = val
+ audio.play()
+ }
+
+ if (!res.message) {
+ res.ErrCode = '-1'
+ }
+ } else if (/@close_tab@|@close_popup@|@goback@/i.test(res.message)) {
+ sign = res.message.match(/@close_tab@|@close_popup@|@goback@/i)[0].toLowerCase()
+ res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@/i, '')
+ }
+
+ if ((res.ErrCode === 'S' || !res.ErrCode) || autoMatic) { // 鎵ц鎴愬姛
+ if (btn.formType !== 'counter' || res.message) {
+ notification.success({
+ top: 92,
+ message: res.message || '鎵ц鎴愬姛锛�',
+ duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
+ })
+ }
+ } else if (res.ErrCode === 'Y') { // 鎵ц鎴愬姛
Modal.success({
- title: res.ErrMesg || this.state.dict['main.action.confirm.success']
+ title: res.message || '鎵ц鎴愬姛锛�'
})
- } else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
+ } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
}
@@ -1860,15 +2081,29 @@
return
}
- if (btn.execSuccess === 'closetab') {
+ if (btn.execSuccess === 'closetab' || sign === '@close_tab@') {
MKEmitter.emit('closeTabView', btn.$MenuID)
- } else if (btn.execSuccess === 'closepoptab') {
+ } else if (btn.execSuccess === 'closepoptab' || sign === '@close_popup@') {
MKEmitter.emit('popclose')
} else if (btn.execSuccess !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execSuccess, btn, id, this.state.selines)
}
+
+ if (window.GLOB.breakpoint) {
+ MKEmitter.emit('refreshDebugTable')
+ }
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
+ if (btn.syncComponentId) {
+ if (btn.syncComponentId === 'multiComponent') {
+ btn.syncComponentIds.forEach((id, i) => {
+ setTimeout(() => {
+ MKEmitter.emit('reloadData', id)
+ }, 20 * i)
+ })
+ } else {
+ MKEmitter.emit('reloadData', btn.syncComponentId)
+ }
+ }
if (tabId) {
MKEmitter.emit('reloadMenuView', tabId, 'table')
@@ -1885,22 +2120,24 @@
node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'})
}
- if (btn.MenuID && Array.isArray(btn.openmenu) && btn.openmenu.length > 0) {
- let newtab = {
- MenuID: btn.MenuID,
- MenuName: btn.MenuName,
- MenuNo: btn.MenuNo,
- type: btn.tabType,
- param: {
- $BID: id
+ if (btn.openmenu && Array.isArray(btn.openmenu) && btn.openmenu.length > 0) {
+ let menuId = btn.openmenu.slice(-1)[0]
+ let newtab = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+
+ if (!newtab && btn.MenuID) {
+ newtab = {
+ MenuID: btn.MenuID,
+ MenuName: btn.MenuName,
+ MenuNo: btn.MenuNo,
+ type: btn.tabType
}
+ } else if (!newtab) {
+ return
}
- if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
- MKEmitter.emit('modifyTabs', newtab, 'replace')
- } else {
- MKEmitter.emit('modifyTabs', newtab, 'plus', true)
- }
+ newtab = {...newtab, param: { $BID: id }}
+
+ MKEmitter.emit('modifyTabs', newtab, true)
}
}
@@ -1921,11 +2158,31 @@
this.sendMessage(btn.verify, id)
}
if (btn.verify.wxNote === 'true') {
- this.sendWxMessage(btn.verify, id)
+ if (btn.verify.wxTemplateId === 'mk_category_temp') {
+ let verify = fromJS(btn.verify).toJS()
+ verify.wxTemplateId = verify.wxCustomTempId
+
+ verify.wxNoteKeys = verify.wxNoteKeys.filter(item => item.key)
+
+ if (!verify.wxTemplateId || verify.wxNoteKeys.length === 0) return
+
+ this.sendWxMessage(verify, id)
+ } else {
+ this.sendWxMessage(btn.verify, id)
+ }
}
}
sendWxMessage = (verify, id) => {
+ if (!window.GLOB.nginx) {
+ notification.warning({
+ top: 92,
+ message: 'nginx鏈嶅姟灏氭湭寮�鍚紝涓嶅彲鍙戦�佹ā鏉挎秷鎭��',
+ duration: 5
+ })
+ return
+ }
+
let param = {
func: 's_get_sms_weixin_local',
upid: id
@@ -1935,8 +2192,15 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ let domain1 = ''
+ let domain2 = ''
+ if (['8IFltwzyKcu15iA8fqSyb6m-pMa88a3ZTu0No3vDHgo', 'LOB-bbt9jVncGh7IOAUdESh1Sgzcbt62UwOqSqcK9ok'].includes(verify.wxTemplateId) && options.sysType !== 'cloud') {
+ domain1 = 'https://cloud.mk9h.cn/'
+ domain2 = 'https://cloud.mk9h.cn:8443/'
+ }
+
Api.genericInterface(param).then(res => {
- // res.data = [{openid: 'o2E7gvoSFvQRG7I8_gZxf4y3ONkQ', send_id: '2223333', first: '鎮ㄧ殑缂磋垂淇℃伅濡備笅', keyword1: '010000000001', keyword2: '2022骞�07鏈�03鏃�', keyword3: '渚涙殩缂磋垂', keyword4: '20鍏�', keyword5: '鎴愬姛', remark: '鎰熻阿鎮ㄧ殑浣跨敤锛�'}]
+ // res.send_data = [{openid: 'o2E7gvoSFvQRG7I8_gZxf4y3ONkQ', send_id: Utils.getuuid(), p1: '010000000001', p2: '鏄庣', p3: 'dddd', p4: '椤洪', p5: '鎴愬姛'}]
if (!res.status) {
notification.warning({
top: 92,
@@ -1944,7 +2208,12 @@
duration: 5
})
return
- } else if (!res.send_data || res.send_data.length === 0) {
+ }
+
+ let sends = res.send_data || []
+ sends = sends.filter(item => !!item.openid)
+
+ if (sends.length === 0) {
return
}
@@ -1968,13 +2237,13 @@
}
verify.wxNoteKeys.forEach(item => {
- _param.data[item.key] = {value: '', color: item.color}
+ _param.data[item.key] = {value: ''}
})
- let params = res.send_data.map(item => {
+ let params = sends.map(item => {
let m = fromJS(_param).toJS()
- m.touser = item.openid || ''
+ m.touser = item.openid
if (item.bid && m.miniprogram && m.miniprogram.pagepath.indexOf('MenuId') > -1) {
m.miniprogram.pagepath = m.miniprogram.pagepath + `&BID=${item.bid}`
}
@@ -1992,20 +2261,25 @@
return m
})
- Api.wxAccessToken().then(res => {
+ Api.wxAccessToken(domain1).then(res => {
if (!res.oa_access_token) return
params.forEach(n => {
- if (!n.touser) return
-
- Api.wxNginxRequest(`cgi-bin/message/template/send?access_token=${res.oa_access_token}`, 'post', n).then(re => {
+ Api.wxNginxRequest(`${domain2}cgi-bin/message/template/send?access_token=${res.oa_access_token}`, 'post', JSON.stringify(n)).then(re => {
if (verify.wxNoteCallback === 'true') {
+ let msg = re.errmsg || ''
+
+ if (msg.length > 50) {
+ msg = msg.substr(0, 50)
+ }
+
let _p = {
func: 's_get_sms_weixin_local_suc_err',
upid: id,
send_id: n.client_msg_id || '',
status_result: re.errcode === 0 ? 'S' : 'E',
- msg_result: re.errmsg
+ errcode: re.errcode,
+ msg_result: msg
}
_p.LText = Utils.formatOptions(Utils.getuuid())
@@ -2022,9 +2296,23 @@
}
})
} else if (re.errcode !== 0 && re.errmsg) {
+ let msgs = [
+ {errcode: -1, errmsg: '绯荤粺绻佸繖锛岃绋嶅�欏啀璇�'},
+ {errcode: 40001, errmsg: 'access_token 鏃犳晥'},
+ {errcode: 40003, errmsg: '涓嶅悎娉曠殑 OpenID'},
+ {errcode: 40014, errmsg: '涓嶅悎娉曠殑 access_token'},
+ {errcode: 40033, errmsg: '涓嶅悎娉曠殑璇锋眰瀛楃'},
+ {errcode: 43004, errmsg: '闇�瑕佹帴鏀惰�呭叧娉�'},
+ {errcode: 43019, errmsg: '闇�瑕佸皢鎺ユ敹鑰呬粠榛戝悕鍗曚腑绉婚櫎'},
+ {errcode: 50005, errmsg: '鐢ㄦ埛鏈叧娉ㄥ叕浼楀彿'}
+ ]
+
+ let msg = msgs.filter(m => m.errcode === re.errcode)[0]
+ msg = msg || re
+
notification.warning({
top: 92,
- message: re.errmsg,
+ message: msg.errmsg,
duration: 5
})
}
@@ -2148,29 +2436,50 @@
* 2銆乪xcel瀵煎嚭锛屽け璐ュ悗鍙栨秷瀵煎嚭鎸夐挳鍔犺浇涓姸鎬�
* 3銆侀�氱煡涓诲垪琛ㄥ埛鏂�
*/
- execError = (res) => {
+ execError = (res = {}) => {
const { btn } = this.props
const { btnconfig, autoMatic } = this.state
+ let sign = ''
+ if (/^@speak@/i.test(res.message)) {
+ res.message = res.message.replace(/^@speak@/i, '')
+ let val = res.message.match(/<<.*>>/)
+ res.message = res.message.replace(/\s*<<.*>>\s*/g, '')
+ val = val ? val[0].replace(/<<|>>/g, '') : ''
+
+ if (/^http/.test(val)) {
+ let audio = document.createElement('audio')
+ audio.src = val
+ audio.play()
+ }
+
+ if (!res.message) {
+ res.ErrCode = '-1'
+ }
+ } else if (/@close_tab@|@close_popup@|@goback@/i.test(res.message)) {
+ sign = res.message.match(/@close_tab@|@close_popup@|@goback@/i)[0].toLowerCase()
+ res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@/i, '')
+ }
+
if (res.ErrCode === 'E' && !autoMatic) {
Modal.error({
- title: res.message || res.ErrMesg,
+ title: res.message || '鎵ц澶辫触锛�',
})
} else if (res.ErrCode === 'N' || autoMatic) {
notification.error({
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
- message.error(res.message || res.ErrMesg)
+ message.error(res.message || '鎵ц澶辫触锛�')
}
if (autoMatic) {
@@ -2193,59 +2502,37 @@
loadingTotal: '',
})
- if (res.ErrCode === 'C') {
- const _this = this
- if (this.state.checkParam) {
- let param = this.state.checkParam
- confirm({
- title: res.message || res.ErrMesg,
- content: '缁х画鎵ц锛�',
- onOk() {
- return new Promise(resolve => {
- Api.genericInterface(param).then((result) => {
- if (result.status) {
- _this.execSuccess(result)
- } else {
- _this.execError(result)
- }
- resolve()
- }, () => {
- _this.setState({
- visible: false
- })
- resolve()
- })
- })
- },
- onCancel() {
- _this.setState({
- visible: false
- })
- if (btn.execError !== 'never') {
- MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', this.state.selines)
- }
- }
- })
- this.setState({checkParam: null})
- return
- } else {
- Modal.error({
- title: res.message || res.ErrMesg,
- })
- }
- }
-
if (btnconfig && btnconfig.setting && btnconfig.setting.errFocus) {
MKEmitter.emit('mkFC', 'focus', btnconfig.setting.errFocus)
}
- if (btn.execError === 'closepoptab') {
+ if (sign === '@close_tab@') {
+ MKEmitter.emit('closeTabView', btn.$MenuID)
+ } else if (btn.execError === 'closepoptab' || sign === '@close_popup@') {
MKEmitter.emit('popclose')
} else if (btn.execError !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', this.state.selines)
- } else if (btn.OpenType === 'form') {
+ }
+ if (btn.OpenType === 'form') {
let data = this.props.selectedData && this.props.selectedData[0] ? this.props.selectedData[0] : null
- this.setState({check: data && data[btn.field] === btn.openVal})
+
+ if (btn.formType === 'counter') {
+ let count = 0
+ if (data && data[btn.field]) {
+ count = +data[btn.field]
+ if (isNaN(count)) {
+ count = 0
+ }
+ }
+
+ this.setState({count: count })
+ } else {
+ this.setState({check: data && data[btn.field] === btn.openVal})
+ }
+ }
+
+ if (window.GLOB.breakpoint) {
+ MKEmitter.emit('refreshDebugTable')
}
}
@@ -2256,8 +2543,7 @@
if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
let _option = Utils.getSelectQueryOptions(cell)
- cell.data_sql = Utils.formatOptions(_option.sql)
- cell.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
+ cell.base_sql = _option.sql
cell.arr_field = _option.field
}
@@ -2286,7 +2572,20 @@
this.setState({
visible: true
})
+
+ if (btnconfig.setting.display === 'modal' && btnconfig.setting.moveable === 'true') {
+ setTimeout(() => {
+ this.setMove()
+ }, 100)
+ }
}
+ } else if (!btn.$old) {
+ notification.warning({
+ top: 92,
+ message: '鏈幏鍙栧埌鎸夐挳閰嶇疆淇℃伅锛�',
+ duration: 5
+ })
+ this.setState({ loading: false })
} else {
Api.getCacheConfig({
func: 'sPC_Get_LongParam',
@@ -2383,73 +2682,98 @@
btnconfig.fields.forEach(item => {
if (!item.field) return
- let _readin = item.readin !== 'false'
- let _initval = item.initval
-
- if (item.type === 'linkMain' || item.type === 'funcvar') {
- _readin = false
+
+ let _item = {
+ key: item.field,
+ readin: item.readin !== 'false' && item.readin !== 'top',
+ fieldlen: item.fieldlength || 50,
+ writein: item.writein !== 'false',
+ type: item.type,
+ value: item.initval,
+ isconst: item.constant === 'true'
}
let key = item.field.toLowerCase()
+ let _readin = item.readin !== 'false'
- if (item.type === 'linkMain' && BData.hasOwnProperty(key)) {
- _initval = BData[key]
- } else if (_readin && _data.hasOwnProperty(key)) {
- _initval = _data[key]
- } else if (item.type === 'date' && _initval) {
- _initval = moment().subtract(_initval, 'days').format('YYYY-MM-DD')
- } else if (item.type === 'datemonth' && _initval) {
- _initval = moment().subtract(_initval, 'month').format('YYYY-MM')
- } else if (item.type === 'datetime' && _initval) {
- _initval = moment().subtract(_initval, 'days').format('YYYY-MM-DD HH:mm:ss')
- }
+ if (_item.type === 'date') { // 鏃堕棿鍏煎
+ _item.precision = item.precision || 'day'
+ } else if (_item.type === 'datetime') {
+ _item.type = 'date'
+ _item.precision = 'second'
+ } else if (['funcvar', 'linkMain'].includes(_item.type)) {
+ _readin = false
+ _item.readin = false
+ } else if (['select', 'link', 'radio'].includes(_item.type)) { // 閫変腑绗竴椤�
+ if (/^\s*\$first\s*$/.test(_item.value)) {
+ _item.value = ''
- if (_initval === undefined) {
- _initval = ''
- }
-
- let _fieldlen = item.fieldlength || 50
- if (item.type === 'textarea' || item.type === 'fileupload' || item.type === 'multiselect') {
- _fieldlen = item.fieldlength || 512
- } else if (item.type === 'number') {
- _fieldlen = item.decimal ? item.decimal : 0
- } else if (item.type === 'text' && /@appkey@|@SessionUid@|@bid@/ig.test(_initval)) { // 鐗规畩瀛楁鏇挎崲
- _initval = _initval.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey).replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || '')).replace(/^(\s*)@bid@(\s*)$/ig, (BID || ''))
- }
-
- let _type = item.type
-
- if (['date', 'datemonth', 'datetime'].includes(_type) && item.declareType === 'nvarchar(50)') {
- _type = 'text'
- } else if (item.type === 'rate') {
- item.rateCount = item.rateCount || 5
- let allowHalf = item.allowHalf === 'true'
-
- if (allowHalf) {
- _initval = parseFloat(_initval)
- if (_initval % 0.5 !== 0) {
- _initval = parseInt(_initval)
+ if (item.resourceType === '0' && item.options[0] && item.options[0].Value) {
+ _item.value = item.options[0].Value
}
- } else {
- _initval = parseInt(_initval)
- }
-
- if (isNaN(_initval) || _initval < 0) {
- _initval = 0
- } else if (_initval > item.rateCount) {
- _initval = item.rateCount
}
}
- result.push({
- key: item.field,
- readonly: item.readonly === 'true',
- readin: item.readin !== 'false' && item.readin !== 'top',
- fieldlen: _fieldlen,
- writein: item.writein !== 'false',
- type: _type,
- value: _initval
- })
+ if (_item.type === 'funcvar') {
+ _item.value = ''
+ } else if (_item.type === 'linkMain' && BData.hasOwnProperty(key)) {
+ _item.value = BData[key]
+ } else if (_readin && _data.hasOwnProperty(key)) {
+ _item.value = _data[key]
+ } else if (_item.type === 'date' && _item.value) {
+ _item.value = moment().subtract(_item.value, 'days').format(_item.precision === 'day' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss')
+ } else if (_item.type === 'datemonth' && _item.value) {
+ _item.value = moment().subtract(_item.value, 'month').format('YYYY-MM')
+ }
+
+ _item.value = _item.value === undefined ? '' : _item.value
+
+ if (_item.type === 'number' || item.declare === 'decimal') {
+ _item.type = 'number'
+ _item.fieldlen = item.decimal || 0
+ } else if (['text', 'textarea', 'linkMain'].includes(_item.type)) {
+ _item.value = _item.value + ''
+ _item.value = _item.value.replace(/\t*|\v*/g, '') // 鍘婚櫎鍒惰〃绗�
+
+ if (item.interception !== 'false') { // 鍘婚櫎棣栧熬绌烘牸
+ _item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
+ }
+ if (_item.type === 'text' && /@appkey@|@SessionUid@|@bid@/ig.test(_item.value)) { // 鐗规畩瀛楁鏇挎崲
+ _item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey).replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || '')).replace(/^(\s*)@bid@(\s*)$/ig, (BID || ''))
+ }
+ if (_item.type === 'text' && item.lenControl && item.lenControl !== 'limit') {
+ if (item.lenControl === 'left') {
+ _item.value = _item.value.substr(0, item.fieldlength)
+ } else {
+ _item.value = _item.value.slice(-item.fieldlength)
+ }
+ }
+ } else if (_item.type === 'datemonth') {
+ _item.type = 'text'
+ } else if (_item.type === 'date') {
+ _item.type = item.declareType === 'nvarchar(50)' ? 'text' : 'date'
+ } else if (_item.type === 'switch' || _item.type === 'check') {
+ if (_readin) {
+ _item.value = _item.value === item.openVal ? item.openVal : item.closeVal
+ } else {
+ if (item.initval === true) {
+ _item.value = item.openVal
+ } else {
+ _item.value = item.closeVal
+ }
+ }
+ } else if (_item.type === 'rate') {
+ let count = item.rateCount || 5
+ _item.value = parseInt(_item.value)
+
+ if (isNaN(_item.value) || _item.value < 0) {
+ _item.value = 0
+ } else if (_item.value > count) {
+ _item.value = count
+ }
+ }
+
+ result.push(_item)
})
if (btnconfig.setting.display === 'exec') {
@@ -2473,7 +2797,7 @@
* @description 鏄剧ず妯℃�佹
*/
getModels = () => {
- const { setting, BID, btn, BData } = this.props
+ const { BID, btn, BData } = this.props
const { btnconfig, visible } = this.state
if (!btnconfig || !btnconfig.setting) return null
@@ -2522,22 +2846,21 @@
} else {
let container = document.body
- if (
- (setting.tabType === 'main' && btnconfig.setting.container === 'tab' && this.props.ContainerId) ||
- (btnconfig.setting.container === 'tab' && btn.ContainerId)
- ) {
+ if (btnconfig.setting.container === 'tab' && btn.ContainerId) {
width = btnconfig.setting.width > 100 ? btnconfig.setting.width : btnconfig.setting.width + '%'
- container = () => document.getElementById(this.props.ContainerId || btn.ContainerId)
+ container = () => document.getElementById(btn.ContainerId)
}
+
return (
<Modal
title={title}
maskClosable={clickouter}
getContainer={container}
- wrapClassName='action-modal'
+ wrapClassName={'action-modal' + (btnconfig.setting.moveable === 'true' ? ' moveable-modal modal-' + btn.uuid : '')}
visible={visible}
width={width}
onOk={this.handleOk}
+ maskStyle={btnconfig.setting.moveable === 'true' ? {backgroundColor: 'rgba(0, 0, 0, 0.15)'} : null}
confirmLoading={this.state.confirmLoading}
onCancel={this.handleCancel}
destroyOnClose
@@ -2556,17 +2879,96 @@
}
}
+ setMove = () => {
+ const { btn } = this.props
+ let wrap = document.getElementsByClassName('modal-' + btn.uuid)[0]
+
+ if (!wrap) return
+
+ let node = wrap.getElementsByClassName('ant-modal-header')[0]
+
+ if (!node) return
+
+ node.onmousedown = function(e) {
+ let orileft = 0
+ let oritop = 0
+ let oleft = e.clientX
+ let otop = e.clientY
+
+ if (node.parentNode.style.left) {
+ orileft = parseFloat(node.parentNode.style.left)
+ }
+ if (node.parentNode.style.top) {
+ oritop = parseFloat(node.parentNode.style.top)
+ }
+
+ document.onmousemove = function(e) {
+ let left = e.clientX - oleft
+ let top = e.clientY - otop
+
+ node.parentNode.style.left = (orileft + left) + 'px'
+ node.parentNode.style.top = (oritop + top) + 'px'
+ }
+ }
+
+ document.onmouseup = function() {
+ document.onmousemove = null
+ }
+ }
+
+ changeCount = (count) => {
+ this.setState({count}, () => {
+ this.actionTrigger()
+ })
+ }
+
+ changeLineCount = (count) => {
+ const { btn, selectedData } = this.props
+ const { disabled } = this.state
+
+ if (disabled) return
+
+ let data = selectedData || []
+
+ if (data.length === 0) {
+ // 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
+ notification.warning({
+ top: 92,
+ message: this.state.dict['main.action.confirm.selectline'],
+ duration: 5
+ })
+ return
+ } else if (data.length !== 1) {
+ // 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
+ notification.warning({
+ top: 92,
+ message: this.state.dict['main.action.confirm.selectSingleLine'],
+ duration: 5
+ })
+ return
+ }
+
+ this.setState({count}, () => {
+ MKEmitter.emit('refreshLineData', btn.$menuId, btn, data[0].$$uuid, count)
+ })
+ }
+
render() {
const { btn } = this.props
- const { loadingNumber, loadingTotal, loading, disabled, hidden, check } = this.state
+ const { loadingNumber, loadingTotal, loading, disabled, hidden, check, count } = this.state
if (hidden) return null
-
if (btn.OpenType === 'form') {
- if (btn.formType === 'switch') {
+ 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 === 'counter') {
+ return <MkCounter count={count} disabled={disabled} btn={btn} onChange={this.changeCount}/>
+ } else if (btn.formType === 'count_line') {
+ return <MkCounter count={count} disabled={disabled} btn={btn} onChange={this.changeLineCount}/>
+ } else if (btn.formType === 'radio') {
+ 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 <Checkbox disabled={disabled || loading} title={disabled ? (btn.reason || '') : ''} checked={check} onChange={(e) => {e.stopPropagation();this.actionTrigger()}} style={btn.style}></Checkbox>
+ return <Button type="link" icon="scan" disabled={true} style={btn.style} onClick={(e) => {e.stopPropagation()}}></Button>
}
}
--
Gitblit v1.8.0