ap-dev 1.2.27 → 1.3.0

package/dev/BackgroundPanel/BackgroundBase.vue

@@ -0,0 +1,115 @@
+<template>
+</template>
+
+<script>
+import {convertToTreeData} from 'ap-util/util/DataUtil'
+import {getUserConfig} from './../dev/DevUtil'
+
+export default {
+    name: 'BackgroundBase',
+    data() {
+        return {
+            selectedTables: [],
+            createEntity: 1,
+            createEntityFD: 1,
+            createEntityTF: 1,
+            createController: 1,
+            createService: 1,
+            createDao: 1,
+            createXml: 0,
+            backgroundMsg: '',
+            userConfig: getUserConfig(),
+            backgroundOtherParam: {}, // 前端传给后台的额外参数
+        }
+    },
+    methods: {
+
+        createFile(projectName, list) {
+            this.$request({
+                url: '/apd/dev/DevGenerateCode/createFile',
+                method: 'post',
+                data: {
+                    list: JSON.stringify(list),
+                    projectName: projectName
+                }
+            }).then(response => {
+                this.backgroundMsg = response.data
+                this.$message.success('后台代码，生成完成！')
+            })
+        },
+        generateCode() {
+            if (this.selectedTables.length < 1) {
+                this.$message.error('请选择表！')
+                return
+            }
+
+            const javaUrl = this.userConfig.fdJavaPath
+            if (javaUrl == null || javaUrl == '') {
+                this.$message.error('请先配置共通参数。【顶栏】->【配置】')
+                return
+            }
+
+            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({
+                    tableName: selectedTable.tableName,
+                    tableSchema: selectedTable.tableSchema
+                })
+            }
+
+            let tableSchema = tableList[0].tableSchema;
+            let javaPath = this.userConfig.fdJavaPath;
+            let projectName = javaPath.substring(javaPath.lastIndexOf('\\') + 1);
+            // 项目名和数据库不一致，警告
+            if (projectName.indexOf(tableSchema) > -1) {
+                this.getBackgroundCode(tableList);
+                return;
+            }
+            this.$confirm(`警告：项目【${projectName}】和数据库【${tableSchema}】不匹配！`, '提示', {
+                confirmButtonText: '确认生成',
+                cancelButtonText: '取消',
+                type: 'error'
+            }).then(() => {
+                this.getBackgroundCode(tableList);
+            });
+        },
+        getBackgroundCode(tableList) {
+            let backgroundParam = {
+                tableList: JSON.stringify(tableList),
+                createEntity: this.createEntity,
+                createEntityFD: this.createEntityFD,
+                createEntityTF: this.createEntityTF,
+                createController: this.createController,
+                createService: this.createService,
+                createDao: this.createDao,
+                createXml: this.createXml,
+                javaUrl: this.userConfig.fdJavaPath,
+                sourceId: this.userConfig.fdSourceId
+            };
+            let mergedParam = {...backgroundParam, ...this.backgroundOtherParam};
+
+            this.$request({
+                url: '/apd/dev/DevGenerateCode/getBackgroundCode',
+                method: 'post',
+                data: mergedParam
+            }).then(response => {
+                // 生成文件
+                this.createFile(this.userConfig.fdJavaHref, response.data)
+            })
+        }
+
+    }
+}
+</script>
+
+<style scoped>
+</style>

package/dev/BackgroundPanel/index.vue

@@ -108,7 +108,7 @@
                     @click="generateCode"
                 />
             </div>
-            <div class="msg" v-html="msg"/>
+            <div class="msg" v-html="backgroundMsg"/>
         </ap-main>
 
     </ap-container>
@@ -117,9 +117,10 @@
 <script>
 import {convertToTreeData} from 'ap-util/util/DataUtil'
 import {getUserConfig} from './../dev/DevUtil'
-
+import BackgroundBase from './BackgroundBase'
 export default {
     name: 'BackgroundPanel',
+    extends: BackgroundBase,
     data() {
         return {
             // ----- 左侧树 -----
@@ -131,18 +132,6 @@ export default {
                 children: 'children',
                 label: 'tableName'
             },
-            // ----- dialog -----
-            selectedTables: [],
-            createEntity: 1,
-            createEntityFD: 1,
-            createEntityTF: 1,
-            createController: 1,
-            createService: 1,
-            createDao: 1,
-            createXml: 0,
-            msg: '',
-            //  ----- 右侧内容 -----
-            userConfig: getUserConfig()
         }
     },
     watch: {
@@ -232,86 +221,6 @@ export default {
             }
             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 = this.userConfig.fdJavaPath
-            if (javaUrl == null || javaUrl == '') {
-                this.$message.error('请先配置共通参数。【顶栏】->【配置】')
-                return
-            }
-
-            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({
-                    tableName: selectedTable.tableName,
-                    tableSchema: selectedTable.tableSchema
-                })
-            }
-
-            let tableSchema = tableList[0].tableSchema;
-            let javaPath = this.userConfig.fdJavaPath;
-            let projectName = javaPath.substring(javaPath.lastIndexOf('\\') + 1);
-            // 项目名和数据库不一致，警告
-            if (projectName.indexOf(tableSchema) > -1) {
-                this.getBackgroundCode(tableList);
-                return;
-            }
-            this.$confirm(`警告：项目【${projectName}】和数据库【${tableSchema}】不匹配！`, '提示', {
-                confirmButtonText: '确认生成',
-                cancelButtonText: '取消',
-                type: 'error'
-            }).then(() => {
-                this.getBackgroundCode(tableList);
-            });
-        },
-        getBackgroundCode(tableList) {
-            this.$request({
-                url: '/apd/dev/DevGenerateCode/getBackgroundCode',
-                method: 'post',
-                data: {
-                    tableList: JSON.stringify(tableList),
-                    createEntity: this.createEntity,
-                    createEntityFD: this.createEntityFD,
-                    createEntityTF: this.createEntityTF,
-                    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>

package/dev/ConfigPanel/DevCpt.vue

@@ -697,7 +697,6 @@ export default {
                 editPk: "fdId", //默认fdId
                 deletePk: "fdId", // 默认fdId
                 deleteUrl: "/apd/TDevCptParamTemplate/deleteTDevCptParamTemplateGridData",
-                sortUrl: "/apd/TDevCptParamTemplate/updateTDevCptParamTemplateSortList",
                 toolbarBtn: [{
                     btnType: "primary", text: "复制", icon: "el-icon-copy", onClick: () => {
                         this.doCopyParamTemplate()

package/dev/DbDesignPanel/DevDbField.vue

@@ -96,7 +96,9 @@ export default {
                         options: [
                             {label: 'char(255)', value: 'char'},
                             {label: 'varchar(6.5万)', value: 'varchar'},
-                            {label: 'text(长文本)', value: 'text'}
+                            {label: 'text(6.5万)', value: 'text'},
+                            {label: 'mediumtext(1600万)', value: 'mediumtext'},
+                            {label: 'longtext(极长)', value: 'longtext'},
                         ]
                     },
                     {
@@ -126,6 +128,14 @@ export default {
                             {label: 'datetime(年月日时分秒)', value: 'datetime'},
                             {label: 'timestamp(时间戳)', value: 'timestamp'}
                         ]
+                    },
+                    {
+                        label: '二进制:图片/文件',
+                        options: [
+                            {label: 'blob(6.5万)', value: 'blob'},
+                            {label: 'mediumblob(1600万)', value: 'mediumblob'},
+                            {label: 'longblob(极长)', value: 'longblob'},
+                        ]
                     }
                 ],
                 selectFilterable: true,

package/dev/DbDesignPanel/DevDbTable.vue

@@ -109,7 +109,10 @@ export default {
                         options: [
                             {label: 'char', value: 'char'},
                             {label: 'varchar', value: 'varchar'},
-                            {label: 'text', value: 'text'}
+                            {label: 'text', value: 'text'},
+                            {label: 'mediumtext', value: 'mediumtext'},
+                            {label: 'longtext', value: 'longtext'},
+
                         ]
                     },
                     {
@@ -139,6 +142,14 @@ export default {
                             {label: 'datetime', value: 'datetime'},
                             {label: 'timestamp', value: 'timestamp'}
                         ]
+                    },
+                    {
+                        label: '二进制:图片/文件',
+                        options: [
+                            {label: 'blob', value: 'blob'},
+                            {label: 'mediumblob', value: 'mediumblob'},
+                            {label: 'longblob', value: 'longblob'},
+                        ]
                     }
                 ],
                 selectFilterable: true,
@@ -154,7 +165,8 @@ export default {
                 width: '80',
                 edit: (rowData) => {
                     // 不允许编辑长度的类型
-                    const arr = ['tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'date', 'time', 'year', 'datetime', 'timestamp', 'text']
+                    const arr = ['tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'date', 'time', 'year', 'datetime', 'timestamp',
+                        'text', 'mediumtext', 'longtext', 'blob', 'mediumblob', 'longblob']
 
                     return arr.indexOf(rowData.dataType) < 0
                 }

package/dev/DbDesignPanel/DevDbTableDialog.vue

@@ -95,7 +95,9 @@ export default {
                         options: [
                             {label: 'char(255)', value: 'char'},
                             {label: 'varchar(6.5万)', value: 'varchar'},
-                            {label: 'text(长文本)', value: 'text'}
+                            {label: 'text(6.5万)', value: 'text'},
+                            {label: 'mediumtext(1600万)', value: 'mediumtext'},
+                            {label: 'longtext(极长)', value: 'longtext'},
                         ]
                     },
                     {
@@ -125,6 +127,14 @@ export default {
                             {label: 'datetime(年月日时分秒)', value: 'datetime'},
                             {label: 'timestamp(时间戳)', value: 'timestamp'}
                         ]
+                    },
+                    {
+                        label: '二进制:图片/文件',
+                        options: [
+                            {label: 'blob(6.5万)', value: 'blob'},
+                            {label: 'mediumblob(1600万)', value: 'mediumblob'},
+                            {label: 'longblob(极长)', value: 'longblob'},
+                        ]
                     }
                 ],
                 selectFilterable: true,