ap-dev 1.1.11 → 1.1.12

package/dev/BackgroundPanel/index.vue

@@ -11,7 +11,7 @@
                 <el-tree
                     ref="typeTree"
                     class="filter-tree"
-                    node-key="fdId"
+                    node-key="tableName"
                     :data="typeTreeList"
                     :props="defaultProps"
                     :highlight-current="true"
@@ -25,9 +25,9 @@
                 >
                     <div slot-scope="{ node, data }" style="width: 100%">
                         <div class="dev-tree-node-left ap-ellipse">
-                            {{ data.fdName }}
+                            {{ data.tableName }}
                         </div>
-                        <div style="font-size: 12px;">{{ data.comment }}</div>
+                        <div style="font-size: 12px;">{{ data.tableComment }}</div>
                     </div>
                 </el-tree>
             </div>
@@ -57,7 +57,9 @@
                 <div>
                     <span v-if="selectedTables.length <1" style="color: red;font-size: 14px;">请选择需要生成的表</span>
                     <template v-for="t in selectedTables">
-                        <el-tag style="margin: 5px;width: 30%;">{{ t.comment }}：{{ t.tableSchema }}.{{ t.fdName }}
+                        <el-tag style="margin: 5px;width: 30%;">{{ t.tableComment }}：{{ t.tableSchema }}.{{
+                                t.tableName
+                            }}
                         </el-tag>
                     </template>
                 </div>
@@ -115,6 +117,7 @@
 <script>
 import {convertToTreeData} from 'ap-util/util/DataUtil'
 import {getUserConfig} from './../dev/DevUtil'
+
 export default {
     name: 'BackgroundPanel',
     data() {
@@ -126,7 +129,7 @@ export default {
             typeTreeList: [],
             defaultProps: {
                 children: 'children',
-                label: 'fdName'
+                label: 'tableName'
             },
             // ----- dialog -----
             selectedTables: [],
@@ -154,7 +157,7 @@ export default {
         // 左侧树：列头
         setHeaderName() {
             if (this.typeTreeList.length > 1) {
-                this.headerName = "[" + this.typeTreeList[0].fdDatabase + "] - 表";
+                this.headerName = "[" + this.typeTreeList[0].tableSchema + "] - 表";
             }
         },
         // 左侧树：加载数据
@@ -168,8 +171,8 @@ export default {
                 }
             }).then(response => {
                 this.typeTreeList = convertToTreeData(response.data, {
-                    idKey: "fdId",
-                    parentKey: "fdParentId",
+                    idKey: "tableName",
+                    parentKey: "parentId",
                     childrenKey: "children",
                 });
                 this.setHeaderName();
@@ -186,10 +189,10 @@ export default {
         // 左侧树：过滤节点
         filterNode(value, data) {
             if (!value) return true
-            if (data.fdName.indexOf(value) !== -1) {
+            if (data.tableName.indexOf(value) !== -1) {
                 return true
             }
-            if (data.comment != null && data.comment.indexOf(value) !== -1) {
+            if (data.tableComment != null && data.tableComment.indexOf(value) !== -1) {
                 return true
             }
             return false
@@ -202,9 +205,7 @@ export default {
 
             const newList = []
             for (let i = 0; i < tables.length; i++) {
-                if (tables[i].fdType == 1) {
-                    newList.push(tables[i])
-                }
+                newList.push(tables[i])
             }
             this.selectedTables = newList
         },
@@ -250,7 +251,7 @@ export default {
                 return
             }
 
-            const javaUrl =this.userConfig.fdJavaPath
+            const javaUrl = this.userConfig.fdJavaPath
             if (javaUrl == null || javaUrl == '') {
                 this.$message.error('请先配置共通参数。【顶栏】->【配置】')
                 return
@@ -268,7 +269,7 @@ export default {
             for (let i = 0; i < this.selectedTables.length; i++) {
                 const selectedTable = this.selectedTables[i]
                 tableList.push({
-                    fdName: selectedTable.fdName,
+                    tableName: selectedTable.tableName,
                     tableSchema: selectedTable.tableSchema
                 })
             }