فهرست منبع

fix: 增加对单位名称为空的误点击判断

lanjianrong 4 سال پیش
والد
کامیت
9d98ccc862
2فایلهای تغییر یافته به همراه24 افزوده شده و 14 حذف شده
  1. 3 2
      src/global.less
  2. 21 12
      src/pages/Customer/Client/index.jsx

+ 3 - 2
src/global.less

@@ -181,8 +181,9 @@ input:-webkit-autofill:active {
 .ant-select-selection-item {
   text-overflow: unset;
 }
-.ant-typography {
-  color: inherit;
+
+.ant-table-cell .ant-typography {
+  color: unset;
 }
 
 .my-drawer.ant-drawer-open {

+ 21 - 12
src/pages/Customer/Client/index.jsx

@@ -172,7 +172,8 @@ const Client = props => {
       render: (clientName, record) => (
         <span
           onClick={() => showDrawer(record.id)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
+          className="text-primary cursor-pointer hover:text-[#967bbd]"
+        >
           {clientName}
         </span>
       ),
@@ -185,13 +186,17 @@ const Client = props => {
       key: 'companyName',
       width: 100,
       ellipsis: true,
-      render: (companyName, record) => (
-        <span
-          onClick={() => showDrawerComapny(record.companyId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
-          {companyName}
-        </span>
-      ),
+      render: (companyName, record) =>
+        record.companyId !== consts.ENCRYPTION_ZERO ? (
+          <span
+            onClick={() => showDrawerComapny(record.companyId)}
+            className="text-primary cursor-pointer hover:text-[#967bbd]"
+          >
+            {companyName}
+          </span>
+        ) : (
+          '-'
+        ),
       sorter: true,
       search: false
     },
@@ -292,7 +297,8 @@ const Client = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}>
+            modeType={LabelModeType.column}
+          >
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -329,7 +335,8 @@ const Client = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}>
+            modeType={LabelModeType.column}
+          >
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -480,7 +487,8 @@ const Client = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}>
+            modeType={LabelModeType.toolbar}
+          >
             {tagState.tagIds.length ? (
               <Button>
                 {tagState.tagIds.map(item => (
@@ -505,7 +513,8 @@ const Client = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.CLIENT}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}>
+            modeType={LabelModeType.toolbar}
+          >
             {tagState.tagCooperationIds.length ? (
               <Button>
                 {tagState.tagCooperationIds.map(item => (