From 71394f3d910c3270136e007e6a728a18f326703a Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 23 Aug 2022 13:39:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=97=E6=AE=B5=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/FieldEdit.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 32f12a0af1..9fcc96cbeb 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -136,7 +136,7 @@
           </el-table-column>
           <el-table-column property="" :label="$t('dataset.operator')">
             <template slot-scope="scope">
-              <el-button v-if="false && scope.row.extField === 0" :disabled="!hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="copyField(scope.row)">{{ $t('dataset.copy') }}</el-button>
+              <el-button :disabled="!hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="copyField(scope.row)">{{ $t('dataset.copy') }}</el-button>
               <el-button v-if="scope.row.extField !== 0" :disabled="!hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="editField(scope.row)">{{ $t('dataset.edit') }}</el-button>
               <el-button v-if="scope.row.extField !== 0" :disabled="!hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="deleteField(scope.row)">{{ $t('dataset.delete') }}</el-button>
             </template>
@@ -249,7 +249,7 @@
           </el-table-column>
           <el-table-column property="" :label="$t('dataset.operator')">
             <template slot-scope="scope">
-              <el-button v-if="false && scope.row.extField === 0" :disabled="!hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="copyField(scope.row)">{{ $t('dataset.copy') }}</el-button>
+              <el-button :disabled="!hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="copyField(scope.row)">{{ $t('dataset.copy') }}</el-button>
               <el-button v-if="scope.row.extField !== 0" :disabled="!hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="editField(scope.row)">{{ $t('dataset.edit') }}</el-button>
               <el-button v-if="scope.row.extField !== 0" :disabled="!hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="deleteField(scope.row)">{{ $t('dataset.delete') }}</el-button>
             </template>

From ebdb4fae99aefe620189f229c623393846742f30 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 23 Aug 2022 01:42:38 -0400
Subject: [PATCH 2/3] =?UTF-8?q?style(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=A4=96=E8=A7=82=E9=85=8D=E7=BD=AE):=20=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E8=84=9A=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E8=BE=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/styles/index.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 1f128e63df..bed05307ca 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -1171,3 +1171,6 @@ div:focus {
 .date-filter-poper>.el-scrollbar>.el-select-dropdown__wrap {
   max-height: 230px !important;
 }
+.tox {
+  border-radius: 4px !important;
+}
\ No newline at end of file

From a0b92c91ec950af09c73b5cff94f32153f378bfc Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 23 Aug 2022 13:52:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E4=B8=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BE=9B=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F=E5=B9=B6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AF=A5=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/drag-item/DimensionItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index fc8d195559..7d365dce4a 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -35,7 +35,7 @@
                 <el-dropdown-item :command="beforeSort('none')">{{ $t('chart.none') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeSort('asc')">{{ $t('chart.asc') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeSort('desc')">{{ $t('chart.desc') }}</el-dropdown-item>
-                <el-dropdown-item v-show="item.deType === 0 || item.deType === 5" :command="beforeSort('custom_sort')">{{ $t('chart.custom_sort') }}...</el-dropdown-item>
+                <el-dropdown-item v-show="!item.chartId && (item.deType === 0 || item.deType === 5)" :command="beforeSort('custom_sort')">{{ $t('chart.custom_sort') }}...</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </el-dropdown-item>