将 tool 合并到 infra 模块

yudao-ui-admin/src/views/bpm/form/formEditor.vue

@@ -145,9 +145,9 @@ import { debounce } from 'throttle-debounce'
 import { saveAs } from 'file-saver'
 import ClipboardJS from 'clipboard'
 import render from '@/components/render/render'
-import FormDrawer from '@/views/tool/build/FormDrawer'
-import JsonDrawer from '@/views/tool/build/JsonDrawer'
-import RightPanel from '@/views/tool/build/RightPanel'
+import FormDrawer from '@/views/infra/build/FormDrawer'
+import JsonDrawer from '@/views/infra/build/JsonDrawer'
+import RightPanel from '@/views/infra/build/RightPanel'
 import {
   inputComponents, selectComponents, layoutComponents, formConf
 } from '@/components/generator/config'
@@ -161,8 +161,8 @@ import { makeUpJs } from '@/components/generator/js'
 import { makeUpCss } from '@/components/generator/css'
 import drawingDefalut from '@/components/generator/drawingDefalut'
 import logo from '@/assets/logo/logo.png'
-import CodeTypeDialog from '@/views/tool/build/CodeTypeDialog'
-import DraggableItem from '@/views/tool/build/DraggableItem'
+import CodeTypeDialog from '@/views/infra/build/CodeTypeDialog'
+import DraggableItem from '@/views/infra/build/DraggableItem'
 import {
   getDrawingList, saveDrawingList, getIdGlobal, saveIdGlobal, getFormConf
 } from '@/utils/db'

yudao-ui-admin/src/views/infra/codegen/editTable.vue

@@ -127,7 +127,7 @@
   </el-card>
 </template>
 <script>
-import { getCodegenDetail, updateCodegen } from "@/api/tool/codegen";
+import { getCodegenDetail, updateCodegen } from "@/api/infra/codegen";
 import { listAllSimple as listAllSimpleDictType } from "@/api/system/dict/type";
 import { listSimpleMenus } from "@/api/system/menu";
 import basicInfoForm from "./basicInfoForm";
@@ -213,7 +213,7 @@ export default {
     /** 关闭按钮 */
     close() {
       this.$tab.closeOpenPage({
-        path: "/tool/codegen",
+        path: "/infra/codegen",
         query: { t: Date.now(), pageNum: this.$route.query.pageNum } }
       );
     }

yudao-ui-admin/src/views/infra/codegen/genInfoForm.vue

@@ -5,7 +5,7 @@
         <el-form-item prop="templateType">
           <span slot="label">生成模板</span>
           <el-select v-model="info.templateType" @change="tplSelectChange">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TOOL_CODEGEN_TEMPLATE_TYPE)"
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_CODEGEN_TEMPLATE_TYPE)"
                 :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
           </el-select>
         </el-form-item>
@@ -14,7 +14,7 @@
         <el-form-item prop="scene">
           <span slot="label">生成场景</span>
           <el-select v-model="info.scene">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TOOL_CODEGEN_SCENE)"
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_CODEGEN_SCENE)"
                        :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
           </el-select>
         </el-form-item>

yudao-ui-admin/src/views/infra/codegen/importTable.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import { getSchemaTableList, createCodegenListFromDB } from "@/api/tool/codegen";
+import { getSchemaTableList, createCodegenListFromDB } from "@/api/infra/codegen";
 export default {
   data() {
     return {

yudao-ui-admin/src/views/infra/codegen/index.vue

@@ -24,9 +24,9 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-upload" size="mini" @click="openImportTable"
-                   v-hasPermi="['tool:codegen:create']">基于 DB 导入</el-button>
+                   v-hasPermi="['infra:codegen:create']">基于 DB 导入</el-button>
         <el-button type="info" plain icon="el-icon-upload" size="mini" @click="openImportSQL"
-                   v-hasPermi="['tool:codegen:create']">基于 SQL 导入</el-button>
+                   v-hasPermi="['infra:codegen:create']">基于 SQL 导入</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -48,11 +48,11 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button type="text" size="small" icon="el-icon-view" @click="handlePreview(scope.row)" v-hasPermi="['tool:codegen:preview']">预览</el-button>
-          <el-button type="text" size="small" icon="el-icon-edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:codegen:update']">编辑</el-button>
-          <el-button type="text" size="small" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:codegen:delete']">删除</el-button>
-          <el-button type="text" size="small" icon="el-icon-refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:codegen:update']">同步</el-button>
-          <el-button type="text" size="small" icon="el-icon-download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:codegen:download']">生成代码</el-button>
+          <el-button type="text" size="small" icon="el-icon-view" @click="handlePreview(scope.row)" v-hasPermi="['infra:codegen:preview']">预览</el-button>
+          <el-button type="text" size="small" icon="el-icon-edit" @click="handleEditTable(scope.row)" v-hasPermi="['infra:codegen:update']">编辑</el-button>
+          <el-button type="text" size="small" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['infra:codegen:delete']">删除</el-button>
+          <el-button type="text" size="small" icon="el-icon-refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['infra:codegen:update']">同步</el-button>
+          <el-button type="text" size="small" icon="el-icon-download" @click="handleGenTable(scope.row)" v-hasPermi="['infra:codegen:download']">生成代码</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -101,7 +101,7 @@
 
 <script>
 import { getCodegenTablePage, previewCodegen, downloadCodegen, deleteCodegen,
-  syncCodegenFromDB, syncCodegenFromSQL, createCodegenListFromSQL } from "@/api/tool/codegen";
+  syncCodegenFromDB, syncCodegenFromSQL, createCodegenListFromSQL } from "@/api/infra/codegen";
 
 import importTable from "./importTable";
 // 代码高亮插件

yudao-ui-admin/src/views/infra/dbDoc/index.vue

@@ -15,7 +15,7 @@
   </div>
 </template>
 <script>
-import { exportHtml, exportWord, exportMarkdown} from "@/api/tool/dbDoc";
+import { exportHtml, exportWord, exportMarkdown} from "@/api/infra/dbDoc";
 import iFrame from "@/components/iFrame/index";
 
 export default {

yudao-ui-admin/src/views/infra/testDemo/index.vue

@@ -36,11 +36,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['tool:test-demo:create']">新增</el-button>
+                   v-hasPermi="['infra:test-demo:create']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['tool:test-demo:export']">导出</el-button>
+                   v-hasPermi="['infra:test-demo:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -61,9 +61,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['tool:test-demo:update']">修改</el-button>
+                     v-hasPermi="['infra:test-demo:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['tool:test-demo:delete']">删除</el-button>
+                     v-hasPermi="['infra:test-demo:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -103,7 +103,7 @@
 </template>
 
 <script>
-import { createTestDemo, updateTestDemo, deleteTestDemo, getTestDemo, getTestDemoPage, exportTestDemoExcel } from "@/api/tool/testDemo";
+import { createTestDemo, updateTestDemo, deleteTestDemo, getTestDemo, getTestDemoPage, exportTestDemoExcel } from "@/api/infra/testDemo";
 
 export default {
   name: "TestDemo",