From d340a56429b12c3c893762730638631e147e047c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 13:46:34 +0800
Subject: [PATCH] 2023-08-27
---
src/menu/components/card/cardcellcomponent/index.jsx | 75 ++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 22adfb8..1100466 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -7,7 +7,6 @@
import asyncComponent from '@/utils/asyncComponent'
import { getCardCellForm } from './formconfig'
import { getActionForm, getBaseTableActionForm } from '@/menu/components/share/actioncomponent/formconfig'
-import Utils, { FuncUtils } from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
import MenuUtils from '@/utils/utils-custom.js'
import ElementForm from './elementform'
@@ -660,47 +659,47 @@
* @description 鍒涘缓鎸夐挳瀛樺偍杩囩▼
*/
creatFunc = () => {
+ const { cards } = this.props
const menu = window.GLOB.customMenu
- let _config = fromJS(this.props.cards).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(cards).toJS()
- if (btn.intertype !== 'inner') 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)
+ })
})
}
@@ -787,7 +786,7 @@
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
- record && record.intertype === 'inner' && cards.subtype === 'dualdatacard' ? <CreateFunc key="create" ref="btnCreatFunc" trigger={this.creatFunc}/> : null,
+ record && record.intertype === 'inner' && cards.subtype === 'dualdatacard' ? <CreateFunc key="create" getMsg={this.creatFunc}/> : null,
<Button key="cancel" onClick={this.editModalCancel}>鍙栨秷</Button>,
<Button key="confirm" type="primary" onClick={this.handleActionSubmit}>纭畾</Button>
]}
--
Gitblit v1.8.0