From 6b699dc5a69457d76577d17903d54011a6561d97 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 八月 2023 11:48:47 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/index.jsx | 76 +++++++------------------------------
1 files changed, 15 insertions(+), 61 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 8f601ee..516e8c2 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 { 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)
+ })
+ }
}
/**
--
Gitblit v1.8.0