Pārlūkot izejas kodu

feat: 调整客户下个人/协作标签ui

lanjianrong 4 gadi atpakaļ
vecāks
revīzija
9a85bbef98

+ 0 - 4
src/components/Table/src/hooks/useTableScroll.ts

@@ -145,10 +145,6 @@ export function useTableScroll(
       width += len * NORMAL_WIDTH
     }
     const tableEl = tableElRef.current
-    const a: HTMLElement = tableElRef.current
-      ?.querySelector('.ant-table-container')
-      ?.querySelector('.ant-table-tbody')
-    console.log(a.offsetWidth, a.clientWidth)
 
     const tableWidth = tableEl && tableEl?.offsetWidth
     console.log(tableEl, tableWidth - 48, width)

+ 14 - 8
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>
       ),
@@ -189,7 +190,8 @@ const Client = props => {
         record.companyId !== consts.ENCRYPTION_ZERO ? (
           <span
             onClick={() => showDrawerComapny(record.companyId)}
-            className="text-primary cursor-pointer hover:text-[#967bbd]">
+            className="text-primary cursor-pointer hover:text-[#967bbd]"
+          >
             {companyName}
           </span>
         ) : (
@@ -284,7 +286,7 @@ const Client = props => {
           {record.tagIds.map(item => (
             <Tooltip title={personTags.find(i => i.id === item)?.name} key={record.id + item}>
               <span
-                className="inline-block w-12px h-12px rounded-1/2 mr-3px"
+                className="inline-block w-12px h-12px rounded-1/2 mr-3px mb-3px"
                 style={{ backgroundColor: personTagColorMap[item] }}
               />
             </Tooltip>
@@ -295,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>
@@ -321,7 +324,7 @@ const Client = props => {
             <Tooltip title={teamTags.find(i => i.id === item)?.name} key={record.id + item}>
               <span
                 key={record.id + item}
-                className="inline-block w-12px h-12px mr-3px"
+                className="inline-block w-12px h-12px mr-3px mb-3px"
                 style={{ backgroundColor: teamTagColorMap[item] }}
               />
             </Tooltip>
@@ -332,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>
@@ -493,7 +497,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 => (
@@ -518,7 +523,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 => (

+ 12 - 7
src/pages/Customer/Company/index.jsx

@@ -168,7 +168,8 @@ const Company = props => {
       render: (companyName, record) => (
         <span
           onClick={() => showDrawer(record.id)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]">
+          className="text-primary cursor-pointer hover:text-[#967bbd]"
+        >
           {companyName}
         </span>
       )
@@ -203,7 +204,7 @@ const Company = props => {
           {record.tagIds.map(item => (
             <Tooltip title={personTags.find(i => i.id === item)?.name} key={record.id + item}>
               <span
-                className="inline-block w-12px h-12px rounded-1/2 mr-3px"
+                className="inline-block w-12px h-12px rounded-1/2 mr-3px mb-3px"
                 style={{ backgroundColor: personTagColorMap[item] }}
               />
             </Tooltip>
@@ -214,7 +215,8 @@ const Company = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}>
+            modeType={LabelModeType.column}
+          >
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -234,7 +236,7 @@ const Company = props => {
             <Tooltip title={teamTags.find(i => i.id === item)?.name} key={record.id + item}>
               <span
                 key={record.id + item}
-                className="inline-block w-12px h-12px mr-3px"
+                className="inline-block w-12px h-12px mr-3px mb-3px"
                 style={{ backgroundColor: teamTagColorMap[item] }}
               />
             </Tooltip>
@@ -245,7 +247,8 @@ const Company = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshData}
-            modeType={LabelModeType.column}>
+            modeType={LabelModeType.column}
+          >
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -403,7 +406,8 @@ const Company = props => {
             tagType={TagTypeEnum.PERSONTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}>
+            modeType={LabelModeType.toolbar}
+          >
             {tagState.tagIds.length ? (
               <Button>
                 {tagState.tagIds.map(item => (
@@ -428,7 +432,8 @@ const Company = props => {
             tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={toolbarOptionsChange}
-            modeType={LabelModeType.toolbar}>
+            modeType={LabelModeType.toolbar}
+          >
             {tagState.tagCooperationIds.length ? (
               <Button>
                 {tagState.tagCooperationIds.map(item => (