From ea3772736c2e603fbfc5214f497404e00630068e Mon Sep 17 00:00:00 2001
From: JY <1140938202@qq.com>
Date: Tue, 23 Jul 2024 19:36:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Directory/views/listMode.tsx | 103 --------------------
 1 file changed, 103 deletions(-)

diff --git a/src/components/Directory/views/listMode.tsx b/src/components/Directory/views/listMode.tsx
index e97db07b8..5c08d1850 100644
--- a/src/components/Directory/views/listMode.tsx
+++ b/src/components/Directory/views/listMode.tsx
@@ -254,109 +254,6 @@ const ListMode = ({
                   <div
                     onContextMenu={(e) => e.stopPropagation()}
                     style={{ width: '100%', height: '100%' }}>
-                    <List itemLayout="horizontal" dataSource={content}>
-                      {content.map((item, index) => (
-                        <Draggable
-                          isDragDisabled={!droppable.current}
-                          key={item.key}
-                          draggableId={item.id}
-                          index={index}>
-                          {(provided: any) => (
-                            <div
-                              ref={provided.innerRef}
-                              {...provided.draggableProps}
-                              {...provided.dragHandleProps}>
-                              <div className={getItemClassName(item)}>
-                                <List.Item
-                                  onClick={() => {
-                                    fileOpen(item, false);
-                                  }}
-                                  onDoubleClick={() => {
-                                    fileOpen(item, true);
-                                  }}
-                                  onContextMenu={() => setCxtItem(item)}
-                                  actions={[
-                                    <div
-                                      key={item.id}
-                                      title={item.updateTime}
-                                      style={{ fontSize: '12px' }}>
-                                      {showChatTime(item.updateTime)}
-                                    </div>,
-                                  ]}>
-                                  <List.Item.Meta
-                                    title={
-                                      <>
-                                        <div className={css.item_title}>{item.name}</div>
-                                        {renderSpecialTags(item)}
-                                        {!isDynamic &&
-                                          item.groupTags
-                                            .filter((i) => i.length > 0)
-                                            .map((label) => {
-                                              return (
-                                                <Tag key={label} color="processing">
-                                                  {label}
-                                                </Tag>
-                                              );
-                                            })}
-                                        {isNav ? (
-                                          <>
-                                            <Tag color="processing">
-                                              {
-                                                (item as IPageTemplate).directory.target
-                                                  .name
-                                              }
-                                            </Tag>
-                                            <Tag color="processing">
-                                              {
-                                                (item as IPageTemplate).directory.target
-                                                  .space.name
-                                              }
-                                            </Tag>
-                                          </>
-                                        ) : isDynamic ? (
-                                          <>
-                                            <Tag color="processing">{item.typeName}</Tag>
-                                          </>
-                                        ) : (
-                                          <></>
-                                        )}
-                                        {'dev' in item &&
-                                          'score' in item &&
-                                          'conduct' in item &&
-                                          item.score != 0 && (
-                                            <Tooltip
-                                              title={`开发：${item.dev} 实施：${item.conduct}`}>
-                                              <span className={css.score}>
-                                                {item.score as number}
-                                              </span>
-                                            </Tooltip>
-                                          )}
-                                      </>
-                                    }
-                                    avatar={
-                                      <Badge count={item.badgeCount} size="small">
-                                        <EntityIcon entity={item.metadata} size={40} />
-                                      </Badge>
-                                    }
-                                    description={
-                                      // TODO 后期需要优化
-                                      <div
-                                        style={{ lineHeight: '16px' }}
-                                        title={item.remark}>
-                                        <div className="ellipsis1">
-                                          {item.remark || item.code}
-                                        </div>
-                                      </div>
-                                    }
-                                  />
-                                </List.Item>
-                              </div>
-                            </div>
-                          )}
-                        </Draggable>
-                      ))}
-                      {provided.placeholder}
-                    </List>
                     <div
                       onContextMenu={(e) => e.stopPropagation()}
                       style={{ width: '100%', height: '100%' }}>
-- 
Gitee


From 2a0dc3145374a4a668bfa05d15e3aaf0184482c8 Mon Sep 17 00:00:00 2001
From: JY <1140938202@qq.com>
Date: Tue, 23 Jul 2024 19:38:09 +0800
Subject: [PATCH 2/2] fix

---
 src/components/Directory/views/listMode.tsx | 283 ++++++++++----------
 1 file changed, 139 insertions(+), 144 deletions(-)

diff --git a/src/components/Directory/views/listMode.tsx b/src/components/Directory/views/listMode.tsx
index 5c08d1850..ecad1d019 100644
--- a/src/components/Directory/views/listMode.tsx
+++ b/src/components/Directory/views/listMode.tsx
@@ -254,159 +254,154 @@ const ListMode = ({
                   <div
                     onContextMenu={(e) => e.stopPropagation()}
                     style={{ width: '100%', height: '100%' }}>
-                    <div
-                      onContextMenu={(e) => e.stopPropagation()}
-                      style={{ width: '100%', height: '100%' }}>
-                      <InfiniteScroll
-                        dataLength={content.length}
-                        next={loadMoreData}
-                        hasMore={!(content.length % 30) && isScrolling}
-                        loader={loader()}
-                        endMessage={endMessage()}
-                        scrollableTarget="scrollableDiv"
-                        pullDownToRefreshThreshold={50}
-                        pullDownToRefresh={false}>
-                        {content.length > 0 && (
-                          <List itemLayout="horizontal" dataSource={content}>
-                            {content.map((item, index) => (
-                              <Draggable
-                                isDragDisabled={!droppable.current}
-                                key={item.key}
-                                draggableId={item.id}
-                                index={index}>
-                                {(provided: any) => (
+                    <InfiniteScroll
+                      dataLength={content.length}
+                      next={loadMoreData}
+                      hasMore={!(content.length % 30) && isScrolling}
+                      loader={loader()}
+                      endMessage={endMessage()}
+                      scrollableTarget="scrollableDiv"
+                      pullDownToRefreshThreshold={50}
+                      pullDownToRefresh={false}>
+                      {content.length > 0 && (
+                        <List itemLayout="horizontal" dataSource={content}>
+                          {content.map((item, index) => (
+                            <Draggable
+                              isDragDisabled={!droppable.current}
+                              key={item.key}
+                              draggableId={item.id}
+                              index={index}>
+                              {(provided: any) => (
+                                <div
+                                  ref={provided.innerRef}
+                                  {...provided.draggableProps}
+                                  {...provided.dragHandleProps}>
                                   <div
-                                    ref={provided.innerRef}
-                                    {...provided.draggableProps}
-                                    {...provided.dragHandleProps}>
-                                    <div
-                                      style={{ display: 'flex', alignItems: 'center' }}
-                                      className={getItemClassName(item)}>
-                                      {!groups && href.indexOf('home') != -1 && (
-                                        <Checkbox
-                                          value={item}
-                                          onChange={(e) => {
-                                            const { checked, value } = e.target;
-                                            if (checked) {
-                                              setSelectedKeys([...selectedKeys, value]);
-                                            } else {
-                                              setSelectedKeys(
-                                                selectedKeys.filter(
-                                                  (k: any) => k !== value,
-                                                ),
-                                              );
-                                            }
-                                          }}
-                                          checked={selectedKeys.includes(item)}></Checkbox>
-                                      )}
-                                      <List.Item
-                                        onClick={() => {
-                                          fileOpen(item, false);
-                                        }}
-                                        onDoubleClick={() => {
-                                          fileOpen(item, true);
+                                    style={{ display: 'flex', alignItems: 'center' }}
+                                    className={getItemClassName(item)}>
+                                    {!groups && href.indexOf('home') != -1 && (
+                                      <Checkbox
+                                        value={item}
+                                        onChange={(e) => {
+                                          const { checked, value } = e.target;
+                                          if (checked) {
+                                            setSelectedKeys([...selectedKeys, value]);
+                                          } else {
+                                            setSelectedKeys(
+                                              selectedKeys.filter(
+                                                (k: any) => k !== value,
+                                              ),
+                                            );
+                                          }
                                         }}
-                                        onContextMenu={() => setCxtItem(item)}
-                                        actions={[
-                                          <div key={item.id} title={item.updateTime}>
-                                            {showChatTime(item.updateTime)}
-                                          </div>,
-                                        ]}>
-                                        <List.Item.Meta
-                                          title={
-                                            <>
-                                              <div className={css.item_title}>
-                                                {item.name}
-                                              </div>
-                                              {renderSpecialTags(item)}
-                                              {!isDynamic &&
-                                                item.groupTags
-                                                  .filter((i) => i.length > 0)
-                                                  .map((label) => {
-                                                    return (
-                                                      <Tag key={label} color="processing">
-                                                        {label}
-                                                      </Tag>
-                                                    );
-                                                  })}
-                                              {isNav ? (
-                                                <>
-                                                  <Tag color="processing">
-                                                    {
-                                                      (item as IPageTemplate).directory
-                                                        .target.name
-                                                    }
-                                                  </Tag>
-                                                  <Tag color="processing">
-                                                    {
-                                                      (item as IPageTemplate).directory
-                                                        .target.space.name
-                                                    }
-                                                  </Tag>
-                                                </>
-                                              ) : isDynamic ? (
-                                                <>
-                                                  <Tag color="processing">
-                                                    {item.typeName}
-                                                  </Tag>
-                                                </>
-                                              ) : (
-                                                <></>
+                                        checked={selectedKeys.includes(item)}></Checkbox>
+                                    )}
+                                    <List.Item
+                                      onClick={() => {
+                                        fileOpen(item, false);
+                                      }}
+                                      onDoubleClick={() => {
+                                        fileOpen(item, true);
+                                      }}
+                                      onContextMenu={() => setCxtItem(item)}
+                                      actions={[
+                                        <div key={item.id} title={item.updateTime}>
+                                          {showChatTime(item.updateTime)}
+                                        </div>,
+                                      ]}>
+                                      <List.Item.Meta
+                                        title={
+                                          <>
+                                            <div className={css.item_title}>
+                                              {item.name}
+                                            </div>
+                                            {renderSpecialTags(item)}
+                                            {!isDynamic &&
+                                              item.groupTags
+                                                .filter((i) => i.length > 0)
+                                                .map((label) => {
+                                                  return (
+                                                    <Tag key={label} color="processing">
+                                                      {label}
+                                                    </Tag>
+                                                  );
+                                                })}
+                                            {isNav ? (
+                                              <>
+                                                <Tag color="processing">
+                                                  {
+                                                    (item as IPageTemplate).directory
+                                                      .target.name
+                                                  }
+                                                </Tag>
+                                                <Tag color="processing">
+                                                  {
+                                                    (item as IPageTemplate).directory
+                                                      .target.space.name
+                                                  }
+                                                </Tag>
+                                              </>
+                                            ) : isDynamic ? (
+                                              <>
+                                                <Tag color="processing">
+                                                  {item.typeName}
+                                                </Tag>
+                                              </>
+                                            ) : (
+                                              <></>
+                                            )}
+                                            {'dev' in item &&
+                                              'score' in item &&
+                                              'conduct' in item &&
+                                              item.score != 0 && (
+                                                <Tooltip
+                                                  title={`开发：${item.dev} 实施：${item.conduct}`}>
+                                                  <span className={css.score}>
+                                                    {item.score as number}
+                                                  </span>
+                                                </Tooltip>
                                               )}
-                                              {'dev' in item &&
-                                                'score' in item &&
-                                                'conduct' in item &&
-                                                item.score != 0 && (
-                                                  <Tooltip
-                                                    title={`开发：${item.dev} 实施：${item.conduct}`}>
-                                                    <span className={css.score}>
-                                                      {item.score as number}
-                                                    </span>
-                                                  </Tooltip>
-                                                )}
-                                            </>
-                                          }
-                                          avatar={
-                                            <Badge count={item.badgeCount} size="small">
-                                              <EntityIcon
-                                                entity={item.metadata}
-                                                size={40}
-                                              />
-                                            </Badge>
-                                          }
-                                          description={
-                                            // TODO 后期需要优化
-                                            <div style={{ lineHeight: '16px' }}>
-                                              <div className="ellipsis1">
-                                                {item.remark || item.code}
-                                              </div>
+                                          </>
+                                        }
+                                        avatar={
+                                          <Badge count={item.badgeCount} size="small">
+                                            <EntityIcon
+                                              entity={item.metadata}
+                                              size={40}
+                                            />
+                                          </Badge>
+                                        }
+                                        description={
+                                          // TODO 后期需要优化
+                                          <div style={{ lineHeight: '16px' }}>
+                                            <div className="ellipsis1">
+                                              {item.remark || item.code}
                                             </div>
-                                          }
-                                        />
-                                      </List.Item>
-                                    </div>
+                                          </div>
+                                        }
+                                      />
+                                    </List.Item>
                                   </div>
-                                )}
-                              </Draggable>
-                            ))}
-                            {provided.placeholder}
-                          </List>
-                        )}
-                        {content.length === 0 && (
-                          <div style={{ marginTop: 50 }}>{emptyElement()}</div>
-                        )}
-                      </InfiniteScroll>
-                      <div
-                        style={{ height: `calc(100% - ${content.length * 78}px)` }}
-                        className={css.blank_area}
-                        onContextMenu={() => setCxtItem(undefined)}>
-                      </div>
-                    </div>
+                                </div>
+                              )}
+                            </Draggable>
+                          ))}
+                          {provided.placeholder}
+                        </List>
+                      )}
+                      {content.length === 0 && (
+                        <div style={{ marginTop: 50 }}>{emptyElement()}</div>
+                      )}
+                    </InfiniteScroll>
+                    <div
+                      style={{ height: `calc(100% - ${content.length * 78}px)` }}
+                      className={css.blank_area}
+                      onContextMenu={() => setCxtItem(undefined)}></div>
                   </div>
                 </Dropdown>
               </div>
             )}
-            </Droppable>
+          </Droppable>
         </DragDropContext>
       </div>
     </div>
-- 
Gitee