From 4b467effbc0e3a9199146573c0ceedf404bd07c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 九月 2023 17:16:01 +0800
Subject: [PATCH] 2023-09-07
---
src/menu/components/share/actioncomponent/index.jsx | 160 +++++++++++++++++-----------------------------------
1 files changed, 53 insertions(+), 107 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 8f601ee..3599e68 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -4,9 +4,7 @@
import { Modal, notification, Button } from 'antd'
import moment from 'moment'
-import Api from '@/api'
-import Utils, { FuncUtils } from '@/utils/utils.js'
-import { queryPrintSql } from '@/utils/option.js'
+import Utils from '@/utils/utils.js'
import { getActionForm, getBaseTableActionForm } from './formconfig'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import MKEmitter from '@/utils/events.js'
@@ -211,67 +209,23 @@
let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid, supId)
- this.checkPrintTemp().then(() => {
- if (config.subtype === 'basetable') {
- delete card.eleType // 鍖哄垎鎸夐挳浣嶇疆
-
- this.setState({
- visible: true,
- card: card,
- formlist: getBaseTableActionForm(card, functip, config, usefulFields, modules)
- })
- } else {
- let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, config.uuid) || []
-
- this.setState({
- visible: true,
- card: card,
- formlist: getActionForm(card, functip, config, usefulFields, modules, anchors)
- })
- }
- })
- }
+ if (config.subtype === 'basetable') {
+ delete card.eleType // 鍖哄垎鎸夐挳浣嶇疆
- checkPrintTemp = () => {
- return new Promise(resolve => {
- if (!window.GLOB.printTemps) {
- let param = {
- func: 'sPC_Get_SelectedList',
- LText: Utils.formatOptions(queryPrintSql),
- obj_name: 'data',
- arr_field: 'PN,ID,Images'
- }
-
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
- param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
-
- Api.getCloudConfig(param).then(res => {
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
-
- let temps = (res.data || []).map(temp => {
- return {
- value: temp.ID,
- text: temp.PN
- }
- })
+ this.setState({
+ visible: true,
+ card: card,
+ formlist: getBaseTableActionForm(card, functip, config, usefulFields, modules)
+ })
+ } else {
+ let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, config.uuid) || []
- window.GLOB.printTemps = temps
- resolve()
- }, () => {
- resolve()
- })
- } else {
- resolve()
- }
- })
+ this.setState({
+ visible: true,
+ card: card,
+ formlist: getActionForm(card, functip, config, usefulFields, modules, anchors)
+ })
+ }
}
/**
@@ -572,55 +526,47 @@
* @description 鍒涘缓鎸夐挳瀛樺偍杩囩▼
*/
creatFunc = () => {
+ const { config } = this.props
const menu = window.GLOB.customMenu
- let _config = fromJS(this.props.config).toJS()
- this.actionFormRef.handleConfirm().then(res => {
- let btn = res // 鎸夐挳淇℃伅
- let newLText = '' // 鍒涘缓瀛樺偍杩囩▼sql
- let DelText = '' // 鍒犻櫎瀛樺偍杩囩▼sql
+ return new Promise((resolve) => {
+ this.actionFormRef.handleConfirm().then(res => {
+ let btn = fromJS(res).toJS()
+ let _config = fromJS(config).toJS()
- // 鍒涘缓瀛樺偍杩囩▼锛屽繀椤诲～鍐欏唴閮ㄥ嚱鏁板悕
- if (btn.intertype !== 'inner') {
- notification.warning({
- top: 92,
- message: '浣跨敤鍐呴儴鍑芥暟鏃讹紝鎵嶅彲浠ュ垱寤哄瓨鍌ㄨ繃绋嬶紒',
- duration: 5
- })
- return
- }
+ if (btn.OpenType === 'excelIn') {
+ btn.func = btn.innerFunc
+ btn.menuNo = menu.MenuNo
+ btn.MenuName = menu.MenuName + _config.name
+ btn.$type = 'excelIn'
- if (btn.OpenType === 'pop') {
- let _param = {
- funcName: btn.innerFunc,
- name: _config.setting.tableName || '',
- fields: btn.modal ? btn.modal.fields : [],
- menuNo: menu.MenuNo
+ resolve(btn)
+ } else if (btn.OpenType === 'excelOut') {
+ _config.MenuName = menu.MenuName + '-' + _config.name
+ _config.menuNo = menu.MenuNo
+ _config.MenuID = menu.MenuID
+ _config.func = btn.innerFunc
+ _config.$type = 'table'
+
+ resolve(_config)
+ } else {
+ btn.func = btn.innerFunc
+ btn.name = _config.setting.tableName || ''
+ btn.menuNo = menu.MenuNo
+ btn.MenuID = menu.MenuID
+ btn.MenuName = menu.MenuName + _config.name
+ btn.fields = []
+ btn.columns = _config.columns
+ btn.primaryKey = _config.setting.primaryKey || 'ID'
+ btn.$type = 'btn'
+
+ if (btn.OpenType === 'pop') {
+ btn.fields = btn.modal ? btn.modal.fields : []
+ }
+
+ resolve(btn)
}
- newLText = Utils.formatOptions(FuncUtils.getfunc(_param, btn, menu, _config))
- DelText = Utils.formatOptions(FuncUtils.dropfunc(btn.innerFunc))
- } else if (btn.OpenType === 'excelIn') {
- let _param = {
- funcName: btn.innerFunc,
- menuNo: menu.MenuNo
- }
- newLText = Utils.formatOptions(FuncUtils.getexcelInfunc(_param, btn, menu))
- DelText = Utils.formatOptions(FuncUtils.dropfunc(btn.innerFunc))
- } else if (btn.OpenType === 'excelOut') {
- newLText = Utils.formatOptions(FuncUtils.getTableFunc(btn.innerFunc, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
- DelText = Utils.formatOptions(FuncUtils.dropfunc(btn.innerFunc))
- } else {
- let _param = {
- funcName: btn.innerFunc,
- name: _config.setting.tableName || '',
- fields: '',
- menuNo: menu.MenuNo
- }
- newLText = Utils.formatOptions(FuncUtils.getfunc(_param, btn, menu, _config))
- DelText = Utils.formatOptions(FuncUtils.dropfunc(btn.innerFunc))
- }
-
- this.refs.btnCreatFunc.exec(btn.innerFunc, newLText, DelText)
+ })
})
}
@@ -756,7 +702,7 @@
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
- record && record.intertype === 'inner' ? <CreateFunc key="create" ref="btnCreatFunc" trigger={this.creatFunc}/> : null,
+ record && record.intertype === 'inner' ? <CreateFunc key="create" getMsg={this.creatFunc}/> : null,
<Button key="cancel" onClick={this.editModalCancel}>鍙栨秷</Button>,
<Button key="confirm" type="primary" onClick={this.handleSubmit}>纭畾</Button>
]}
--
Gitblit v1.8.0