补充提交

zkqy-ui/src/main.js

@@ -1,23 +1,23 @@
 import Vue from 'vue'
 import { useAntd } from 'k-form-design/packages/core/useComponents'
 import KFormDesign from 'k-form-design/packages/use.js'
-// import 'k-form-design/lib/k-form-design.css'
-require('k-form-design/lib/k-form-design.css')
+import 'k-form-design/lib/k-form-design.css'
+// require('k-form-design/lib/k-form-design.css')
 import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
-// import './assets/styles/element-variables.scss'
-require('./assets/styles/element-variables.scss')
+import './assets/styles/element-variables.scss'
+// require('./assets/styles/element-variables.scss')
 
 // 以下为bpmn工作流绘图工具的样式
-// import 'bpmn-js/dist/assets/diagram-js.css' // 左边工具栏以及编辑节点的样式
-// import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
-// import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
-// import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
-require('bpmn-js/dist/assets/diagram-js.css')  // 左边工具栏以及编辑节点的样式
-require('bpmn-js/dist/assets/bpmn-font/css/bpmn.css')
-require('bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css')
-require('bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css')
+import 'bpmn-js/dist/assets/diagram-js.css' // 左边工具栏以及编辑节点的样式
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
+// require('bpmn-js/dist/assets/diagram-js.css')  // 左边工具栏以及编辑节点的样式
+// require('bpmn-js/dist/assets/bpmn-font/css/bpmn.css')
+// require('bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css')
+// require('bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css')
 // import 'bpmn-js-properties-panel/dist/assets/bpmn-js-properties-panel.css'
 // 左边工具栏以及编辑节点的样式
 // import 'bpmn-js-properties-panel/dist/assets/properties-panel.css'
@@ -25,8 +25,8 @@ require('bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css')
 
 // bpmnPro start
 import { vuePlugin } from "@packages/highlight";
-// import "highlight.js/styles/atom-one-dark-reasonable.css";
-require("highlight.js/styles/atom-one-dark-reasonable.css");
+import "highlight.js/styles/atom-one-dark-reasonable.css";
+// require("highlight.js/styles/atom-one-dark-reasonable.css");
 Vue.use(vuePlugin);
 
 import Common from "@packages/common";
@@ -35,16 +35,16 @@ Vue.use(Common);
 import ResetPopover from "@utils/resetPopover";
 Vue.directive("r-popover", ResetPopover);
 
-// import "@packages/theme/index.scss";
-require("@packages/theme/index.scss");
+import "@packages/theme/index.scss";
+// require("@packages/theme/index.scss");
 
 // bpmnPro end
 
 
-// import '@/assets/styles/index.scss' // global css
-// import '@/assets/styles/zkqy.scss' // zkqy css
-require('@/assets/styles/index.scss')  // global css
-require('@/assets/styles/zkqy.scss')  // zkqy css
+import '@/assets/styles/index.scss' // global css
+import '@/assets/styles/zkqy.scss' // zkqy css
+// require('@/assets/styles/index.scss')  // global css
+// require('@/assets/styles/zkqy.scss')  // zkqy css
 import App from './App'
 import store from './store'
 
@@ -53,10 +53,10 @@ import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
 
-// import './assets/icons' // icon
-// import './permission' // permission control
-require('./assets/icons')  // icon
-require('./permission')  // permission control
+import './assets/icons' // icon
+import './permission' // permission control
+// require('./assets/icons')  // icon
+// require('./permission')  // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/zkqy";

zkqy-ui/src/router/index.js

@@ -191,8 +191,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'role/:userId(\\d+)',
-        // component: () => import('@/views/system/data/index'),
-        component: (resolve) => require(['@/views/system/data/index'], resolve),
+        component: () => import('@/views/system/data/index'),
+        // component: (resolve) => require(['@/views/system/data/index'], resolve),
         name: 'AuthRole',
         meta: { title: '数据源配置', activeMenu: '/system/data' }
       }
@@ -206,8 +206,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'role/:userId(\\d+)',
-        // component: () => import('@/views/system/user/authRole'),
-        component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+        component: () => import('@/views/system/user/authRole'),
+        // component: (resolve) => require(['@/views/system/user/authRole'], resolve),
         name: 'AuthRole',
         meta: { title: '分配角色', activeMenu: '/system/user' }
       }
@@ -221,8 +221,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'fromModel/:index',
-        // component: () => import('@/views/system/fromModel/index'),
-        component: (resolve) => require(['@/views/system/fromModel/index'], require),
+        component: () => import('@/views/system/fromModel/index'),
+        // component: (resolve) => require(['@/views/system/fromModel/index'], resolve),
         name: 'fromModel',
         meta: { title: '表单建模', activeMenu: '/system/fromModel/index' }
       },
@@ -243,8 +243,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'user/:roleId(\\d+)',
-        // component: () => import('@/views/system/role/authUser'),
-        component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+        component: () => import('@/views/system/role/authUser'),
+        // component: (resolve) => require(['@/views/system/role/authUser'], resolve),
         name: 'AuthUser',
         meta: { title: '分配用户', activeMenu: '/system/role' }
       }
@@ -258,8 +258,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:dictId(\\d+)',
-        // component: () => import('@/views/system/dict/data'),
-        component: (resolve) => require(['@/views/system/dict/data'], resolve),
+        component: () => import('@/views/system/dict/data'),
+        // component: (resolve) => require(['@/views/system/dict/data'], resolve),
         name: 'Data',
         meta: { title: '字典数据', activeMenu: '/system/dict' }
       }
@@ -274,8 +274,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:dictId(\\d+)',
-        // component: () => import('@/views/system/tenant/dict/data'),
-        component: (resolve) => require(['@/views/system/tenant/dict/data'], resolve),
+        component: () => import('@/views/system/tenant/dict/data'),
+        // component: (resolve) => require(['@/views/system/tenant/dict/data'], resolve),
         name: 'TenantData',
         meta: { title: '字典数据', activeMenu: '/system/tenant/dict' }
       }
@@ -290,8 +290,8 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:jobId(\\d+)',
-        // component: () => import('@/views/monitor/job/log'),
-        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
+        component: () => import('@/views/monitor/job/log'),
+        // component: (resolve) => require(['@/views/monitor/job/log'], resolve),
         name: 'JobLog',
         meta: { title: '调度日志', activeMenu: '/monitor/job' }
       }
@@ -305,7 +305,9 @@ export const dynamicRoutes = [
     children: [
       {
         path: 'index/:tableId(\\d+)',
-        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
+        component: () => import('@/views/tool/gen/editTable'),
+
+        // component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
         name: 'GenEdit',
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }

zkqy-ui/src/store/modules/permission.js

@@ -127,8 +127,8 @@ export const loadView = (view) => {
     return (resolve) => require([`@/views/${view}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
-    // return () => import(`@/views/${view}`)
-    return (resolve) => require([`@/views/${view}`], resolve)
+    return () => import(`@/views/${view}`)
+    // return (resolve) => require([`@/views/${view}`], resolve)
   }
 }