From 80deba0c2dcffd9e6b6f07815c7c52199309ce42 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 六月 2025 17:36:03 +0800
Subject: [PATCH] 2025-06-23

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.jsx |   70 +++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 28d8931..c65b69c 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -623,6 +623,10 @@
     let style = {}
     let className = ''
 
+    if (data && data.$disabled) {
+      className = className + ' mk-disabled '
+    }
+
     lineMarks && lineMarks.some(mark => {
       let originVal = data[mark.field[0]] + ''
       let contrastVal = ''
@@ -759,7 +763,7 @@
         content = `${record[col.field]}`
       }
 
-      if (col.editType === 'select' && col.options.length > 0) {
+      if (col.editType === 'select' && col.showValue !== 'value' && col.options.length > 0) {
         content = col.map.get(content) || content
       } else if (col.editType === 'switch') {
         if (content === col.openVal) {
@@ -1122,7 +1126,7 @@
           content = `${record[col.field]}`
         }
 
-        if (col.editType === 'select' && col.options.length > 0) {
+        if (col.editType === 'select' && col.showValue !== 'value' && col.options.length > 0) {
           content = col.map.get(content) || content
         } else if (col.editType === 'switch') {
           if (content === col.openVal) {
@@ -2138,8 +2142,8 @@
       delete result.status
 
       this.props.columns.forEach(item => {
-        if (item.arr_field && result[item.arr_field]) {
-          result[item.uuid] = result[item.arr_field]
+        if (item.arr_field && result[item.field]) {
+          result[item.uuid] = result[item.field]
         }
       })
 
@@ -2508,7 +2512,7 @@
     if (setting.supModule && !BID) {
       notification.warning({
         top: 92,
-        message: dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+        message: setting.supModTip || dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
         duration: 5
       })
 
@@ -2544,7 +2548,7 @@
         this.execError({})
       })
     } else if (submit.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼
-      let result = getEditTableSql(submit, data, forms)
+      let result = getEditTableSql(submit, data, forms, setting)
       let param = {}
 
       param.func = 'sPC_TableData_InUpDe'
@@ -2573,7 +2577,7 @@
         this.execError({})
       })
     } else if (submit.intertype === 'inner' && submit.innerFunc) { // 鑷畾涔夊瓨鍌ㄨ繃绋�
-      let result = getEditTableSql(submit, data, forms)
+      let result = getEditTableSql(submit, data, forms, setting)
       let param = {}
 
       param.func = submit.innerFunc
@@ -2628,7 +2632,11 @@
     let lines = data.map(item => {
       let vals = []
       forms.forEach(col => {
-        vals.push(item[col.field])
+        if (typeof(item[col.field]) === 'number') {
+          vals.push(item[col.field] + '')
+        } else {
+          vals.push(item[col.field])
+        }
       })
   
       vals.push(item.$$uuid)
@@ -2766,24 +2774,48 @@
   /**
    * @description 閫変腑琛�
    */
-  onSelectChange = selectedRowKeys => {
-    this.setState({ selectedRowKeys })
+  onSelectChange = (selectedRowKeys, keys) => {
+    const { setting } = this.props
 
-    let activeId = ''
-    if (selectedRowKeys.length > 0) {
-      activeId = selectedRowKeys.slice(-1)[0]
+    if (setting.controlField && selectedRowKeys.length > 0) {
+      let newkeys = keys.filter(item => !item.$disabled).map(item => item.$$uuid)
+
+      this.setState({ selectedRowKeys: newkeys })
+      let activeId = ''
+      if (newkeys.length > 0) {
+        activeId = newkeys.slice(-1)[0]
+      }
+      this.changedata(activeId)
+      this.selectdata(newkeys)
+    } else {
+      this.setState({ selectedRowKeys })
+      let activeId = ''
+      if (selectedRowKeys.length > 0) {
+        activeId = selectedRowKeys.slice(-1)[0]
+      }
+      this.changedata(activeId)
+      this.selectdata(selectedRowKeys)
     }
-    this.changedata(activeId)
-    this.selectdata(selectedRowKeys)
+
+    // this.setState({ selectedRowKeys })
+
+    // let activeId = ''
+    // if (selectedRowKeys.length > 0) {
+    //   activeId = selectedRowKeys.slice(-1)[0]
+    // }
+    // this.changedata(activeId)
+    // this.selectdata(selectedRowKeys)
   }
 
   /**
    * @description 鐐瑰嚮鏁磋锛岃Е鍙戝垏鎹紝 鍒ゆ柇鏄惁鍙�夛紝鍗曢�夋垨澶氶�夛紝杩涜瀵瑰簲鎿嶄綔
    */
-  changeRow = (id) => {
+  changeRow = (record) => {
     const { setting } = this.props
 
-    if (!setting.tableType) return
+    if (!setting.tableType || record.$disabled) return
+    
+    let id = record.$$uuid
     
     let newkeys = fromJS(this.state.selectedRowKeys).toJS()
 
@@ -2934,12 +2966,12 @@
             dataSource={_data}
             loading={this.props.loading}
             scroll={{ x: '100%', y: height }}
-            onRow={(record, index) => {
+            onRow={(record, _) => {
               return {
                 lineMarks,
                 title: setting.tipField ? record[setting.tipField] : '',
                 data: record,
-                onClick: () => {this.changeRow(record.$$uuid)},
+                onClick: () => {this.changeRow(record)},
               }
             }}
             onChange={this.changeTable}

--
Gitblit v1.8.0