1.0.0,eam\wms\trace\base去除掉bootstrap，使用antd重构

.eslintignore

@@ -1,4 +1,4 @@
 /Dictionary/*
 /node_modules/*
-/client-base-v4/.eslintrc.js
-/client-base-v4/.eslintignore
+/client-base-v5/.eslintrc.js
+/client-base-v5/.eslintignore

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "prodog-pc-client",
+  "name": "pc-client-v5",
   "description": "Leanwo Prodog Client",
-  "version": "1.2.98",
+  "version": "1.0.0",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry=http://wuzhixin.vip:4873 -force",
@@ -17,18 +17,18 @@
     "ant-design-vue": "^4.2.1",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
-    "client-base-v4": "^4.1.61",
+    "client-base-v5": "1.0.1",
     "client-dic-v3": "^3.0.52",
-    "client-eam-v3": "^3.0.98",
+    "client-eam-v5": "1.0.0",
     "client-role-v3": "^3.0.25",
     "client-sensor-v3": "^1.0.4",
-    "client-wms-v3": "^3.1.4",
+    "client-wms-v5": "1.0.0",
     "client-finance-v3": "^0.0.4",
     "dayjs": "^1.11.6",
     "dingtalk-jsapi": "^2.8.33",
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.21",
-    "pc-component-v3": "^1.1.14",
+    "pc-component-v3": "2.0.0",
     "qrcode": "^1.5.3",
     "select2": "^4.0.13",
     "select2-bootstrap-theme": "^0.1.0-beta.10",

public/index-debug.html

@@ -14,12 +14,14 @@
 	<title>prodog</title>
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/font-awesome/css/font-awesome.min.css">
-	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap/dist/css/bootstrap.css">
+	<!-- <link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap/dist/css/bootstrap.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap/dist/css//bootstrap-theme.min.css">
-	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap3-dialog/dist/css/bootstrap-dialog.css">
+	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap3-dialog/dist/css/bootstrap-dialog.css"> -->
 	
 	<!-- <link rel="stylesheet" type="text/css" href="/static/dhtmlxgantt/dhtmlxgantt.css"> -->
-	<link rel="stylesheet" type="text/css" href="/static/bootstrap-treeview/bootstrap-treeview.css">
+	<!-- <link rel="stylesheet" type="text/css" href="/static/bootstrap-treeview/bootstrap-treeview.css"> -->
+	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/trumbowyg/css/trumbowyg.min.css">
+
 
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/cropper/dist/cropper.css">
@@ -37,8 +39,8 @@
 
 	
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/cropper/dist/cropper.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap/dist/js/bootstrap.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap3-dialog/dist/js/bootstrap-dialog.js"></script>
+	<!-- <script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap/dist/js/bootstrap.js"></script>
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap3-dialog/dist/js/bootstrap-dialog.js"></script> -->
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/colResizable/colResizable-1.6.js"></script>
 
 	<script nonce="*NONCE_TOKEN*" defer="defer" src="/static/bootstrap-treeview/bootstrap-treeview.js"></script>
@@ -49,7 +51,12 @@
 
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/reconnecting-websocket/reconnecting-websocket.js"></script>
 	
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="../static/plugin/dingtalk-jsapi/2.10.3/dingtalk.open.js"></script>
+	<!-- <script nonce="*NONCE_TOKEN*" type="text/javascript" src="../static/plugin/dingtalk-jsapi/2.10.3/dingtalk.open.js"></script> -->
+
+	<!-- 富文本编辑器 -->
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.min.js"></script> 
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.upload.min.js"></script>
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.zh_cn.min.js"></script>
 
 	<!--VueJS has 2 different versions: the full version and the runtime version. 'unsafe-eval' is only needed for the full version of VueJS; the runtime version doesn't need it. 
 	The runtime-only build is fully CSP-compliant. When using the runtime-only build with Webpack + vue-loader or Browserify + vueify, your templates will be precompiled into render functions which work perfectly in CSP environments. -->
@@ -61,8 +68,9 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/axios/dist/axios.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/sortablejs/Sortable.js"></script>
 	
-	<link rel="stylesheet" type="text/css" href="/static/summernote/dist/summernote.min.css">
-	
+	<!-- <link rel="stylesheet" type="text/css" href="/static/summernote/dist/summernote.min.css"> -->
+	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="https://unpkg.com/@wangeditor/editor@latest/dist/css/style.css">
+
 	
 
 	
@@ -79,8 +87,8 @@
 	<script defer="defer" src="/static/echarts/dist/echarts.min.js"></script>
 	
 
-	<script defer="defer" type="text/javascript" src="/static/summernote/dist/summernote.min.js"></script>
-	<script defer="defer" type="text/javascript" src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script>
+	<!-- <script defer="defer" type="text/javascript" src="/static/summernote/dist/summernote.min.js"></script>
+	<script defer="defer" type="text/javascript" src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script> -->
 
 	<!-- <script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
 	<script defer="defer" type="text/javascript" src="/static/dhtmlxgantt/locale/locale_cn.js"></script>

public/index-release.html

@@ -14,12 +14,14 @@
 	<title>prodog</title>
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/font-awesome/css/font-awesome.min.css">
-	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap/dist/css/bootstrap.min.css">
+	<!-- <link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap/dist/css/bootstrap.min.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap/dist/css//bootstrap-theme.min.css">
-	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css">
+	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css"> -->
 	
 	<!-- <link rel="stylesheet" type="text/css" href="/static/dhtmlxgantt/dhtmlxgantt.css"> -->
-	<link rel="stylesheet" type="text/css" href="/static/bootstrap-treeview/bootstrap-treeview.css">
+	<!-- <link rel="stylesheet" type="text/css" href="/static/bootstrap-treeview/bootstrap-treeview.css"> -->
+
+	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/trumbowyg/css/trumbowyg.min.css">
 
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/cropper/dist/cropper.css">
 	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="/static/colResizable/colResizable-1.6.css">
@@ -35,8 +37,8 @@
 
 	
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/cropper/dist/cropper.min.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap/dist/js/bootstrap.min.js"></script>
-	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js"></script>
+	<!-- <script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap/dist/js/bootstrap.min.js"></script>
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js"></script> -->
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/colResizable/colResizable-1.6.js"></script>
 
 	<script defer="defer" src="/static/bootstrap-treeview/bootstrap-treeview.js"></script>
@@ -49,6 +51,12 @@
 	
 	<!-- <script nonce="*NONCE_TOKEN*" type="text/javascript" src="../static/plugin/dingtalk-jsapi/2.10.3/dingtalk.open.js"></script> -->
 
+	<!-- 富文本编辑器 -->
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.min.js"></script> 
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.upload.min.js"></script>
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.zh_cn.min.js"></script>
+
+
 	<!--VueJS has 2 different versions: the full version and the runtime version. 'unsafe-eval' is only needed for the full version of VueJS; the runtime version doesn't need it. 
 	The runtime-only build is fully CSP-compliant. When using the runtime-only build with Webpack + vue-loader or Browserify + vueify, your templates will be precompiled into render functions which work perfectly in CSP environments. -->
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/vue/dist/vue.global.prod.js"></script>
@@ -59,7 +67,7 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/axios/dist/axios.min.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/sortablejs/Sortable.min.js"></script>
 	
-	<link rel="stylesheet" type="text/css" href="/static/summernote/dist/summernote.min.css">
+	<!-- <link rel="stylesheet" type="text/css" href="/static/summernote/dist/summernote.min.css"> -->
 	
 	<script nonce="*NONCE_TOKEN*"  type="text/javascript">
 		var nonce_token = "*NONCE_TOKEN*";
@@ -75,8 +83,8 @@
 	<!-- <script src="../static/js/fullscreen-api.js"></script> -->
 	<!-- <script src="../static/js/problem-feedback-api.js"></script> -->
 	
-	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/summernote/dist/summernote.min.js"></script>
-	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script>
+	<!-- <script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/summernote/dist/summernote.min.js"></script>
+	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/summernote/dist/lang/summernote-zh-CN.min.js"></script> -->
 
 	<!-- <script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/dhtmlxgantt.js"></script>
 	<script defer="defer" nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/dhtmlxgantt/locale/locale_cn.js"></script>

src/lang.js

@@ -5,14 +5,14 @@ import merge from './merge.js';
 import {
     langZhCn as langZhCn0,
     langEnUs as langEnUs0,
-} from 'client-base-v4/dist/client-base-v4.js';
+} from 'client-base-v5/dist/client-base-v5.js';
 
 console.log(langZhCn0);
 
 import {
     langZhCn as langZhCn1,
     langEnUs as langEnUs1
-} from 'client-eam-v3/dist/client-eam-v3.js';
+} from 'client-eam-v5/dist/client-eam-v5.js';
 
 console.log(langZhCn1);
 

src/main.js

@@ -40,15 +40,15 @@ window.dd = dd;
 import 'jquery';
 
 
-import 'client-base-v4/dist/client-base-v4.css';
+import 'client-base-v5/dist/client-base-v5.css';
 
 
 import 'client-role-v3/dist/client-role-v3.css';
 // import 'client-dictionary-v3/dist/client-dictionary-v3.css';
 import 'client-dic-v3/dist/client-dic-v3.css';
 
-import 'client-eam-v3/dist/client-eam-v3.css';
-import 'client-wms-v3/dist/client-wms-v3.css';
+import 'client-eam-v5/dist/client-eam-v5.css';
+import 'client-wms-v5/dist/client-wms-v5.css';
 import 'client-sensor-v3/dist/client-sensor-v3.css';
 import 'client-finance-v3/dist/client-finance-v3.css';
 
@@ -56,10 +56,11 @@ import { store } from './store.js';
 import { i18n } from './lang.js';
 import { router } from './routes/index.js';
 
-import { App, Common, PushMessage, CurdWindowModal, AuthImage, WorkflowUserDefine, ApproveComment, HistoryApproveComment } from 'client-base-v4/dist/client-base-v4.js';
-import { Notify } from 'pc-component-v3/dist/pc-component-v3.js';
+import { App, Common, PushMessage, CurdWindowModal, AuthImage, WorkflowUserDefine, ApproveComment, HistoryApproveComment } from 'client-base-v5/dist/client-base-v5.js';
+import { Notify, Uuid } from 'pc-component-v3/dist/pc-component-v3.js';
 window.Common = Common;
 window.Notify = Notify;
+window.Uuid = Uuid;
 
 
 import * as AntDesignIconsVue from '@ant-design/icons-vue';

src/routes/index.js

@@ -1,11 +1,11 @@
 import { createRouter, createWebHashHistory } from 'vue-router';
 
-import routes0 from './route-base-v4.js';
+import routes0 from './route-base-v5.js';
 import routes1 from './route-role-v3.js';
 // import routes2 from './route-dictionary-v3.js';
 import routes3 from './route-dic-v3.js';
-import routes5 from './route-eam-v3.js';
-import routes6 from './route-wms-v3.js';
+import routes5 from './route-eam-v5.js';
+import routes6 from './route-wms-v5.js';
 // import routes7 from './route-trace-v3.js';
 import routes8 from './route-sensor-v3.js';
 import routes9 from './route-finance-v3.js';

src/routes/route-base-v4.js → src/routes/route-base-v5.js

@@ -69,7 +69,7 @@ import {
     ViewEdit,
     LoginGraphic,
     LoginNode,
-} from 'client-base-v4/dist/client-base-v4.js';
+} from 'client-base-v5/dist/client-base-v5.js';
 
 
 const router = [

src/routes/route-eam-v3.js → src/routes/route-eam-v5.js

@@ -46,7 +46,7 @@ import {
     DepreciationIndex,
     AssetManagerDepreciation,
     AccountingSubject
-} from 'client-eam-v3/dist/client-eam-v3.js';
+} from 'client-eam-v5/dist/client-eam-v5.js';
 
 
 

src/routes/route-wms-v3.js → src/routes/route-wms-v5.js

@@ -49,7 +49,7 @@ import {
   LightSetting,
   LightStockInOrOut,
   ShelfBoard,
-} from 'client-wms-v3/dist/client-wms-v3.js';
+} from 'client-wms-v5/dist/client-wms-v5.js';
 
 
 

src/store.js

@@ -1,6 +1,6 @@
 
 import { createStore } from 'vuex';
-import { downloadStore } from 'client-base-v4/dist/client-base-v4.js';
+import { downloadStore } from 'client-base-v5/dist/client-base-v5.js';
 
 const store = createStore({
     modules: {

webpack.base.js

@@ -39,8 +39,8 @@ module.exports = {
         loader: '@intlify/vue-i18n-loader',
         include: [ // Use `Rule.include` to specify the files of locale messages to be pre-compiled
           //path.resolve(__dirname, 'src/locales'),
-          path.resolve(__dirname, 'client-base-v4/src/locales'),
-          path.resolve(__dirname, 'client-eam-v3/src/locales'),
+          path.resolve(__dirname, 'client-base-v5/src/locales'),
+          path.resolve(__dirname, 'client-eam-v5/src/locales'),
           path.resolve(__dirname, 'client-role-v3/src/locales'),
         ],
       },
@@ -54,14 +54,14 @@ module.exports = {
           },
         },
         generator: {
-          filename: './client-v4-image/[name][ext][query]',
+          filename: './client-v5-image/[name][ext][query]',
         },
       },
       {
         test: /\.(eot|woff|woff2|ttf)$/,
         type: 'asset/resource',
         generator: {
-          filename: './client-v4-font/[name].[ext]?[hash]',
+          filename: './client-v5-font/[name].[ext]?[hash]',
         },
       },
     ],

webpack.dev.js

@@ -36,11 +36,11 @@ module.exports = WebpackMerge.merge(baseConfig, {
 
     static: [
       {
-        directory: path.join(__dirname, 'client-base-v4/static'),
+        directory: path.join(__dirname, 'client-base-v5/static'),
         publicPath: '/static',
       },
       {
-        directory: path.join(__dirname, 'client-base-v4/public'),
+        directory: path.join(__dirname, 'client-base-v5/public'),
         publicPath: '/',
       },
     ],
@@ -60,71 +60,71 @@ module.exports = WebpackMerge.merge(baseConfig, {
     
     proxy: {
       '/api': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/static': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/content': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/dashboard': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/assets': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/mock': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/authApi': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/Dictionary': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/Files': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/WebSocket': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: true,
         changeOrigin: true,
       },
       '/TrainVideo': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: true,
         changeOrigin: true,
       },
       '/gateway-api': {
-        target: 'http://127.0.0.1:10023/',
+        target: 'http://192.168.1.8:10026/',
         ws: true,
         changeOrigin: true,
         secure:true,

webpack.prod.js

@@ -22,8 +22,8 @@ module.exports =  WebpackMerge.merge(baseConfig, {
   output: {
     path: path.resolve(__dirname, './dist'),
     publicPath: './',
-    filename: './client-v4-js-bundle/[name].[contenthash:8].js',
-    chunkFilename: './client-v4-js-chunk/[name].[contenthash:8].js',
+    filename: './client-v5-js-bundle/[name].[contenthash:8].js',
+    chunkFilename: './client-v5-js-chunk/[name].[contenthash:8].js',
   },
 
   optimization: {
@@ -71,7 +71,7 @@ module.exports =  WebpackMerge.merge(baseConfig, {
 
     // CSS 提取
     new MiniCssExtractPlugin({
-      filename: './client-v4-style/[name].[contenthash:8].css',
+      filename: './client-v5-style/[name].[contenthash:8].css',
     }),
     new CopyPlugin({
       patterns: [