ap-dev 1.0.27 → 1.0.31

package/dev/ApiPanel/modules/ApiSwagger.vue

@@ -16,15 +16,16 @@
 
         <api-tittle-2>二、使用方法:</api-tittle-2>
         <api-content>
-            1、打开接口地址：http://ip:端口/项目名/swagger-ui/index.html<br>
+            <b>1、打开接口地址：</b>http://ip:端口/项目名/swagger-ui/index.html<br>
             <api-code>
                 示例：<br>
                 http://172.22.0.252:8181/apm/swagger-ui/index.html
             </api-code>
             <br>
-            2、添加token<br>
+            <b>2、添加token：</b><br>
             <el-image style="height: 500px" :src="image1" :fit="true"></el-image>
-            3、调用接口<br>
+            <br>
+            <b>3、调用接口：</b><br>
             <el-image style="height: 500px" :src="image2" :fit="true"></el-image>
         </api-content>
     </div>
@@ -40,8 +41,8 @@ export default {
     },
     data() {
         return {
-            image1: require("./../images/ApiSwagger1.png.png"),
-            image2: require("./../images/ApiSwagger2.png.png"),
+            image1: require("./../images/ApiSwagger1.png"),
+            image2: require("./../images/ApiSwagger2.png"),
         }
     }
 }

package/dev/BackgroundPanel/index.vue

@@ -2,26 +2,26 @@
     <ap-container>
         <ap-aside margin="1111" style="width: 450px">
             <div class="layout-aside-header">
-                <div class="layout-aside-header-title">{{headerName}}</div>
+                <div class="layout-aside-header-title">{{ headerName }}</div>
             </div>
             <div>
                 <el-input v-model="filterText" placeholder="关键字过滤"/>
             </div>
             <div v-loading="loadingTreeFlag" class="layout-aside-content">
                 <el-tree
-                        ref="typeTree"
-                        class="filter-tree"
-                        node-key="fdId"
-                        :data="typeTreeList"
-                        :props="defaultProps"
-                        :highlight-current="true"
-                        :filter-node-method="filterNode"
-                        :indent="1"
-                        show-checkbox
-                        default-expand-all
-                        :check-on-click-node="true"
-                        :expand-on-click-node="false"
-                        @check-change="checkChangeEvent"
+                    ref="typeTree"
+                    class="filter-tree"
+                    node-key="fdId"
+                    :data="typeTreeList"
+                    :props="defaultProps"
+                    :highlight-current="true"
+                    :filter-node-method="filterNode"
+                    :indent="1"
+                    show-checkbox
+                    default-expand-all
+                    :check-on-click-node="true"
+                    :expand-on-click-node="false"
+                    @check-change="checkChangeEvent"
                 >
                     <div slot-scope="{ node, data }" style="width: 100%">
                         <div class="dev-tree-node-left ap-ellipse">
@@ -35,8 +35,17 @@
         <ap-main margin="1110">
             <div class="item-ctn">
                 <div class="title-span">
-                    <i class="el-icon-title-flag"/>
-                    当前项目：{{ projectName }}
+                    <div>
+                        <i class="el-icon-title-flag"/>
+                        后台请求路径：
+                        <span class="api-code">{{ userConfig.fdJavaHref }}</span>
+                    </div>
+                    <div style="padding: 13px 0 0 20px;">
+                        文件生成位置：
+                        <span class="api-code">
+                            {{ userConfig.fdJavaPath }}
+                        </span>
+                    </div>
                 </div>
             </div>
 
@@ -86,11 +95,11 @@
             </div>
             <div style="text-align: center;">
                 <el-button
-                        type="primary"
-                        icon="el-icon-magic-stick"
-                        circle
-                        style="padding: 30px;font-size: 60px;"
-                        @click="generateCode"
+                    type="primary"
+                    icon="el-icon-magic-stick"
+                    circle
+                    style="padding: 30px;font-size: 60px;"
+                    @click="generateCode"
                 />
             </div>
             <div class="msg" v-html="msg"/>
@@ -100,207 +109,215 @@
 </template>
 
 <script>
-    import {getLocalData, getSourceId} from './../dev/DevUtil'
-    import { convertToTreeData} from 'ap-util/util/DataUtil'
-    export default {
-        name: 'BackgroundPanel',
-        data() {
-            return {
-                // ----- 左侧树 -----
-                headerName: '表',
-                loadingTreeFlag: false,
-                filterText: '',
-                typeTreeList: [],
-                defaultProps: {
-                    children: 'children',
-                    label: 'fdName'
-                },
-                // ----- dialog -----
-                selectedTables: [],
-                createEntity: 1,
-                createEntityFD: 1,
-                createController: 1,
-                createService: 1,
-                createDao: 1,
-                createXml: 0,
-                msg: '',
-                //  ----- 右侧内容 -----
-                projectName: getLocalData('configForm').projectName
+import {convertToTreeData} from 'ap-util/util/DataUtil'
+import {getUserConfig} from './../dev/DevUtil'
+export default {
+    name: 'BackgroundPanel',
+    data() {
+        return {
+            // ----- 左侧树 -----
+            headerName: '表',
+            loadingTreeFlag: false,
+            filterText: '',
+            typeTreeList: [],
+            defaultProps: {
+                children: 'children',
+                label: 'fdName'
+            },
+            // ----- dialog -----
+            selectedTables: [],
+            createEntity: 1,
+            createEntityFD: 1,
+            createController: 1,
+            createService: 1,
+            createDao: 1,
+            createXml: 0,
+            msg: '',
+            //  ----- 右侧内容 -----
+            userConfig: getUserConfig()
+        }
+    },
+    watch: {
+        filterText(val) {
+            this.$refs.typeTree.filter(val)
+        }
+    },
+    created() {
+        this.loadTreeData();
+    },
+    methods: {
+        // 左侧树：列头
+        setHeaderName() {
+            if (this.typeTreeList.length > 1) {
+                this.headerName = "[" + this.typeTreeList[0].fdDatabase + "] - 表";
             }
         },
-        watch: {
-            filterText(val) {
-                this.$refs.typeTree.filter(val)
-            }
+        // 左侧树：加载数据
+        loadTreeData() {
+            this.loadingTreeFlag = true
+            this.$request({
+                url: '/apd/db/DevDbTable/getTableList',
+                method: 'post',
+                data: {
+                    sourceId: this.userConfig.fdSourceId
+                }
+            }).then(response => {
+                this.typeTreeList = convertToTreeData(response.data, {
+                    idKey: "fdId",
+                    parentKey: "fdParentId",
+                    childrenKey: "children",
+                });
+                this.setHeaderName();
+            }).finally(() => {
+                this.loadingTreeFlag = false
+            })
         },
-        created() {
+        // 左侧树：初始化数据
+        initTreeData() {
+            // 重置当前选择节点
+            this.$refs.typeTree.setCurrentKey()
             this.loadTreeData()
         },
-        methods: {
-            // 左侧树：列头
-            setHeaderName() {
-                if (this.typeTreeList.length > 1) {
-                    this.headerName = "[" + this.typeTreeList[0].fdDatabase + "] - 表";
-                }
-            },
-            // 左侧树：加载数据
-            loadTreeData() {
-                this.loadingTreeFlag = true
-                this.$request({
-                    url: '/apd/db/DevDbTable/getTableList',
-                    method: 'post',
-                    data: {
-                        sourceId: getSourceId()
-                    }
-                }).then(response => {
-                    this.typeTreeList = convertToTreeData(response.data, {
-                        idKey: "fdId",
-                        parentKey: "fdParentId",
-                        childrenKey: "children",
-                    });
-                    this.setHeaderName();
-                }).finally(() => {
-                    this.loadingTreeFlag = false
-                })
-            },
-            // 左侧树：初始化数据
-            initTreeData() {
-                // 重置当前选择节点
-                this.$refs.typeTree.setCurrentKey()
-                this.loadTreeData()
-            },
-            // 左侧树：过滤节点
-            filterNode(value, data) {
-                if (!value) return true
-                if (data.fdName.indexOf(value) !== -1) {
-                    return true
-                }
-                if (data.comment != null && data.comment.indexOf(value) !== -1) {
-                    return true
-                }
-                return false
-            },
-            // 选择事件
-            checkChangeEvent(data, node, comp) {
-                const parentNodes = this.$refs.typeTree.getHalfCheckedNodes()
-                const selectNodes = this.$refs.typeTree.getCheckedNodes(false)
-                const tables = parentNodes.concat(selectNodes)
+        // 左侧树：过滤节点
+        filterNode(value, data) {
+            if (!value) return true
+            if (data.fdName.indexOf(value) !== -1) {
+                return true
+            }
+            if (data.comment != null && data.comment.indexOf(value) !== -1) {
+                return true
+            }
+            return false
+        },
+        // 选择事件
+        checkChangeEvent(data, node, comp) {
+            const parentNodes = this.$refs.typeTree.getHalfCheckedNodes()
+            const selectNodes = this.$refs.typeTree.getCheckedNodes(false)
+            const tables = parentNodes.concat(selectNodes)
 
-                const newList = []
-                for (let i = 0; i < tables.length; i++) {
-                    if (tables[i].fdType == 1) {
-                        newList.push(tables[i])
-                    }
+            const newList = []
+            for (let i = 0; i < tables.length; i++) {
+                if (tables[i].fdType == 1) {
+                    newList.push(tables[i])
                 }
-                this.selectedTables = newList
-            },
-            // 左侧树：转换成tree要求的数据格式
-            handelTreeData(data) {
-                const newList = []
-                for (let i = 0; i < data.length; i++) {
-                    const fdParentId = data[i].fdParentId
-                    // 根节点
-                    if (!fdParentId) {
-                        newList.push(data[i])
-                    } else {
-                        // 子节点
-                        for (let j = 0; j < data.length; j++) {
-                            // 查找父节点
-                            if (data[j].fdId == fdParentId) {
-                                if (!data[j].children) {
-                                    data[j].children = []
-                                }
-                                data[j].children.push(data[i])
+            }
+            this.selectedTables = newList
+        },
+        // 左侧树：转换成tree要求的数据格式
+        handelTreeData(data) {
+            const newList = []
+            for (let i = 0; i < data.length; i++) {
+                const fdParentId = data[i].fdParentId
+                // 根节点
+                if (!fdParentId) {
+                    newList.push(data[i])
+                } else {
+                    // 子节点
+                    for (let j = 0; j < data.length; j++) {
+                        // 查找父节点
+                        if (data[j].fdId == fdParentId) {
+                            if (!data[j].children) {
+                                data[j].children = []
                             }
+                            data[j].children.push(data[i])
                         }
                     }
                 }
-                return newList
-            },
-            createFile(projectName, list) {
-                this.$request({
-                    url: '/apd/dev/DevGenerateCode/createFile',
-                    method: 'post',
-                    data: {
-                        list: JSON.stringify(list),
-                        projectName: projectName
-                    }
-                }).then(response => {
-                    this.msg = response.data
-                    this.$message.success('操作成功！')
-                })
-            },
-            generateCode() {
-                if (this.selectedTables.length < 1) {
-                    this.$message.error('请选择表！')
-                    return
+            }
+            return newList
+        },
+        createFile(projectName, list) {
+            this.$request({
+                url: '/apd/dev/DevGenerateCode/createFile',
+                method: 'post',
+                data: {
+                    list: JSON.stringify(list),
+                    projectName: projectName
                 }
+            }).then(response => {
+                this.msg = response.data
+                this.$message.success('操作成功！')
+            })
+        },
+        generateCode() {
+            if (this.selectedTables.length < 1) {
+                this.$message.error('请选择表！')
+                return
+            }
 
-                const javaUrl = getLocalData('configForm').javaUrl
-                if (javaUrl == null || javaUrl == '') {
-                    this.$message.error('请先配置共通参数。【顶栏】->【配置】')
-                    return
-                }
+            const javaUrl =this.userConfig.fdJavaPath
+            if (javaUrl == null || javaUrl == '') {
+                this.$message.error('请先配置共通参数。【顶栏】->【配置】')
+                return
+            }
 
-                const tableList = []
-                for (let i = 0; i < this.selectedTables.length; i++) {
-                    const selectedTable = this.selectedTables[i]
-                    tableList.push({
-                        fdName: selectedTable.fdName,
-                        tableSchema: selectedTable.tableSchema
-                    })
-                }
-                this.$request({
-                    url: '/apd/dev/DevGenerateCode/getBackgroundCode',
-                    method: 'post',
-                    data: {
-                        tableList: JSON.stringify(tableList),
-                        createEntity: this.createEntity,
-                        createEntityFD: this.createEntityFD,
-                        createController: this.createController,
-                        createService: this.createService,
-                        createDao: this.createDao,
-                        createXml: this.createXml,
-                        javaUrl: javaUrl,
-                        sourceId: getSourceId()
-                    }
-                }).then(response => {
-                    // 生成文件
-                    this.createFile(this.projectName, response.data)
+            this.$confirm(`确定在【${javaUrl}】下生成文件?`, '提示', {
+                confirmButtonText: '确定',
+                type: 'warning'
+            }).then(() => {
+                this.doGenerateCode()
+            });
+        },
+        doGenerateCode() {
+            const tableList = []
+            for (let i = 0; i < this.selectedTables.length; i++) {
+                const selectedTable = this.selectedTables[i]
+                tableList.push({
+                    fdName: selectedTable.fdName,
+                    tableSchema: selectedTable.tableSchema
                 })
             }
+            this.$request({
+                url: '/apd/dev/DevGenerateCode/getBackgroundCode',
+                method: 'post',
+                data: {
+                    tableList: JSON.stringify(tableList),
+                    createEntity: this.createEntity,
+                    createEntityFD: this.createEntityFD,
+                    createController: this.createController,
+                    createService: this.createService,
+                    createDao: this.createDao,
+                    createXml: this.createXml,
+                    javaUrl: this.userConfig.fdJavaPath,
+                    sourceId: this.userConfig.fdSourceId
+                }
+            }).then(response => {
+                // 生成文件
+                this.createFile(this.userConfig.fdJavaHref, response.data)
+            })
         }
     }
+}
 </script>
 
 <style scoped>
-    .item-ctn {
-        border-bottom: 1px solid #e9ecf1;
-        margin-bottom: 5px;
-        padding-bottom: 10px;
-    }
+.item-ctn {
+    border-bottom: 1px solid #e9ecf1;
+    margin-bottom: 5px;
+    padding-bottom: 10px;
+}
 
-    .title-span {
-        font-weight: bold;
-        color: #4f4f4f;
-    }
+.title-span {
+    font-weight: bold;
+    color: #4f4f4f;
+}
 
-    .create-item {
-        padding: 5px;
-    }
+.create-item {
+    padding: 5px;
+}
 
-    .create-item-span {
-        width: 90px;
-        float: left;
-    }
+.create-item-span {
+    width: 90px;
+    float: left;
+}
 
-    .msg {
-        color: #1890ff;
-    }
+.msg {
+    color: #1890ff;
+}
 
-    .dev-tree-node-left {
-        font-size: 15px;
-        width: 60%;
-        float: left;
-    }
+.dev-tree-node-left {
+    font-size: 15px;
+    width: 60%;
+    float: left;
+}
 </style>