Merge pull request dataease#1393 from dataease/pr@dev@fix_rollback

XiaJunjie2020 · web-flow · commit a6ca1a54f432 · 2021-12-06T10:00:13.000+08:00
fix: rollback
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
@@ -56,6 +56,9 @@
       <el-tab-pane :label="$t('dataset.field_manage')" name="fieldEdit">
         <field-edit :param="param" :table="table" />
       </el-tab-pane>
+      <el-tab-pane v-if="table.type !== 'custom' && !(table.type === 'sql' && table.mode === 0)" :label="$t('dataset.join_view')" name="joinView">
+        <union-view :param="param" :table="table" />
+      </el-tab-pane>
       <el-tab-pane v-if="table.mode === 1 && (table.type === 'excel' || table.type === 'db' || table.type === 'sql')" :label="$t('dataset.update_info')" name="updateInfo">
         <update-info v-if="tabActive=='updateInfo'" :param="param" :table="table" />
       </el-tab-pane>
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
@@ -89,6 +89,10 @@
                               <svg-icon icon-class="ds-excel" class="ds-icon-excel" />
                               {{ $t('dataset.excel_data') }}
                             </el-dropdown-item>
+                            <el-dropdown-item :command="beforeClickAddData('custom',data)">
+                              <svg-icon icon-class="ds-custom" class="ds-icon-custom" />
+                              {{ $t('dataset.custom_data') }}
+                            </el-dropdown-item>
                             <el-dropdown-item :command="beforeClickAddData('union',data)">
                               <svg-icon icon-class="ds-union" class="ds-icon-union" />
                               {{ $t('dataset.union_data') }}
