From ea5c5bafa1398aea327289a6c973d1bbc38b725f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 19 十月 2023 19:45:38 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/zshare/mutilform/mkPopSelect/index.jsx |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
index 0181c89..320dceb 100644
--- a/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkPopSelect/index.jsx
@@ -55,7 +55,7 @@
         dataIndex: col.field,
         title: col.label,
         sorter: col.IsSort === 'true',
-        width: 120
+        width: col.Width || 120
       })
     })
 
@@ -350,8 +350,16 @@
           dataSource={options}
           loading={loading}
           onRow={(record) => {
+            let className = ''
+
+            if (record.$disabled) {
+              className = ' mk-disable-line '
+            } else if (value === record.$$uuid) {
+              className = ' ant-table-row-selected '
+            }
+            
             return {
-              className: value === record.$$uuid ? ' ant-table-row-selected ' : '',
+              className: className,
               onClick: () => {this.changeRow(record)},
             }
           }}

--
Gitblit v1.8.0