From 20c83dab04d53d60b5fcd08aad3d5d9fbfb4fa5c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 19 十月 2023 19:46:05 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/share/actioncomponent/dragaction/card.jsx |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/dragaction/card.jsx b/src/menu/components/share/actioncomponent/dragaction/card.jsx
index d9219b1..a90472c 100644
--- a/src/menu/components/share/actioncomponent/dragaction/card.jsx
+++ b/src/menu/components/share/actioncomponent/dragaction/card.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { useDrag, useDrop } from 'react-dnd'
 import { Button, Popover } from 'antd'
-import { CopyOutlined, EditOutlined, FontColorsOutlined, CloseOutlined, ProfileOutlined } from '@ant-design/icons'
+import { CopyOutlined, EditOutlined, FontColorsOutlined, CloseOutlined, ProfileOutlined, WarningOutlined, DisconnectOutlined } from '@ant-design/icons'
 
 import MkIcon from '@/components/mk-icon'
 import { resetStyle } from '@/utils/utils-custom.js'
@@ -28,14 +28,23 @@
       moveCard(draggedId, overIndex)
     },
   })
-  const opacity = isDragging ? 0 : 1
+  const opacity = isDragging ? 0.5 : 1
 
   let hasProfile = false
+  let forbidSql = false
   if (['pop', 'prompt', 'exec'].includes(card.OpenType)) {
     hasProfile = true
+    if (card.verify && card.verify.default === 'false') {
+      forbidSql = true
+    }
   } else if (card.OpenType === 'excelIn' || card.OpenType === 'excelOut') {
     hasProfile = true
+    if (card.verify && card.verify.default === 'false') {
+      forbidSql = true
+    }
   } else if (card.funcType === 'print') {
+    hasProfile = true
+  } else if (card.funcType === 'megvii') {
     hasProfile = true
   }
 
@@ -43,10 +52,19 @@
   let _style = resetStyle(card.style)
   let _class = ''
   let show = card.show
-  if (type === 'datacard') {
+  if (type === 'datacard' || type === 'dualdatacard') {
     _style = null
     _class = 'swiper swiper-' + card.color
     show = 'button'
+  }
+  if (card.hidden === 'true') {
+    _class += ' mk-hidden'
+  }
+  let warning = null
+  if (card.OpenType === 'innerpage' && !card.pageTemplate) {
+    warning = <WarningOutlined style={{color: 'orange', marginLeft: '5px'}}/>
+  } else if (forbidSql) {
+    warning = <DisconnectOutlined className="mk-disconnect"/>
   }
 
   if (show === 'icon') {
@@ -56,7 +74,7 @@
         style={_style}
         className={_class}
         onDoubleClick={() => doubleClickCard(id)}
-      >{card.icon ? <MkIcon type={card.icon}/> : card.label}</Button>
+      >{card.icon ? <MkIcon type={card.icon}/> : card.label}{warning}</Button>
     )
   } else if (show === 'link') {
     btnElement = (
@@ -65,7 +83,7 @@
         style={_style}
         className={_class}
         onDoubleClick={() => doubleClickCard(id)}
-      >{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}</Button>
+      >{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}{warning}</Button>
     )
   } else {
     btnElement = (
@@ -74,19 +92,25 @@
         className={_class}
         onDoubleClick={() => doubleClickCard(id)}
       >
-        <MkIcon type={card.icon}/>{card.label}
+        <MkIcon type={card.icon}/>{card.label}{warning}
       </Button>
     )
+  }
+
+  let updateTime = null
+  if (card.updateTime && card.updateTime.indexOf(window.GLOB.curDate) > -1) {
+    updateTime = card.updateTime.substr(11)
   }
 
   return (
     <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
       <div className="mk-popover-control">
         <EditOutlined className="edit" onClick={() => editCard(id)} />
-        <CopyOutlined className="copy" onClick={() => copyCard(id)} />
-        <CloseOutlined className="close" onClick={() => delCard(id)} />
-        {type !== 'datacard' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/> : ''}
+        {!card.$fixed ? <CopyOutlined className="copy" onClick={() => copyCard(id)} /> : null}
+        {!card.$fixed ? <CloseOutlined className="close" onClick={() => delCard(id)} /> : null}
+        {type !== 'datacard' && type !== 'basetable' && !card.$fixed ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/> : ''}
         {hasProfile ? <ProfileOutlined className="profile" title="楠岃瘉" onClick={() => profileCard(id)} /> : null}
+        {updateTime}
       </div>
     } trigger="hover">
       <div className="page-card" style={{ opacity: opacity}}>

--
Gitblit v1.8.0