From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14

---
 src/menu/components/card/double-data-card/index.jsx |   84 +++++++----------------------------------
 1 files changed, 15 insertions(+), 69 deletions(-)

diff --git a/src/menu/components/card/double-data-card/index.jsx b/src/menu/components/card/double-data-card/index.jsx
index 5e709c6..1374635 100644
--- a/src/menu/components/card/double-data-card/index.jsx
+++ b/src/menu/components/card/double-data-card/index.jsx
@@ -6,7 +6,7 @@
 
 import asyncComponent from '@/utils/asyncComponent'
 import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle, getTables } from '@/utils/utils-custom.js'
+import { resetStyle, getTables, checkComponent } from '@/utils/utils-custom.js'
 import MKEmitter from '@/utils/events.js'
 import Utils from '@/utils/utils.js'
 import getWrapForm from './options'
@@ -167,73 +167,15 @@
       return
     }
 
-    card.errors = []
-    let columns = card.columns.map(c => c.field)
-
-    if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
-      card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
-    } else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
-      card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
-    } else if (!card.setting.primaryKey) {
-      card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
-    } else if (!card.setting.subKey) {
-      card.errors.push({ level: 0, detail: '鏈缃瓙琛ㄤ富閿紒'})
-    } else if (!card.setting.subBID) {
-      card.errors.push({ level: 0, detail: '鏈缃瓙琛˙ID锛�'})
-    } else if (!columns.includes(card.setting.primaryKey)) {
-      card.errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
-    } else if (!card.setting.supModule) {
-      card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
-    }
+    card.$c_ds = true
+    card.$c_ac = true
+    card.$c_sc = true
+    
+    card.errors = checkComponent(card)
     
     if (card.errors.length === 0) {
       card.$tables = getTables(card)
     }
-
-    card.action.forEach(cell => {
-      if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-        if (!cell.modal || cell.modal.fields.length === 0) {
-          card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
-        }
-      }
-    })
-
-    card.subcards.forEach((item, i) => {
-      let linkbtn = item.setting.linkbtn || ''
-      item.elements.forEach(cell => {
-        if (cell.eleType === 'button') {
-          if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-            if (!cell.modal || cell.modal.fields.length === 0) {
-              card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
-            }
-          }
-          if (linkbtn && linkbtn === cell.uuid) {
-            linkbtn = ''
-          }
-        } else if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
-          card.errors.push({ level: 1, detail: `鍗$墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
-        }
-      })
-
-      item.backElements.forEach(cell => {
-        if (cell.eleType === 'button') {
-          if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-            if (!cell.modal || cell.modal.fields.length === 0) {
-              card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
-            }
-          }
-          if (linkbtn && linkbtn === cell.uuid) {
-            linkbtn = ''
-          }
-        } else if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
-          card.errors.push({ level: 1, detail: `鍗$墖涓姩鎬佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
-        }
-      })
-
-      if (linkbtn) {
-        card.errors.push({ level: 1, detail: `绗�${i + 1}寮犲崱鐗囦腑缁戝畾鎸夐挳宸插垹闄})
-      }
-    })
 
     this.setState({
       card: card
@@ -255,6 +197,10 @@
 
     if (btn) {
       card.action = card.action.filter(item => item.uuid !== btn.uuid)
+
+      setTimeout(() => {
+        MKEmitter.emit('revertBtn', card.uuid)
+      }, 200)
     }
 
     this.updateComponent(card)
@@ -467,7 +413,7 @@
       res.$cardType = 'extendCard'
       res.setting.width = res.setting.width || 6
 
-      let mobtypes = ['pop', 'prompt', 'exec', 'innerpage', 'funcbutton']
+      let mobtypes = ['pop', 'prompt', 'exec', 'innerpage', 'funcbutton', 'form']
 
       let elements = []
       res.elements && res.elements.forEach(cell => {
@@ -587,7 +533,7 @@
             <PlusOutlined className="plus" title="娣诲姞鍗$墖" onClick={() => this.addCard()}/>
             {appType !== 'mob' ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={() => this.addSearch()}/> : null}
             <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={() => this.addButton()}/>
-            <NormalForm title="鏁版嵁鍗¤缃�" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+            <NormalForm title="鍙岄噸鏁版嵁鍗¤缃�" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
               <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
             </NormalForm>
             <CopyComponent type="datacard" card={card}/>
@@ -602,7 +548,7 @@
           <ToolOutlined />
         </Popover>
         <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
-        <div className={'select-' + card.wrap.selStyle + extraName}>
+        <div className={`select-${card.wrap.selStyle || ''} ${extraName}`}>
           {card.subcards.map(subcard => {
             if (subcard.$cardType === 'extendCard') {
               return (<CardComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>)
@@ -612,14 +558,14 @@
           })}
         </div>
         <div style={{clear: 'both'}}></div>
-        {card.wrap.pagestyle === 'page' && card.setting.laypage === 'true' && appType !== 'mob' ? <Pagination total={85} size="small" showTotal={total => `鍏� ${total} 鏉} pageSize={20} defaultCurrent={1}/> : null}
+        {card.wrap.pagestyle === 'page' && card.setting.laypage === 'true' && appType !== 'mob' ? <Pagination total={45} size="small" showTotal={total => `1-10 鍏� ${total} 鏉} showSizeChanger={true} pageSize={10} defaultCurrent={1}/> : null}
         {card.wrap.pagestyle === 'page' && card.setting.laypage === 'true' && appType === 'mob' ? <MobPagination /> : null}
         {card.wrap.pagestyle === 'more' && card.setting.laypage === 'true' ? <div className="mk-more">鏌ョ湅鏇村<DownOutlined/></div> : null}
         <div className="component-name">
           <div className="center">
             <div className="title" onDoubleClick={() => {
               let oInput = document.createElement('input')
-              oInput.value = card.uuid
+              oInput.value = 'anchor' + card.uuid
               document.body.appendChild(oInput)
               oInput.select()
               document.execCommand('Copy')

--
Gitblit v1.8.0