项目初始化

datax-ui/src/assets/icons/iconfont.json

@@ -6,6 +6,41 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "12150272",
+      "name": "文件夹",
+      "font_class": "-folder-empty3",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "10798549",
+      "name": "组织",
+      "font_class": "zuzhi",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "4186384",
+      "name": "数据字段",
+      "font_class": "shujuziduan",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "4305953",
+      "name": "数据表",
+      "font_class": "shujubiao",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "7159343",
+      "name": "数据库",
+      "font_class": "shujuku",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
       "icon_id": "9720183",
       "name": "维度",
       "font_class": "weidu",
@@ -482,13 +517,6 @@
       "unicode_decimal": 58954
     },
     {
-      "icon_id": "564071",
-      "name": "审批",
-      "font_class": "shengpi",
-      "unicode": "e63b",
-      "unicode_decimal": 58939
-    },
-    {
       "icon_id": "584245",
       "name": "搜索",
       "font_class": "sousuo",

datax-ui/src/views/masterdata/datamanage/DataList.vue

@@ -24,7 +24,7 @@
         <el-form ref="queryForm" :model="queryParams" :inline="true">
           <el-form-item v-for="(item, index) in queryParams.conditions" :label="item.columnName" :prop="item.column" :key="index">
             <el-input
-              v-model.trim="queryParams.conditions[item.column]"
+              v-model.trim="queryParams.conditions[index].value"
               clearable
               size="small"
             ></el-input>
@@ -375,6 +375,7 @@ export default {
     },
     /** 查询列表 */
     getList() {
+      console.log(this.queryParams)
       this.loading = true
       pageData(this.queryParams).then(response => {
         this.loading = false

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

@@ -9,10 +9,16 @@
           empty-text="加载中，请稍后"
           :props="defaultProps"
           default-expand-all
+          highlight-current
           :expand-on-click-node="false"
-          :render-content="renderContent"
           @node-click="handleNodeClick"
-        />
+        >
+          <span class="custom-tree-node" slot-scope="{ node, data }">
+            <i v-if="node.level === 1" class="iconfont icon-shujuku"></i>
+            <i v-else-if="node.level === 2" class="iconfont icon-shujubiao"></i>
+            <span>{{ node.label }}</span>
+          </span>
+        </el-tree>
       </el-card>
     </el-col>
     <el-col :span="18">
@@ -287,18 +293,6 @@ export default {
       this.queryParams.pageNum = val
       this.getList()
     },
-    renderContent(h, { node, data, store }) {
-      if (node.level === 1) {
-        data.icon = 'icon iconfont icon-weidu'
-      } else {
-        data.icon = 'icon iconfont icon-zhibiao'
-      }
-      return (
-        <span class='custom-tree-node'>
-          <i class={data.icon}></i>
-          <span>{node.label}</span>
-        </span>)
-    },
     /** 节点单击事件 */
     handleNodeClick(data) {
       if (data.type === 'database') {
@@ -341,8 +335,14 @@ export default {
     flex: 1;
     display: flex;
     font-size: 14px;
-    .icon {
-      margin-right: 5px;
+    i {
+      margin-right: 10px;
+    }
+    .icon-shujuku {
+      color: #20a0ff;
+    }
+    .icon-shujubiao {
+      color: #38dcec;
     }
   }
 }

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

@@ -15,17 +15,12 @@
             @node-click="handleNodeClick"
           >
             <template slot-scope="{ node, data }">
-              <span v-if="node.level === 1" class="custom-tree-node" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                <span><i class="el-icon-folder tree-folder" />{{ node.label }}</span>
+              <span class="custom-tree-node" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
+                <span><i v-if="node.level === 1" class="iconfont icon--folder-empty3 tree-folder" />{{ node.label }}</span>
                 <span class="tree-bts">
-                  <i v-show="data.show" class="el-icon-circle-plus-outline" @click="() => handleAddType()" />
-                </span>
-              </span>
-              <span v-else class="custom-tree-node" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                <span>{{ node.label }}</span>
-                <span class="tree-bts">
-                  <i v-show="data.show" class="el-icon-edit-outline" @click="() => handleEditType(data)" />
-                  <i v-show="data.show" class="el-icon-delete" @click="() => handleDelType(data)" />
+                  <i v-show="!data.id && data.show" class="el-icon-circle-plus-outline bt-add" @click="() => handleAddType()" />
+                  <i v-show="data.id && data.show" class="el-icon-edit-outline bt-edit" @click="() => handleEditType(data)" />
+                  <i v-show="data.id && data.show" class="el-icon-delete bt-delete" @click="() => handleDelType(data)" />
                 </span>
               </span>
             </template>
@@ -549,9 +544,18 @@ export default {
       font-size: 14px;
       .tree-folder {
         margin-right: 5px;
-        color: rgb(246 207 7);
+        color: #f6cf07;
       }
       .tree-bts {
+        .bt-add {
+          color: #409eff;
+        }
+        .bt-edit {
+          color: #67c23a;
+        }
+        .bt-delete {
+          color: #f56c6c;
+        }
         i {
           margin-right: 10px;
           padding: 0px;

datax-ui/src/views/system/post/PostList.vue

@@ -170,7 +170,7 @@ export default {
   name: 'PostList',
   data() {
     return {
-      tableHeight: document.body.offsetHeight - 340 + 'px',
+      tableHeight: document.body.offsetHeight - 310 + 'px',
       // 展示切换
       showOptions: {
         data: {},