From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 1058 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 738 insertions(+), 320 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index d22b715..7ab6d6e 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1,18 +1,19 @@
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'
+import md5 from 'md5'
import Api from '@/api'
import Utils, { getSysDefaultSql } from '@/utils/utils.js'
import options from '@/store/options.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
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'))
@@ -31,7 +32,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
visible: false,
formdata: null,
selines: null,
@@ -43,42 +43,35 @@
disabled: false,
hidden: false,
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.control !== 'parent' && 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 || []
@@ -104,41 +97,28 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData, BData } = this.props
+ const { btn } = this.props
- let disabled = false
- if (btn.control !== 'parent' && 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 || []
@@ -153,6 +133,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) => {
@@ -240,7 +257,7 @@
// 闇�瑕侀�夋嫨琛屾椂锛屾牎楠屾暟鎹�
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectline'],
+ message: '璇烽�夋嫨琛岋紒',
duration: 5
})
return
@@ -248,7 +265,7 @@
// 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectSingleLine'],
+ message: '璇烽�夋嫨鍗曡鏁版嵁锛�',
duration: 5
})
return
@@ -311,6 +328,9 @@
return
}
} else if (!['inner', 'outer', 'system', 'custom'].includes(btn.intertype)) {
+ if (btn.OpenType === 'form' && btn.formType === 'count_line') {
+ return
+ }
// 鎺ュ彛绫诲瀷閿欒
notification.warning({
top: 92,
@@ -332,7 +352,7 @@
} else if (btn.OpenType === 'prompt') {
this.setState({loading: true})
confirm({
- title: btn.tipTitle || this.state.dict['main.action.confirm.tip'],
+ title: btn.tipTitle || '纭畾瑕佹墽琛屽悧?',
onOk() {
return new Promise(resolve => {
_this.execSubmit(data, resolve)
@@ -358,29 +378,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,
+ 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') {
@@ -429,10 +461,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -472,10 +503,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -505,10 +535,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -571,17 +600,16 @@
param.LText = sql
param.$callbacksql = callbacksql
} else {
- param.LText = getSysDefaultSql(btn, setting, '', param, cell, columns, 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'
}
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -625,10 +653,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -658,10 +685,9 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.exec_type = 'y' // 鍚庡彴瑙ｇ爜
@@ -714,8 +740,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) {
@@ -728,9 +756,7 @@
let ids = data.map(d => { return d[setting.primaryKey] || ''})
ids = ids.filter(Boolean)
primaryId = ids.join(',')
- }
- if (setting.primaryKey) {
param[setting.primaryKey] = primaryId // 璁剧疆涓婚敭鍙傛暟
}
@@ -808,7 +834,7 @@
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 = ''
@@ -825,17 +851,24 @@
if (!_initvars.includes(_key)) {
_initvars.push(_key)
+ let val = form.value
if (form.type === 'number' || form.type === 'rate') {
- let val = form.value
if (isNaN(val)) {
val = 0
}
_initFormfields.push(`@${_key}=${val}`)
} else if (['date', 'datemonth'].includes(form.type)) {
- _initFormfields.push(`@${_key}='${form.value || '1949-10-01'}'`)
+ _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}'`)
+ }
}
}
@@ -860,15 +893,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' && columns && columns.length > 0) {
- datavars = {...data, ...datavars}
+ datavars = {..._data, ...datavars}
const setField = (col) => {
if (!col.field) return
@@ -879,6 +913,10 @@
if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
_val = '1949-10-01'
+ }
+
+ if (/'/.test(_val)) {
+ _val = _val.replace(/'/ig, '"')
}
_initvars.push(_key)
@@ -926,7 +964,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') || ''
@@ -941,15 +979,10 @@
let district = sessionStorage.getItem('district') || ''
let address = sessionStorage.getItem('address') || ''
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
-
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_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}', @bid='${BID}', @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=''
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -973,6 +1006,13 @@
_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 (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ _sql = _sql.replace(/@datam@/ig, '\'Y\'')
+ } else {
+ _sql = _sql.replace(/@datam@/ig, '\'\'')
+ }
return _sql
}
@@ -1022,42 +1062,56 @@
if (params[0].$unCheckParam) {
this.checkLoopRequest(params, _resolve)
- } else if (params.length <= 20) {
+ } 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()
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
+ 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) // 娑堟伅
}
resolve(res)
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1068,6 +1122,7 @@
let iserror = false
let errorMsg = ''
result.forEach(res => {
+ if (iserror) return
if (res.status) {
errorMsg = res
} else {
@@ -1083,7 +1138,7 @@
_resolve()
})
} else { // 瓒呭嚭20涓姹傛椂寰幆鎵ц
- if (btn.progress === 'progressbar' && btn.$toolbtn) {
+ if (btn.progress === 'progressbar' && params.length > 1) {
this.setState({
loadingTotal: params.length
})
@@ -1104,7 +1159,7 @@
_params = this.getInnerParam(data, formdata, btn.callbackType === 'script')
}
- if (_params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {
+ if (_params.length > 1 && btn.progress === 'progressbar') {
this.setState({
loadingTotal: _params.length
})
@@ -1125,7 +1180,7 @@
params = this.getInnerParam(data, formdata, btn.callbackType === 'script')
}
- if (params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {
+ if (params.length > 1 && btn.progress === 'progressbar') {
this.setState({
loadingTotal: params.length
})
@@ -1148,31 +1203,59 @@
let record = {
BID: param.BID || '',
ID: param.ID || '',
- callbacksql: param.$callbacksql || ''
+ callbacksql: param.$callbacksql || '',
+ mk_api_key: ''
}
delete param.$callbacksql
- if (!param.func) {
+ if (param.$pice) {
+ record = param.$record
+
+ delete param.$record
+
+ this.customOuterRequest(params, param, record, _resolve)
+ return
+ } else if (!param.func) {
this.customOuterRequest(params, param, record, _resolve)
return
}
Api.genericInterface(param).then(res => {
+ record.mk_api_key = res.mk_api_key || ''
+
if (res.status) {
- if ((res.mk_ex_invoke === 'false' || res.mk_ex_invoke === false) && params.length === 0) {
+ if (res.mk_ex_invoke + '' === 'false' && params.length === 0) {
this.execSuccess(res)
_resolve()
- } else if ((res.mk_ex_invoke === 'false' || res.mk_ex_invoke === false) && params.length > 0) {
+ } else if (res.mk_ex_invoke + '' === 'false' && params.length > 0) {
this.customLoopRequest(params, _resolve)
} else {
- this.customOuterRequest(params, res, record, _resolve)
+ if (res.mk_ex_data) { // 鏁版嵁鍒嗘壒鎵ц
+ if (Array.isArray(res.mk_ex_data) && res.mk_ex_data.length > 0) {
+ let pices = res.mk_ex_data.map(item => {
+ item.$pice = true
+ item.$record = record
+ return item
+ })
+ params = [...pices, ...params]
+ this.customLoopRequest(params, _resolve)
+ } else if (params.length === 0) {
+ this.execSuccess(res)
+ _resolve()
+ } else {
+ this.customLoopRequest(params, _resolve)
+ }
+ } else {
+ this.customOuterRequest(params, res, record, _resolve)
+ }
}
} else {
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1197,23 +1280,73 @@
url = btn.interface
}
- let mkey = result.mk_api_key || ''
-
- delete result.mk_ex_invoke
- delete result.status
- delete result.message
- delete result.ErrCode
- delete result.ErrMesg
- delete result.mk_api_key
-
+
let param = {}
- Object.keys(result).forEach(key => {
- key = key.replace(/^mk_/ig, '')
- param[key] = result[key]
- })
+ if (result.$pice) {
+ delete result.$pice
- Api.directRequest(url, btn.method, param, btn.cross).then(res => {
+ param = {...result}
+ } else {
+ delete result.mk_ex_invoke
+ delete result.status
+ delete result.message
+ delete result.ErrCode
+ delete result.ErrMesg
+ delete result.mk_api_key
+
+ Object.keys(result).forEach(key => {
+ key = key.replace(/^mk_/ig, '')
+ param[key] = result[key]
+ })
+ }
+
+ 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'
+ }
+
+ if (btn.ContentType) {
+ _params.headers = {
+ 'Content-Type': btn.ContentType
+ }
+ }
+
+ Api.directRequest(_params).then(res => {
if (typeof(res) !== 'object') {
let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
@@ -1222,7 +1355,7 @@
}
let result = {
- mk_api_key: mkey,
+ mk_api_key: record.mk_api_key,
$ErrCode: 'E',
$ErrMesg: error
}
@@ -1232,12 +1365,22 @@
if (Array.isArray(res)) {
res = { data: res }
}
- res.mk_api_key = mkey
+
+ if (btn.outerBlacklist) {
+ let list = btn.outerBlacklist.split(',').map(m => m.toLowerCase())
+ Object.keys(res).forEach(key => {
+ if (list.includes(key.toLowerCase())) {
+ delete res[key]
+ }
+ })
+ }
+
+ res.mk_api_key = record.mk_api_key
this.customCallbackRequest(params, res, record, _resolve)
}
}, (e) => {
let result = {
- mk_api_key: mkey,
+ mk_api_key: record.mk_api_key,
$ErrCode: 'E',
$ErrMesg: e && e.statusText ? e.statusText : ''
}
@@ -1325,7 +1468,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1374,14 +1518,14 @@
if (typeof(val) === 'string') {
val = val.replace(/'/ig, '"')
}
- keys.push(key)
+ keys.push('[' + key + ']')
vals.push(`'${val}'`)
}
})
lines.push({
table: tb,
- insert: `Insert into ${pre}${tb} (${keys.join(',')},mk_level,mk_id,mk_bid)`,
+ insert: `Insert into ${pre}${tb} (${keys.join(',')},[mk_level],[mk_id],[mk_bid])`,
select: `Select ${vals.join(',')},'${level}','${id}','${bid}'`
})
@@ -1457,6 +1601,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'))
}
@@ -1464,10 +1616,9 @@
param.LText = sql
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- param.LText = param.LText.replace(/\$@/ig, '/*')
- param.LText = param.LText.replace(/@\$/ig, '*/')
+ param.LText = param.LText.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- param.LText = param.LText.replace(/@\$|\$@/ig, '')
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.LText = param.LText.replace(/\$check@|@check\$/ig, '')
@@ -1518,36 +1669,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) {
@@ -1560,7 +1683,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1590,10 +1714,15 @@
this.checkLoopRequest(params, _resolve)
}
} else if (res.ErrCode === 'C') {
+ let msg = res.message || ''
+ if (/\n|\r/.test(msg)) {
+ msg = msg.replace(/\n|\r/ig, '<br/>')
+ msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
+ }
const _this = this
confirm({
- title: '缁х画鎵ц锛�',
- content: res.message,
+ title: '璇风‘璁�',
+ content: msg,
onOk() {
return new Promise(resolve => {
Api.genericInterface(unCheckParam).then(result => {
@@ -1623,7 +1752,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1685,7 +1815,8 @@
this.execError(res)
_resolve()
}
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.updateStatus()
_resolve()
})
@@ -1694,6 +1825,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
@@ -1732,6 +1864,7 @@
} else {
result.$token = btn.exInterface || ''
}
+ ver_token = true
} else {
if (window.GLOB.systemType === 'production' && btn.proInterface) {
result.rduri = btn.proInterface
@@ -1748,8 +1881,13 @@
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)
- }, () => {
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') return
this.outerCallbackRequest(params, {status: false, message: 500, ErrCode: 'E', ErrMesg: 500}, record, outParam, _resolve)
})
}
@@ -1918,29 +2056,10 @@
* 4銆佹ā鎬佹鎵ц鎴愬姛鍚庢槸鍚﹀叧闂�
* 5銆侀�氱煡涓诲垪琛ㄥ埛鏂�
*/
- execSuccess = (res) => {
+ execSuccess = (res = {}) => {
const { btn } = this.props
- const { btnconfig, autoMatic } = this.state
+ const { 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') { // 鎵ц鎴愬姛
- Modal.success({
- title: res.ErrMesg || this.state.dict['main.action.confirm.success']
- })
- } else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
-
- }
-
- this.setState({
- loadingNumber: '',
- loadingTotal: '',
- })
-
if (autoMatic) {
this.setState({
loading: false,
@@ -1948,11 +2067,27 @@
})
MKEmitter.emit('autoExecOver', btn.uuid, 'success')
return
- } else if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
- this.setState({
- loading: false,
- visible: false
- })
+ }
+
+ 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@|@no_target_menu@/i.test(res.message)) {
+ sign = res.message.match(/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i)[0].toLowerCase()
+ res.message = res.message.replace(/@close_tab@|@close_popup@|@goback@|@no_target_menu@/i, '')
}
let id = ''
@@ -1963,6 +2098,53 @@
if (res.mk_icon) {
sessionStorage.setItem('avatar', res.mk_icon)
}
+
+ res.ErrCode = res.ErrCode || 'S'
+
+ if (res.ErrCode === 'S') { // 鎵ц鎴愬姛
+ 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') { // 鎵ц鎴愬姛
+ let msg = res.message || '鎵ц鎴愬姛锛�'
+ if (/\n|\r/.test(msg)) {
+ msg = msg.replace(/\n|\r/ig, '<br/>')
+ msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
+ }
+ Modal.success({
+ title: msg,
+ onOk: () => {
+ this.successContinue(sign, id)
+ }
+ })
+ return
+ } else if (res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
+
+ }
+
+ this.successContinue(sign, id)
+ }
+
+ successContinue = (sign, id) => {
+ const { btn } = this.props
+ const { btnconfig } = this.state
+
+ this.setState({
+ loadingNumber: '',
+ loadingTotal: '',
+ })
+
+ if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
+ this.setState({
+ loading: false,
+ visible: false
+ })
+ }
+
let tabId = ''
if (btn.refreshTab && btn.refreshTab.length > 0) {
tabId = btn.refreshTab[btn.refreshTab.length - 1]
@@ -1973,9 +2155,9 @@
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)
@@ -1985,7 +2167,17 @@
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')
@@ -2002,7 +2194,7 @@
node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'})
}
- if (btn.openmenu && Array.isArray(btn.openmenu) && btn.openmenu.length > 0) {
+ 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]
@@ -2020,6 +2212,10 @@
newtab = {...newtab, param: { $BID: id }}
MKEmitter.emit('modifyTabs', newtab, true)
+ }
+
+ if (btn.execSuccess === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -2040,7 +2236,18 @@
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)
+ }
}
}
@@ -2063,8 +2270,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,
@@ -2072,7 +2286,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
}
@@ -2096,13 +2315,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}`
}
@@ -2120,21 +2339,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',
errcode: re.errcode,
- msg_result: re.errmsg
+ msg_result: msg
}
_p.LText = Utils.formatOptions(Utils.getuuid())
@@ -2281,6 +2504,29 @@
duration: 5
})
}
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') {
+ let param = {
+ func: 's_visitor_login',
+ timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
+ SessionUid: 'bh0bapabtd45epsgra79segbch6c1ibk',
+ TypeCharOne: 'pc',
+ appkey: '202004041613277377A6A2456D34A4948AE84'
+ }
+
+ param.LText = md5(window.btoa('bh0bapabtd45epsgra79segbch6c1ibk' + param.timestamp))
+ param.secretkey = md5(param.LText + 'mingke' + param.timestamp)
+
+ let params = {
+ url: 'https://sso.mk9h.cn/webapi/dologon',
+ method: 'post',
+ data: JSON.stringify(param)
+ }
+
+ Api.directRequest(params)
+
+ return
+ }
})
})
}
@@ -2291,32 +2537,17 @@
* 2銆乪xcel瀵煎嚭锛屽け璐ュ悗鍙栨秷瀵煎嚭鎸夐挳鍔犺浇涓姸鎬�
* 3銆侀�氱煡涓诲垪琛ㄥ埛鏂�
*/
- execError = (res) => {
+ execError = (res = {}) => {
const { btn } = this.props
- const { btnconfig, autoMatic } = this.state
-
- if (res.ErrCode === 'E' && !autoMatic) {
- Modal.error({
- title: res.message || res.ErrMesg,
- })
- } else if (res.ErrCode === 'N' || autoMatic) {
- notification.error({
- top: 92,
- message: res.message || res.ErrMesg,
- 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,
- duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
- })
- } else if (res.ErrCode === 'NM') {
- message.error(res.message || res.ErrMesg)
- }
+ const { autoMatic } = this.state
if (autoMatic) {
+ notification.error({
+ top: 92,
+ message: res.message || '鎵ц澶辫触锛�',
+ duration: 10
+ })
+
this.setState({
loading: false,
loadingNumber: '',
@@ -2325,7 +2556,71 @@
})
MKEmitter.emit('autoExecOver', btn.uuid, 'error')
return
- } else if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
+ }
+
+ if (!['LoginError', 'C', '-2', 'E', 'N', 'F', 'NM'].includes(res.ErrCode)) {
+ res.ErrCode = 'E'
+ }
+
+ 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') {
+ let msg = res.message || '鎵ц澶辫触锛�'
+ if (/\n|\r/.test(msg)) {
+ msg = msg.replace(/\n|\r/ig, '<br/>')
+ msg = <span dangerouslySetInnerHTML={{__html: msg}}></span>
+ }
+ Modal.error({
+ title: msg,
+ onOk: () => {
+ this.errorContinue(sign)
+ }
+ })
+ return
+ } else if (res.ErrCode === 'N') {
+ notification.error({
+ top: 92,
+ 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 || '鎵ц澶辫触锛�',
+ duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
+ })
+ } else if (res.ErrCode === 'NM') {
+ message.error(res.message || '鎵ц澶辫触锛�')
+ }
+
+ this.errorContinue(sign)
+ }
+
+ errorContinue = (sign) => {
+ const { btn } = this.props
+ const { btnconfig } = this.state
+
+ if (btn.OpenType !== 'pop' || !btnconfig || btnconfig.setting.finish !== 'unclose') {
this.setState({
loading: false
})
@@ -2340,17 +2635,37 @@
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')
+ }
+
+ if (btn.execError === 'popclose' && btn.$tabId) { // 鏍囩鍏抽棴鍒锋柊
+ MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -2390,7 +2705,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',
@@ -2487,56 +2815,58 @@
btnconfig.fields.forEach(item => {
if (!item.field) return
+
let _item = {
key: item.field,
readin: item.readin !== 'false' && item.readin !== 'top',
fieldlen: item.fieldlength || 50,
writein: item.writein !== 'false',
- type: item.type
- }
-
- let _initval = item.initval
- let _readin = item.readin !== 'false'
- let _format = item.precision || 'day' // 鏃堕棿鏍煎紡鍖�
-
- if (item.type === 'funcvar') {
- _initval = ''
- _readin = false
- _item.readin = false
- } else if (item.type === 'linkMain') {
- _readin = false
- _item.readin = false
- } else if (item.type === 'date') {
- if (_format !== 'day') {
- _format = 'YYYY-MM-DD HH:mm:ss'
- } else {
- _format = 'YYYY-MM-DD'
- }
- } else if (item.type === 'datetime') {
- _item.type = 'date'
- _format = 'YYYY-MM-DD HH:mm:ss'
+ 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(_format)
- } else if (_item.type === 'datemonth' && _initval) {
- _initval = moment().subtract(_initval, 'month').format('YYYY-MM')
+ 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 (item.resourceType === '0' && item.options[0] && item.options[0].Value) {
+ _item.value = item.options[0].Value
+ }
+ }
}
- _item.value = _initval === undefined ? '' : _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, '') // 鍘婚櫎鍒惰〃绗�
+ _item.value = _item.value.replace(/\t+|\v+/g, '') // 鍘婚櫎鍒惰〃绗�
if (item.interception !== 'false') { // 鍘婚櫎棣栧熬绌烘牸
_item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
@@ -2551,9 +2881,19 @@
_item.value = _item.value.slice(-item.fieldlength)
}
}
- } else if (_item.type.indexOf('date') > -1) {
- if (item.declareType === 'nvarchar(50)') {
- _item.type = 'text'
+ } 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
@@ -2573,7 +2913,7 @@
this.execSubmit(selines, () => {}, result)
} else {
confirm({
- title: btn.tipTitle || this.state.dict['main.action.confirm.tip'],
+ title: btn.tipTitle || '纭畾瑕佹墽琛屽悧?',
onOk() {
return new Promise(resolve => {
_this.execSubmit(selines, resolve, result)
@@ -2619,7 +2959,6 @@
>
<MutilForm
BID={BID}
- dict={this.state.dict}
action={btnconfig}
inputSubmit={this.handleOk}
data={this.state.selines[0]}
@@ -2643,22 +2982,23 @@
width = btnconfig.setting.width > 100 ? btnconfig.setting.width : btnconfig.setting.width + '%'
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
>
<MutilForm
BID={BID}
- dict={this.state.dict}
action={btnconfig}
inputSubmit={this.handleOk}
data={this.state.selines[0]}
@@ -2670,15 +3010,92 @@
}
}
+ 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: '璇烽�夋嫨琛岋紒',
+ duration: 5
+ })
+ return
+ } else if (data.length !== 1) {
+ // 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
+ notification.warning({
+ top: 92,
+ message: '璇烽�夋嫨鍗曡鏁版嵁锛�',
+ 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') {
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 {
@@ -2710,14 +3127,15 @@
className = 'mk-btn mk-' + (btn.class || 'unset')
}
- if (loadingNumber && !loadingTotal && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
- label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
+ if (loadingNumber && btn.progress !== 'progressbar' && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
+ label = (loadingNumber ? `(${loadingNumber})` : '') + btn.label
}
return <>
<Button
type={type}
icon={icon}
+ id={'button' + btn.uuid}
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
loading={loading}
disabled={disabled}
--
Gitblit v1.8.0