From 9811741d07977e1fe429d0298e9fc9301f47bd47 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 10 Nov 2023 16:12:48 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=A0=94=E5=8F=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=94=B9=E5=8F=98=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=BB=84=E4=BB=B6=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]=20#[1021679625535488]=E7=A0=94=E5=8F=91=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=94=B9=E5=8F=98=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=A4=84=E7=90=86=E4=BA=BA=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1021679625535?=
 =?UTF-8?q?488?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/viewtab/components/issue-list.vue | 150 +++++++++---------
 1 file changed, 76 insertions(+), 74 deletions(-)

diff --git a/src/views/pages/rdm/project/viewtab/components/issue-list.vue b/src/views/pages/rdm/project/viewtab/components/issue-list.vue
index cbac811a..d1aade7e 100644
--- a/src/views/pages/rdm/project/viewtab/components/issue-list.vue
+++ b/src/views/pages/rdm/project/viewtab/components/issue-list.vue
@@ -94,80 +94,82 @@
         </div>
       </div>
     </div>
-    <div v-if="viewmode === 'gantt'">
-      <IssueListGantt
-        v-if="isSearchReady && issueData && issueData.tbodyList && issueData.tbodyList.length > 0"
-        :theadList="finalTheadList"
-        :issueData="issueData"
-        :attrList="attrList"
-        :canAction="canAction"
-        :parentId="parentId"
-        :fromId="fromId"
-        :toId="toId"
-        :mode="mode"
-        :projectId="projectId"
-        :checkedIdList="checkedIdList"
-        @searchIssue="searchIssue"
-        @changePageSize="changePageSize"
-        @toIssue="toIssueDetail"
-        @openIssue="openIssueDetail"
-        @deleteIssue="deleteIssue"
-        @toggleChildIssue="toggleChildIssue"
-      ></IssueListGantt>
-      <NoData v-else-if="isReady && isShowEmptyTable"></NoData>
-    </div>
-    <div v-else-if="viewmode === 'table'">
-      <IssueListTable
-        v-if="isSearchReady && issueData && issueData.tbodyList && issueData.tbodyList.length > 0"
-        :theadList="finalTheadList"
-        :sortList="sortList"
-        :issueData="issueData"
-        :attrList="attrList"
-        :canAction="canAction"
-        :parentId="parentId"
-        :fromId="fromId"
-        :toId="toId"
-        :mode="mode"
-        :sortData="sortData"
-        :projectId="projectId"
-        :checkedIdList="checkedIdList"
-        @updateSort="updateSort"
-        @selected="getSelected"
-        @searchIssue="searchIssue"
-        @changePageSize="changePageSize"
-        @toIssue="toIssueDetail"
-        @openIssue="openIssueDetail"
-        @deleteIssue="deleteIssue"
-        @toggleChildIssue="toggleChildIssue"
-        @unlinkIssue="unlinkIssue"
-      ></IssueListTable>
-      <NoData v-else-if="isReady && isShowEmptyTable"></NoData>
-    </div>
-    <div v-else-if="viewmode === 'storywall'" style="scroll-x: auto; scroll-y: hidden">
-      <IssueListStorywall
-        v-if="isSearchReady && issueData && issueData.tbodyList && issueData.tbodyList.length > 0"
-        :theadList="finalTheadList"
-        :issueData="issueData"
-        :attrList="attrList"
-        :canAction="canAction"
-        :parentId="parentId"
-        :fromId="fromId"
-        :toId="toId"
-        :mode="mode"
-        :app="app"
-        :projectId="projectId"
-        :checkedIdList="checkedIdList"
-        @selected="getSelected"
-        @searchIssue="searchIssue"
-        @changePageSize="changePageSize"
-        @toIssue="toIssueDetail"
-        @openIssue="openIssueDetail"
-        @deleteIssue="deleteIssue"
-        @toggleChildIssue="toggleChildIssue"
-        @unlinkIssue="unlinkIssue"
-      ></IssueListStorywall>
-      <NoData v-else-if="isReady && isShowEmptyTable"></NoData>
-    </div>
+    <template v-if="!isLoading">
+      <div v-if="viewmode === 'gantt'">
+        <IssueListGantt
+          v-if="isSearchReady && issueData && issueData.tbodyList && issueData.tbodyList.length > 0"
+          :theadList="finalTheadList"
+          :issueData="issueData"
+          :attrList="attrList"
+          :canAction="canAction"
+          :parentId="parentId"
+          :fromId="fromId"
+          :toId="toId"
+          :mode="mode"
+          :projectId="projectId"
+          :checkedIdList="checkedIdList"
+          @searchIssue="searchIssue"
+          @changePageSize="changePageSize"
+          @toIssue="toIssueDetail"
+          @openIssue="openIssueDetail"
+          @deleteIssue="deleteIssue"
+          @toggleChildIssue="toggleChildIssue"
+          @unlinkIssue="unlinkIssue"
+        ></IssueListGantt>
+        <NoData v-else-if="isReady && isShowEmptyTable"></NoData>
+      </div>
+      <div v-else-if="viewmode === 'table'">
+        <IssueListTable
+          v-if="isSearchReady && issueData && issueData.tbodyList && issueData.tbodyList.length > 0"
+          :theadList="finalTheadList"
+          :sortList="sortList"
+          :issueData="issueData"
+          :attrList="attrList"
+          :canAction="canAction"
+          :parentId="parentId"
+          :fromId="fromId"
+          :toId="toId"
+          :mode="mode"
+          :sortData="sortData"
+          :projectId="projectId"
+          :checkedIdList="checkedIdList"
+          @updateSort="updateSort"
+          @selected="getSelected"
+          @searchIssue="searchIssue"
+          @changePageSize="changePageSize"
+          @toIssue="toIssueDetail"
+          @openIssue="openIssueDetail"
+          @deleteIssue="deleteIssue"
+          @toggleChildIssue="toggleChildIssue"
+          @unlinkIssue="unlinkIssue"
+        ></IssueListTable>
+        <NoData v-else-if="isReady && isShowEmptyTable"></NoData>
+      </div>
+      <div v-else-if="viewmode === 'storywall'" style="scroll-x: auto; scroll-y: hidden">
+        <IssueListStorywall
+          v-if="isSearchReady && issueData && issueData.tbodyList && issueData.tbodyList.length > 0"
+          :theadList="finalTheadList"
+          :issueData="issueData"
+          :attrList="attrList"
+          :canAction="canAction"
+          :parentId="parentId"
+          :fromId="fromId"
+          :toId="toId"
+          :mode="mode"
+          :app="app"
+          :projectId="projectId"
+          :checkedIdList="checkedIdList"
+          @selected="getSelected"
+          @searchIssue="searchIssue"
+          @changePageSize="changePageSize"
+          @toIssue="toIssueDetail"
+          @openIssue="openIssueDetail"
+          @deleteIssue="deleteIssue"
+          @toggleChildIssue="toggleChildIssue"
+        ></IssueListStorywall>
+        <NoData v-else-if="isReady && isShowEmptyTable"></NoData>
+      </div>
+    </template>
     <EditIssue
       v-if="isEditIssueShow"
       :app="app"
-- 
Gitee


From 4f504d924566069d5fb36d9e8f9b870a6b18db97 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 10 Nov 2023 16:20:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=20=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=AD=90=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/TsSheet/form/component/formsubassembly.vue        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
index bc2051e7..2520f5e0 100644
--- a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
+++ b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
@@ -1,7 +1,9 @@
 <template>
   <div v-if="subFormData">
     <div v-if="!disabled && !readonly && config.isCanAdd">
-      <Button v-if="mode ==='read' || mode==='readSubform'" @click="addFormData">添加</Button>
+      <Button v-if="mode ==='read' || mode==='readSubform'" @click="addFormData">
+        <span class="tsfont-plus">{{ label }}</span>
+      </Button>
     </div>
     <div>
       <div v-for="(item,index) in formDataList" :key="index" class="sheet-list">
-- 
Gitee


From a707c306eeeb9400785efe819e50c65b63f3d74e Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 10 Nov 2023 16:40:24 +0800
Subject: [PATCH 3/4] commit

---
 .../plugins/TsSheet/form/component/formsubassembly.vue        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
index 2520f5e0..bc2051e7 100644
--- a/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
+++ b/src/resources/plugins/TsSheet/form/component/formsubassembly.vue
@@ -1,9 +1,7 @@
 <template>
   <div v-if="subFormData">
     <div v-if="!disabled && !readonly && config.isCanAdd">
-      <Button v-if="mode ==='read' || mode==='readSubform'" @click="addFormData">
-        <span class="tsfont-plus">{{ label }}</span>
-      </Button>
+      <Button v-if="mode ==='read' || mode==='readSubform'" @click="addFormData">添加</Button>
     </div>
     <div>
       <div v-for="(item,index) in formDataList" :key="index" class="sheet-list">
-- 
Gitee


From 5e4276490e48fe42d2c60f8005dca18edd9f660a Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 10 Nov 2023 17:28:17 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20cmdb=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processdetail/workorder/cmdbsync/cmdbsync-detail.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue b/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
index c78b59b0..41770f60 100644
--- a/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/cmdbsync/cmdbsync-detail.vue
@@ -8,7 +8,12 @@
         </div>
       </template>
     </Alert>
-    <TsTable v-if="tbodyList && tbodyList.length > 0" :theadList="theadList" :tbodyList="tbodyList">
+    <TsTable
+      v-if="tbodyList && tbodyList.length > 0"
+      :theadList="theadList"
+      :tbodyList="tbodyList"
+      :fixedHeader="false"
+    >
       <template v-slot:detail="{ row }">
         <span style="cursor:pointer" class="tsfont-task" @click="showHistoryDetail(row)"></span>
       </template>
@@ -22,7 +27,7 @@
         <Poptip
           v-if="row.error"
           trigger="hover"
-          title="异常"
+          :title="$t('page.exception')"
           word-wrap
           width="400"
           :transfer="true"
-- 
Gitee