From a2fa6771faca78bd13361a995df640406cfb96d2 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 8 Jun 2021 16:30:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(frontend):=E6=95=B0=E6=8D=AE=E9=9B=86U?=
 =?UTF-8?q?I=E6=96=87=E5=AD=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                      | 4 ++--
 frontend/src/lang/tw.js                      | 4 ++--
 frontend/src/lang/zh.js                      | 4 ++--
 frontend/src/views/dataset/add/AddCustom.vue | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 6de6261846..8b13f536a2 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -753,7 +753,7 @@ export default {
     field_origin_name: 'Field Origin Name',
     field_check: 'Selected',
     update_info: 'Update Info',
-    join_view: 'Associated view',
+    join_view: 'Data Associated',
     text: 'Text',
     time: 'Time',
     value: 'Value',
@@ -811,7 +811,7 @@ export default {
     field_edit: 'Edit Field',
     table_already_add_to: 'This table is already add to',
     uploading: 'Uploading...',
-    add_union: 'Add Associations',
+    add_union: 'Create Associations',
     union_setting: 'Association Settings',
     pls_slc_union_field: 'Please select associated field',
     pls_slc_union_table: 'Please select association table',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index bda209374a..038985893b 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -753,7 +753,7 @@ export default {
     field_origin_name: '原始名',
     field_check: '選中',
     update_info: '更新信息',
-    join_view: '關聯視圖',
+    join_view: '數據關聯',
     text: '文本',
     time: '時間',
     value: '數值',
@@ -811,7 +811,7 @@ export default {
     field_edit: '編輯字段',
     table_already_add_to: '該表已添加至',
     uploading: '上傳中...',
-    add_union: '添加關聯',
+    add_union: '新建關聯',
     union_setting: '關聯設置',
     pls_slc_union_field: '請選擇關聯字段',
     pls_slc_union_table: '請選擇關聯表',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 47d6e30a7d..06e76636ed 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -753,7 +753,7 @@ export default {
     field_origin_name: '原始名',
     field_check: '选中',
     update_info: '更新信息',
-    join_view: '关联视图',
+    join_view: '数据关联',
     text: '文本',
     time: '时间',
     value: '数值',
@@ -811,7 +811,7 @@ export default {
     field_edit: '编辑字段',
     table_already_add_to: '该表已添加至',
     uploading: '上传中...',
-    add_union: '添加关联',
+    add_union: '新建关联',
     union_setting: '关联设置',
     pls_slc_union_field: '请选择关联字段',
     pls_slc_union_table: '请选择关联表',
diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue
index 37e2bee5b1..1d80d54548 100644
--- a/frontend/src/views/dataset/add/AddCustom.vue
+++ b/frontend/src/views/dataset/add/AddCustom.vue
@@ -16,7 +16,7 @@
     <el-divider />
     <el-row>
       <el-form :inline="true">
-        <el-form-item class="form-item">
+        <el-form-item class="form-item" :label="$t('commons.name')">
           <el-input v-model="name" size="mini" :placeholder="$t('commons.name')" />
         </el-form-item>
       </el-form>
@@ -77,7 +77,7 @@ export default {
   },
   data() {
     return {
-      name: '自助数据集',
+      name: '自定义数据集',
       table: {},
       checkedList: [],
       unionData: [],

From 9e93a8b215269e1ba3af6240d17cc48b5a0fb956 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 8 Jun 2021 16:35:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/edit/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 291c8afcac..5065e0483d 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -224,7 +224,7 @@ export default {
         width: null,
         height: null
       },
-      beforeDialogValue: null
+      beforeDialogValue: []
     }
   },
 
@@ -442,17 +442,17 @@ export default {
       }
     },
     openFilterDiolog() {
-      this.beforeDialogValue = this.curComponent.options.value
+      this.beforeDialogValue = []
       this.filterVisible = true
     },
     cancelFilter() {
-      this.beforeDialogValue = null
+      this.beforeDialogValue = []
       this.filterVisible = false
       this.currentWidget = null
       this.clearCurrentInfo()
     },
     sureFilter() {
-      this.currentFilterCom.options.value = this.beforeDialogValue
+      this.currentFilterCom.options.value = []
       const component = deepCopy(this.currentFilterCom)
 
       //   this.$store.commit('addComponent', { component })