自动化代码可分包 (#982)

* [style] 修改右上角图标，选择统一风格的iconfont * 增加路由排错处理 * 未输入tablename时前端自动生成下划线表名方式回滚误删表 * 支持自动化生成package功能 Co-authored-by: bypanghu <bypanghu@163.com> Co-authored-by: songzhibin97 <718428482@qq.com>
2022-03-26 14:13:26 +08:00
parent 8003603ffd
commit 429353fa54
47 changed files with 1069 additions and 699 deletions
@@ -17,21 +17,17 @@
            class="topfix"
          >
            <el-row>
-              <!-- :xs="8" :sm="6" :md="4" :lg="3" :xl="1" -->
              <el-col>
                <el-header class="header-cont">
                  <el-row class="pd-0">
                    <el-col :xs="2" :lg="1" :md="1" :sm="1" :xl="1" style="z-index:100">
                      <div class="menu-total" @click="totalCollapse">
-                        <el-icon v-if="isCollapse" size="24"><expand /></el-icon>
-                        <el-icon v-else size="24">
-                          <fold />
-                        </el-icon>
+                        <div v-if="isCollapse" class="gvaIcon gvaIcon-arrow-double-right"></div>
+                        <div v-else class="gvaIcon gvaIcon-arrow-double-left"></div>
                      </div>
                    </el-col>
                    <el-col :xs="10" :lg="14" :md="14" :sm="9" :xl="14" :pull="1">
                      <el-breadcrumb class="breadcrumb">
-
                        <el-breadcrumb-item
                          v-for="item in matched.slice(1,matched.length)"
                          :key="item.path"
@@ -1,65 +1,8 @@
 <template>
-  <el-icon @click="clickFull">
-    <svg
-      v-if="isShow"
-      t="1590133227479"
-      class="screenfull-svg"
-      viewBox="0 0 1024 1024"
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path id="svg_1" d="m928.512,959.744a32,32 0 0 1 -32,-32l0,-256a32,32 0 0 1 64,0l0,256a32,32 0 0 1 -32,32z" />
-      <path
-        id="svg_2"
-        d="m960.512,927.744a32,32 0 0 1 -32,32l-256,0a32,32 0 0 1 0,-64l256,0a32,32 0 0 1 32,32zm-864.768,-863.488a32,32 0 0 1 32,32l0,256a32,32 0 0 1 -64,0l0,-256a32,32 0 0 1 32,-32z"
-      />
-      <path id="svg_3" d="m63.744,96.256a32,32 0 0 1 32,-32l256,0a32,32 0 0 1 0,64l-256,0a32,32 0 0 1 -32,-32z" />
-      <path id="svg_4" d="m958.030718,91.777575a32,32 0 0 1 -32,32l-256,0a32,32 0 0 1 0,-64l256,0a32,32 0 0 1 32,32z" />
-      <path id="svg_5" d="m926.030718,59.777575a32,32 0 0 1 32,32l0,256a32,32 0 0 1 -64,0l0,-256a32,32 0 0 1 32,-32z" />
-      <path
-        id="svg_6"
-        d="m940.622718,69.250038a32,32 0 0 1 0,45.248l-247.936,247.936a32,32 0 0 1 -45.248,-45.248l247.936,-247.936a31.936,31.936 0 0 1 45.248,0z"
-      />
-      <path id="svg_7" d="m61.649508,930.478492a32,32 0 0 1 32,-32l256,0a32,32 0 0 1 0,64l-256,0a32,32 0 0 1 -32,-32z" />
-      <path id="svg_8" d="m93.649508,962.478492a32,32 0 0 1 -32,-32l0,-256a32,32 0 0 1 64,0l0,256a32,32 0 0 1 -32,32z" />
-      <path
-        id="svg_9"
-        d="m79.121508,945.070492a32,32 0 0 1 0,-45.248l247.936,-247.936a32,32 0 0 1 45.248,45.248l-247.936,247.936a32,32 0 0 1 -45.248,0z"
-      />
-    </svg>
-    <svg
-      v-else
-      t="1590133734869"
-      class="screenfull-svg"
-      viewBox="0 0 1024 1024"
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      p-id="1862"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-    >
-      <path d="M928.512 959.744a32 32 0 0 1-32-32v-256a32 32 0 0 1 64 0v256a32 32 0 0 1-32 32z" fill="" p-id="1863" />
-      <path
-        d="M960.512 927.744a32 32 0 0 1-32 32h-256a32 32 0 0 1 0-64h256a32 32 0 0 1 32 32zM95.744 64.256a32 32 0 0 1 32 32v256a32 32 0 0 1-64 0v-256a32 32 0 0 1 32-32z"
-        fill=""
-        p-id="1864"
-      />
-      <path d="M63.744 96.256a32 32 0 0 1 32-32h256a32 32 0 0 1 0 64h-256a32 32 0 0 1-32-32z" fill="" p-id="1865" />
-      <path d="M384.064 671.744a32 32 0 0 1-32 32h-256a32 32 0 0 1 0-64h256a32 32 0 0 1 32 32z" fill="" p-id="1866" />
-      <path d="M352.064 639.744a32 32 0 0 1 32 32v256a32 32 0 0 1-64 0v-256a32 32 0 0 1 32-32z" fill="" p-id="1867" />
-      <path
-        d="M366.656 657.216a32 32 0 0 1 0 45.248L118.72 950.4a32 32 0 0 1-45.248-45.248l247.936-247.936a31.936 31.936 0 0 1 45.248 0z"
-        fill=""
-        p-id="1868"
-      />
-      <path d="M639.616 352.512a32 32 0 0 1 32-32h256a32 32 0 0 1 0 64h-256a32 32 0 0 1-32-32z" fill="" p-id="1869" />
-      <path d="M671.616 384.512a32 32 0 0 1-32-32v-256a32 32 0 0 1 64 0v256a32 32 0 0 1-32 32z" fill="" p-id="1870" />
-      <path
-        d="M657.088 367.104a32 32 0 0 1 0-45.248l247.936-247.936a32 32 0 0 1 45.248 45.248l-247.936 247.936a32 32 0 0 1-45.248 0z"
-        fill=""
-        p-id="1871"
-      />
-    </svg>
-  </el-icon>
+  <div @click="clickFull">
+    <div class="gvaIcon gvaIcon-fullscreen-expand" v-if="isShow"></div>
+    <div v-else class="gvaIcon gvaIcon-fullscreen-shrink"></div>
+  </div>
 </template>

 <script>
@@ -23,17 +23,13 @@
      v-if="btnShow"
      class="user-box"
    >
-      <el-icon class="reload" :class="[reload ? 'reloading' : '']" @click="handleReload">
-        <refresh />
-      </el-icon>
+      <div class="gvaIcon gvaIcon-refresh"  :class="[reload ? 'reloading' : '']" @click="handleReload"></div>
    </div>
    <div
      v-if="btnShow"
      class="user-box"
    >
-      <el-icon class="search-icon" @click="showSearch">
-        <search />
-      </el-icon>
+      <div class="gvaIcon gvaIcon-search"  @click="showSearch"></div>
    </div>
    <div
      v-if="btnShow"
@@ -45,7 +41,7 @@
      v-if="btnShow"
      class="user-box"
    >
-      <el-icon class="search-icon" @click="toService"><service /></el-icon>
+     <div class="gvaIcon gvaIcon-customer-service"  @click="toService"></div>
    </div>
  </div>
 </template>
@@ -63,6 +63,13 @@
        <el-form-item label="文件名称" prop="packageName">
          <el-input v-model="form.packageName" placeholder="生成文件的默认名称(建议为驼峰格式,首字母小写,如sysXxxXxxx)" @blur="toLowerCaseFunc(form,'packageName')" />
        </el-form-item>
+        <el-form-item label="Package（包）" prop="packageName">
+          <el-select v-model="form.package" style="width:194px">
+            <el-option v-for="item in pkgs" :key="item.ID" :value="item.packageName" :label="item.packageName" />
+          </el-select>
+          <el-icon class="auto-icon" @click="getPkgs"><refresh /></el-icon>
+          <el-icon class="auto-icon" @click="goPkgs"><document-add /></el-icon>
+        </el-form-item>
        <el-form-item>
          <template #label>
            <el-tooltip content="注：把自动生成的API注册进数据库" placement="bottom" effect="light">
@@ -183,13 +190,14 @@ const fieldTemplate = {
 import FieldDialog from '@/view/systemTools/autoCode/component/fieldDialog.vue'
 import PreviewCodeDialog from '@/view/systemTools/autoCode/component/previewCodeDialg.vue'
 import { toUpperCase, toHump, toSQLLine, toLowerCase } from '@/utils/stringFun'
-import { createTemp, getDB, getTable, getColumn, preview, getMeta } from '@/api/autoCode'
+import { createTemp, getDB, getTable, getColumn, preview, getMeta, getPackageApi } from '@/api/autoCode'
 import { getDict } from '@/utils/dictionary'
 import { ref, getCurrentInstance, reactive } from 'vue'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'

 const route = useRoute()
+const router = useRouter()
 const activeNames = reactive([])
 const preViewCode = ref({})
 const dbform = ref({
@@ -204,6 +212,7 @@ const form = ref({
  structName: '',
  tableName: '',
  packageName: '',
+  package: '',
  abbreviation: '',
  description: '',
  autoCreateApiToSql: false,
@@ -226,6 +235,9 @@ const rules = ref({
      message: '文件名称：sysXxxxXxxx',
      trigger: 'blur'
    }
+  ],
+  package: [
+    { required: true, message: '请选择package', trigger: 'blur' }
  ]
 })
 const dialogMiddle = ref({})
@@ -323,7 +335,10 @@ const enterForm = async(isPreview) => {
        }
      }
      form.value.structName = toUpperCase(form.value.structName)
-      if (form.value.tableName) { form.value.tableName = form.value.tableName.replace(' ', '') }
+      form.value.tableName = form.value.tableName.replace(' ', '')
+      if (!form.value.tableName) {
+        form.value.tableName = toSQLLine(toLowerCase(form.value.structName))
+      }
      if (form.value.structName === form.value.abbreviation) {
        ElMessage({
          type: 'error',
@@ -437,9 +452,22 @@ const getAutoCodeJson = async(id) => {
  }
 }

+const pkgs = ref([])
+const getPkgs = async() => {
+  const res = await getPackageApi()
+  if (res.code === 0) {
+    pkgs.value = res.data.pkgs
+  }
+}
+
+const goPkgs = () => {
+  router.push({ name: 'autoPkg' })
+}
+
 const init = () => {
  getDbFunc()
  setFdMap()
+  getPkgs()
  const id = route.params.id
  if (id) {
    getAutoCodeJson(id)
@@ -472,4 +500,9 @@ export default {
 .auto-btn-list{
  margin-top: 16px;
 }
+.auto-icon{
+  margin-left: 6px;
+  color: #666;
+  cursor: pointer;
+}
 </style>
@@ -0,0 +1,146 @@
+<template>
+  <div>
+    <div class="gva-table-box">
+      <div class="gva-btn-list">
+        <el-button size="small" type="primary" icon="plus" @click="openDialog('addApi')">新增</el-button>
+      </div>
+      <el-table :data="tableData" @sort-change="sortChange" @selection-change="handleSelectionChange">
+        <el-table-column align="left" label="id" width="60" prop="ID" />
+        <el-table-column align="left" label="包名" width="150" prop="packageName" />
+        <el-table-column align="left" label="展示名" width="150" prop="label" />
+        <el-table-column align="left" label="描述" min-width="150" prop="desc" />
+
+        <el-table-column align="left" label="操作" width="200">
+          <template #default="scope">
+            <el-button
+              icon="delete"
+              size="small"
+              type="text"
+              @click="deleteApiFunc(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </div>
+
+    <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" title="创建Package">
+      <warning-bar title="新增Pkg用于自动化代码使用" />
+      <el-form ref="pkgForm" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="包名" prop="packageName">
+          <el-input v-model="form.packageName" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="展示名" prop="label">
+          <el-input v-model="form.label" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="描述" prop="desc">
+          <el-input v-model="form.desc" autocomplete="off" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button size="small" @click="closeDialog">取 消</el-button>
+          <el-button size="small" type="primary" @click="enterDialog">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AutoPkg',
+}
+</script>
+
+<script setup>
+import {
+  createPackageApi,
+  getPackageApi,
+  deletePackageApi,
+} from '@/api/autoCode'
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+const form = ref({
+  packageName: '',
+  label: '',
+  desc: '',
+})
+
+const rules = ref({
+  packageName: [{ required: true, message: '请输入包名', trigger: 'blur' }],
+})
+
+const dialogFormVisible = ref(false)
+const openDialog = () => {
+  dialogFormVisible.value = true
+}
+
+const closeDialog = () => {
+  dialogFormVisible.value = false
+  form.value = {
+    packageName: '',
+    label: '',
+    desc: '',
+  }
+}
+
+const pkgForm = ref(null)
+const enterDialog = async() => {
+  pkgForm.value.validate(async valid => {
+    if (valid) {
+      const res = await createPackageApi(form.value)
+      if (res.code === 0) {
+        ElMessage({
+          type: 'success',
+          message: '添加成功',
+          showClose: true
+        })
+      }
+      getTableData()
+      closeDialog()
+    }
+  })
+}
+
+const tableData = ref([])
+const getTableData = async() => {
+  const table = await getPackageApi()
+  if (table.code === 0) {
+    tableData.value = table.data.pkgs
+  }
+}
+
+const deleteApiFunc = async(row) => {
+  ElMessageBox.confirm('此操作仅删除数据库中的pkg存储，后端相应目录结构请自行删除与数据库保持一致！', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(async() => {
+      const res = await deletePackageApi(row)
+      if (res.code === 0) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功!'
+        })
+        getTableData()
+      }
+    })
+}
+
+getTableData()
+</script>
+
+<style scoped lang="scss">
+.button-box {
+  padding: 10px 20px;
+  .el-button {
+    float: right;
+  }
+}
+.warning {
+  color: #dc143c;
+}
+</style>