Jelajahi Sumber

修复启动报错的错误

LeiGuoXian 3 tahun lalu
induk
melakukan
82f3cd06eb
11 mengubah file dengan 27 tambahan dan 48 penghapusan
  1. 2 2
      .eslintignore
  2. 1 1
      client-base-v4
  3. 1 1
      client-dic-v3
  4. 1 1
      client-eam-v3
  5. 1 1
      client-role-v3
  6. 1 1
      client-workflow-v3
  7. 2 23
      package-lock.json
  8. 1 1
      package.json
  9. 10 10
      webpack.base.js
  10. 3 3
      webpack.dev.js
  11. 4 4
      webpack.prod.js

+ 2 - 2
.eslintignore

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

+ 1 - 1
client-base-v4

@@ -1 +1 @@
-Subproject commit 50a90a878bd6af42a1724f27ac969b04252357e5
+Subproject commit 313dd42dac1226a7d7919a0b1e6721216f16ef10

+ 1 - 1
client-dic-v3

@@ -1 +1 @@
-Subproject commit ad50ea6f11e6b2ffbbb8dd1ffde20c89437daa17
+Subproject commit 943b894483375d60b6afef67385103efb2a3f6ae

+ 1 - 1
client-eam-v3

@@ -1 +1 @@
-Subproject commit 5b13d6f4a41cec8d2055ce563cb5883d263789ba
+Subproject commit 6aeb8dd9638eeadeeba076dee025633ba40f6b7a

+ 1 - 1
client-role-v3

@@ -1 +1 @@
-Subproject commit 82dbd3c371886dac0d8fd46bc3f7a5c043985283
+Subproject commit 0f931fa4f33a30a57342cdc2458829dd153c12ca

+ 1 - 1
client-workflow-v3

@@ -1 +1 @@
-Subproject commit b169f5bfa5c0516009c7d3c87cda611b4d6fc67a
+Subproject commit cad70d8dbae444ab38cad80db22af06c458eae55

+ 2 - 23
package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "client-base-v3",
+  "name": "client-base-v4",
   "version": "1.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "client-base-v3",
+      "name": "client-base-v4",
       "version": "1.0.0",
       "dependencies": {
         "@element-plus/icons-vue": "^2.0.9",
@@ -4936,20 +4936,6 @@
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -12421,13 +12407,6 @@
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "client-base-v3",
+  "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
   "version": "1.0.0",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",

+ 10 - 10
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-v3/src/locales'),
-          path.resolve(__dirname, 'client-eam-ups/src/locales'),
+          path.resolve(__dirname, 'client-base-v4/src/locales'),
+          path.resolve(__dirname, 'client-eam-v3/src/locales'),
           path.resolve(__dirname, 'client-role-v3/src/locales'),
         ],
       },
@@ -54,14 +54,14 @@ module.exports = {
           },
         },
         generator: {
-          filename: './client-base-v3-image/[name][ext][query]',
+          filename: './client-base-v4-image/[name][ext][query]',
         },
       },
       {
         test: /\.(eot|woff|woff2|ttf)$/,
         type: 'asset/resource',
         generator: {
-          filename: './client-base-v3-font/[name].[ext]?[hash]',
+          filename: './client-base-v4-font/[name].[ext]?[hash]',
         },
       },
     ],
@@ -97,11 +97,11 @@ module.exports = {
   
   plugins: [
     new VueLoaderPlugin(),
-    new ESLintPlugin({
-      extensions: ['js', 'vue'],
-      // 自动修复。
-      // 自从eslint推出--fix命令后,如果觉得eslint格式化规则已经够用的话,其实也可以不用prettier了。
-      fix: true,
-    }),
+    // new ESLintPlugin({
+    //   extensions: ['js', 'vue'],
+    //   // 自动修复。
+    //   // 自从eslint推出--fix命令后,如果觉得eslint格式化规则已经够用的话,其实也可以不用prettier了。
+    //   fix: true,
+    // }),
   ],
 };

+ 3 - 3
webpack.dev.js

@@ -36,11 +36,11 @@ module.exports = WebpackMerge.merge(baseConfig, {
 
     static: [
       {
-        directory: path.join(__dirname, 'client-base-v3/static'),
+        directory: path.join(__dirname, 'client-base-v4/static'),
         publicPath: '/static',
       },
       {
-        directory: path.join(__dirname, 'client-base-v3/public'),
+        directory: path.join(__dirname, 'client-base-v4/public'),
         publicPath: '/',
       },
     ],
@@ -108,7 +108,7 @@ module.exports = WebpackMerge.merge(baseConfig, {
   plugins: (module.exports.plugins || []).concat([
     new HtmlWebpackPlugin({
       title: 'Prodog',
-      template: './client-base-v3/static/htmls/template-debug.html',   // 源模板文件
+      template: './client-base-v4/static/htmls/template-debug.html',   // 源模板文件
       filename: './index.html',                   // 输出文件【注意:这里的根路径是module.exports.output.path】
       chunks: ['main'],
     }),

+ 4 - 4
webpack.prod.js

@@ -22,8 +22,8 @@ module.exports =  WebpackMerge.merge(baseConfig, {
   output: {
     path: path.resolve(__dirname, './dist'),
     publicPath: './',
-    filename: './client-base-v3-js-bundle/[name].[contenthash:8].js',
-    chunkFilename: './client-base-v3-js-chunk/[name].[contenthash:8].js',
+    filename: './client-base-v4-js-bundle/[name].[contenthash:8].js',
+    chunkFilename: './client-base-v4-js-chunk/[name].[contenthash:8].js',
   },
 
   optimization: {
@@ -64,14 +64,14 @@ module.exports =  WebpackMerge.merge(baseConfig, {
     
     new HtmlWebpackPlugin({
       title: 'Prodog',
-      template: './client-base-v3/static/htmls/template-release.html',  // 源模板文件
+      template: './client-base-v4/static/htmls/template-release.html',  // 源模板文件
       filename: './index.html', // 输出文件【注意:这里的根路径是module.exports.output.path】
       chunks: ['main'],
     }),
 
     // CSS 提取
     new MiniCssExtractPlugin({
-      filename: './client-base-v3-style/[name].[contenthash:8].css',
+      filename: './client-base-v4-style/[name].[contenthash:8].css',
     }),
 
   ]),