From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/dragaction/index.jsx | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/dragaction/index.jsx b/src/menu/components/share/actioncomponent/dragaction/index.jsx
index b59ac72..cab1425 100644
--- a/src/menu/components/share/actioncomponent/dragaction/index.jsx
+++ b/src/menu/components/share/actioncomponent/dragaction/index.jsx
@@ -1,6 +1,7 @@
import React, { useState } from 'react'
import { useDrop } from 'react-dnd'
import { is, fromJS } from 'immutable'
+import { message } from 'antd'
import update from 'immutability-helper'
import Utils from '@/utils/utils.js'
@@ -69,7 +70,6 @@
}
copycard.uuid = Utils.getuuid()
- copycard.originCard = card
try {
delete _val.$srcId
@@ -92,13 +92,17 @@
oInput.select()
document.execCommand('Copy')
document.body.removeChild(oInput)
+
+ message.success('澶嶅埗鎴愬姛銆�')
+ } else {
+ message.warning('澶嶅埗澶辫触銆�')
}
- const { index: overIndex } = findCard(id)
+ // const { index: overIndex } = findCard(id)
- const _cards = update(cards, { $splice: [[overIndex + 1, 0, copycard]] })
+ // const _cards = update(cards, { $splice: [[overIndex + 1, 0, copycard]] })
- handleList(_cards, copycard)
+ // handleList(_cards, copycard)
}
const [, drop] = useDrop({
@@ -114,7 +118,7 @@
newcard.focus = true
newcard.label = 'button'
newcard.verify = null
- newcard.show = 'link'
+ newcard.show = 'button'
newcard.Ot = 'requiredSgl'
newcard.OpenType = item.value
newcard.class = 'primary'
@@ -122,12 +126,13 @@
if (newcard.OpenType === 'excelIn') {
newcard.label = item.text
- newcard.class = item.class || 'dgreen'
+ newcard.class = 'border-dgreen'
newcard.Ot = 'notRequired'
} else if (newcard.OpenType === 'excelOut') {
newcard.label = item.text
newcard.execSuccess = 'never'
newcard.class = 'dgreen'
+ newcard.Ot = 'requiredOnce'
}
if (item.overIndex) {
--
Gitblit v1.8.0