Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio into dev-1.1.4

ElishaZhang · ElishaZhang · commit 34761ca75a8d · 2022-06-23T14:39:53.000+08:00
diff --git a/web/packages/scriptis/components/importToHive/index.scss b/web/packages/scriptis/components/importToHive/index.scss
@@ -17,7 +17,6 @@
 
 @import '~@dataspherestudio/shared/common/style/variables.scss';
 .we-import-to-hive {
-    min-height: 480px;
     padding: 20px 20px 0;
     padding-top: 0;
     color: #787878;
diff --git a/web/packages/scriptis/components/importToHive/index.vue b/web/packages/scriptis/components/importToHive/index.vue
@@ -34,6 +34,7 @@
           <!-- <p v-if="!isXlsType" class="step-form-title">{{ $t('message.scripts.importToHive.LY') }}</p> -->
           <FormItem
             :label="$t('message.scripts.importToHive.LX')"
+            v-show="!hideDir"
           >
             <Select
               v-model="firstStep.type"

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`<!-- <p v-if="!isXlsType" class="step-form-title">{{ $t('message.scripts.importToHive.LY') }}</p> -->`
`35`	`35`	`<FormItem`
`36`	`36`	`:label="$t('message.scripts.importToHive.LX')"`
	`37`	`+ v-show="!hideDir"`
`37`	`38`	`>`
`38`	`39`	`<Select`
`39`	`40`	`v-model="firstStep.type"`