项目初始化

datax-ui/src/views/market/dataapi/DataApiEdit.vue

@@ -8,7 +8,7 @@
           <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
         </el-button-group>
       </div>
-      <div :style="classCardbody">
+      <div>
         <el-steps :active="active" finish-status="success" align-center>
           <el-step title="属性配置" />
           <el-step title="执行配置" />

datax-ui/src/views/market/dataservice/DataServiceAdd.vue

@@ -24,16 +24,16 @@
             </el-select>
           </el-form-item>
           <template v-if="form.serviceType === '1'">
-            <el-form-item label="服务请求地址" prop="serviceUrl">
+            <el-form-item label="服务请求地址" prop="httpService.url">
               <el-input v-model="form.httpService.url" placeholder="请输入服务请求地址" />
             </el-form-item>
-            <el-form-item label="服务请求头" prop="serviceHeader">
+            <el-form-item label="服务请求头">
               <el-input v-model="form.httpService.header" placeholder="请输入服务请求头，如{key:val}格式" />
             </el-form-item>
-            <el-form-item label="服务请求参数" prop="serviceParam">
+            <el-form-item label="服务请求参数">
               <el-input v-model="form.httpService.param" placeholder="请输入服务请求参数，如{key:val}格式" />
             </el-form-item>
-            <el-form-item label="服务请求方式" prop="serviceHttpMethod">
+            <el-form-item label="服务请求方式" prop="httpService.httpMethod">
               <el-select v-model="form.httpService.httpMethod" placeholder="请选择请求方式">
                 <el-option
                   v-for="dict in httpMethodOptions"
@@ -45,16 +45,16 @@
             </el-form-item>
           </template>
           <template v-if="form.serviceType === '2'">
-            <el-form-item label="服务wsdl地址" prop="serviceWsdl">
+            <el-form-item label="服务wsdl地址" prop="webService.wsdl">
               <el-input v-model="form.webService.wsdl" placeholder="请输入服务wsdl地址" />
             </el-form-item>
-            <el-form-item label="服务命名空间" prop="serviceTargetNamespace">
+            <el-form-item label="服务命名空间" prop="webService.targetNamespace">
               <el-input v-model="form.webService.targetNamespace" placeholder="请输入服务命名空间" />
             </el-form-item>
-            <el-form-item label="服务方法" prop="serviceMethod">
+            <el-form-item label="服务方法" prop="webService.method">
               <el-input v-model="form.webService.method" placeholder="请输入服务方法" />
             </el-form-item>
-            <el-form-item label="服务请求报文" prop="serviceSoap">
+            <el-form-item label="服务请求报文" prop="webService.soap">
               <el-input v-model="form.webService.soap" type="textarea" placeholder="请输入服务请求报文" />
             </el-form-item>
           </template>
@@ -125,23 +125,23 @@ export default {
         serviceType: [
           { required: true, message: '服务类型不能为空', trigger: 'change' }
         ],
-        serviceUrl: [
-          { required: true, message: '服务请求地址不能为空', trigger: 'blur' }
+        'httpService.url': [
+          { required: true, message: '请求地址不能为空', trigger: 'blur' }
         ],
-        serviceHttpMethod: [
+        'httpService.httpMethod': [
           { required: true, message: '服务请求方式不能为空', trigger: 'blur' }
         ],
-        serviceWsdl: [
+        'webService.wsdl': [
           { required: true, message: '服务wsdl地址不能为空', trigger: 'blur' }
         ],
-        serviceTargetNamespace: [
+        'webService.targetNamespace': [
           { required: true, message: '服务命名空间不能为空', trigger: 'blur' }
         ],
-        serviceSoap: [
-          { required: true, message: '服务请求报文不能为空', trigger: 'blur' }
-        ],
-        serviceMethod: [
+        'webService.method': [
           { required: true, message: '服务方法不能为空', trigger: 'blur' }
+        ],
+        'webService.soap': [
+          { required: true, message: '服务请求报文不能为空', trigger: 'blur' }
         ]
       },
       // 状态数据字典

datax-ui/src/views/metadata/datacolumn/DataColumnList.vue

@@ -95,7 +95,7 @@
             border
             tooltip-effect="dark"
             :size="tableSize"
-            :height="tableHeight"
+            height="calc(100vh - 50%)"
             style="width: 100%;margin: 15px 0;"
           >
             <el-table-column type="selection" width="55" align="center" />
@@ -334,22 +334,16 @@ export default {
   float: right;
 }
 
-.tree-wrapper {
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 450px;
-  .el-tree {
-    min-width: 100%;
-    font-size: 14px;
-    display: inline-block;
-    ::v-deep .custom-tree-node {
-      flex: 1;
-      display: flex;
-      font-size: 14px;
-      .icon {
-        margin-right: 5px;
-      }
-    }
+.el-card ::v-deep .el-card__body {
+  height: calc(100vh - 170px);
+}
+
+::v-deep .custom-tree-node {
+  flex: 1;
+  display: flex;
+  font-size: 14px;
+  .icon {
+    margin-right: 5px;
   }
 }
 </style>

datax-ui/src/views/metadata/sqlconsole/index.vue

 <template>
   <div class="app-container">
     <el-card class="box-card" shadow="always">
-      <div :style="classCardbody">
-        <el-row>
-          <el-col :span="24">
-            <el-form :inline="true" class="demo-form-inline">
-              <el-form-item label="数据源">
-                <el-select v-model="sqlDataSource" placeholder="请选择数据源">
-                  <el-option
-                    v-for="source in sourceOptions"
-                    :key="source.id"
-                    :label="source.sourceName"
-                    :value="source.id"
-                    :disabled="source.status === '0'"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item>
-                <el-button size="mini" round @click="runData" :disabled="sqlExecuting">运行</el-button>
-                <el-button size="mini" round @click="stopData" :disabled="!sqlExecuting">停止</el-button>
-                <el-button size="mini" round @click="formaterSql" :disabled="sqlExecuting">格式化</el-button>
-                <el-button size="mini" round @click="refreshData" :disabled="sqlExecuting">重置</el-button>
-              </el-form-item>
-            </el-form>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <sql-editor
-              ref="sqleditor"
-              :value="sqlText"
-              @changeTextarea="changeTextarea($event)"
-              style="height: 300px;margin: 20px 0;"
-            ></sql-editor>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col>
-            <div v-if="sqlExecuting" v-loading="sqlExecuting">数据加载中...</div>
-            <div v-else>
-              <div v-if="sqlConsole.length > 0">
-                <el-tabs type="border-card" v-model="activeTabName">
-                  <el-tab-pane label="信息" name="table0">
-                    <pre>{{executeResultInfo}}</pre>
-                  </el-tab-pane>
-                  <el-tab-pane v-for="(item,index) in sqlConsole" :key="(index+1)" :name="'table'+(index+1)" :label="'结果'+(index+1)">
-                    <el-table :data="item.dataList" stripe border
-                              :max-height="300"
-                              style="width: 100%; margin: 15px 0;">
-                      <el-table-column label="序号" width="55" align="center">
-                        <template slot-scope="scope">
-                          <span>{{ scope.$index + 1 }}</span>
-                        </template>
-                      </el-table-column>
-                      <template v-for="(column, index) in item.columnList">
-                        <el-table-column
-                          :prop="column"
-                          :label="column"
-                          :key="index"
-                          align="center"
-                          show-overflow-tooltip
-                        />
+      <el-row>
+        <el-col :span="24">
+          <el-form :inline="true" class="demo-form-inline">
+            <el-form-item label="数据源">
+              <el-select v-model="sqlDataSource" placeholder="请选择数据源">
+                <el-option
+                  v-for="source in sourceOptions"
+                  :key="source.id"
+                  :label="source.sourceName"
+                  :value="source.id"
+                  :disabled="source.status === '0'"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button size="mini" round @click="runData" :disabled="sqlExecuting">运行</el-button>
+              <el-button size="mini" round @click="stopData" :disabled="!sqlExecuting">停止</el-button>
+              <el-button size="mini" round @click="formaterSql" :disabled="sqlExecuting">格式化</el-button>
+              <el-button size="mini" round @click="refreshData" :disabled="sqlExecuting">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <sql-editor
+            ref="sqleditor"
+            :value="sqlText"
+            @changeTextarea="changeTextarea($event)"
+            style="height: 300px;margin: 20px 0;"
+          ></sql-editor>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col>
+          <div v-if="sqlExecuting" v-loading="sqlExecuting">数据加载中...</div>
+          <div v-else>
+            <div v-if="sqlConsole.length > 0">
+              <el-tabs type="border-card" v-model="activeTabName">
+                <el-tab-pane label="信息" name="table0">
+                  <pre>{{executeResultInfo}}</pre>
+                </el-tab-pane>
+                <el-tab-pane v-for="(item,index) in sqlConsole" :key="(index+1)" :name="'table'+(index+1)" :label="'结果'+(index+1)">
+                  <el-table :data="item.dataList" stripe border
+                            :max-height="300"
+                            style="width: 100%; margin: 15px 0;">
+                    <el-table-column label="序号" width="55" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.$index + 1 }}</span>
                       </template>
-                    </el-table>
-                  </el-tab-pane>
-                </el-tabs>
-              </div>
+                    </el-table-column>
+                    <template v-for="(column, index) in item.columnList">
+                      <el-table-column
+                        :prop="column"
+                        :label="column"
+                        :key="index"
+                        align="center"
+                        show-overflow-tooltip
+                      />
+                    </template>
+                  </el-table>
+                </el-tab-pane>
+              </el-tabs>
             </div>
-          </el-col>
-        </el-row>
-      </div>
+          </div>
+        </el-col>
+      </el-row>
     </el-card>
   </div>
 </template>
@@ -87,10 +85,6 @@ export default {
   },
   data () {
     return {
-      classCardbody: {
-        overflow: 'auto',
-        height: document.body.offsetHeight - 160 + 'px'
-      },
       // 数据源数据字典
       sourceOptions: [],
       sqlDataSource: undefined,
@@ -185,5 +179,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.el-card ::v-deep .el-card__body {
+  height: calc(100vh - 170px);
+}
 </style>

datax-ui/src/views/standard/datadict/DataDictList.vue

@@ -46,6 +46,12 @@
             <el-col :span="12">
               <el-button-group>
                 <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                >新增</el-button>
+                <el-button
                   type="success"
                   icon="el-icon-edit-outline"
                   size="mini"
@@ -113,7 +119,7 @@
             border
             tooltip-effect="dark"
             :size="tableSize"
-            :height="tableHeight"
+            height="calc(100vh - 50%)"
             style="width: 100%;margin: 15px 0;"
             @selection-change="handleSelectionChange"
           >
@@ -323,6 +329,7 @@ export default {
       this.showOptions.data = {}
       if (!this.queryParams.typeId) {
         this.$message.warning('请先选择数据标准类别')
+          return
       }
       this.showOptions.data.typeId = this.queryParams.typeId
       this.showOptions.showList = false
@@ -399,4 +406,7 @@ export default {
 .right-toolbar {
   float: right;
 }
+.el-card ::v-deep .el-card__body {
+  height: calc(100vh - 170px);
+}
 </style>

datax-ui/src/views/system/user/UserList.vue

@@ -10,6 +10,7 @@
             node-key="id"
             empty-text="加载中，请稍后"
             :props="defaultProps"
+            :expand-on-click-node="false"
             @node-click="handleNodeClick"
           />
         </el-card>

datax-ui/src/views/visual/dataset/DataSetAdd.vue

@@ -8,7 +8,7 @@
           <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
         </el-button-group>
       </div>
-      <div :style="classCardbody">
+      <div>
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="数据源" prop="sourceId">
             <el-select v-model="form.sourceId" placeholder="请选择数据源">
@@ -358,6 +358,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.el-card ::v-deep .el-card__body {
+  height: calc(100vh - 230px);
+  overflow-y: auto;
+}
 .draggable-tag {
   margin: 10px;
   cursor: move;

datax-ui/src/views/visual/dataset/DataSetDetail.vue

@@ -8,7 +8,7 @@
           <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
         </el-button-group>
       </div>
-      <div :style="classCardbody">
+      <div>
         <el-form ref="form" :model="form" label-width="80px" disabled>
           <el-form-item label="数据源" prop="sourceId">
             <el-select v-model="form.sourceId" placeholder="请选择数据源">
@@ -255,6 +255,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.el-card ::v-deep .el-card__body {
+  height: calc(100vh - 230px);
+  overflow-y: auto;
+}
 .draggable-tag {
   margin: 10px;
   cursor: move;

datax-ui/src/views/visual/dataset/DataSetEdit.vue

@@ -8,7 +8,7 @@
           <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
         </el-button-group>
       </div>
-      <div :style="classCardbody">
+      <div>
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="数据源" prop="sourceId">
             <el-select v-model="form.sourceId" placeholder="请选择数据源">
@@ -373,6 +373,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.el-card ::v-deep .el-card__body {
+  height: calc(100vh - 230px);
+  overflow-y: auto;
+}
 .draggable-tag {
   margin: 10px;
   cursor: move;

datax-ui/src/views/visual/dataset/DataSetList.vue

@@ -94,7 +94,7 @@
         border
         tooltip-effect="dark"
         :size="tableSize"
-        :height="tableHeight"
+        height="calc(100vh - 50%)"
         style="width: 100%;margin: 15px 0;"
         @selection-change="handleSelectionChange"
       >
@@ -346,4 +346,7 @@ export default {
 .right-toolbar {
   float: right;
 }
+.el-card ::v-deep .el-card__body {
+  height: calc(100vh - 170px);
+}
 </style>