From c035ffc6cd17acf46eb8bd90fc0578803227ffb0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 07 六月 2024 15:00:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dist_electron/package.json |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/dist_electron/package.json b/dist_electron/package.json
index a29f166..5cc223d 100644
--- a/dist_electron/package.json
+++ b/dist_electron/package.json
@@ -13,13 +13,23 @@
     "build:prod": "vue-cli-service build --mode prod",
     "build:test": "vue-cli-service build --mode test",
     "electron:build": "vue-cli-service electron:build",
-    "electron:serve": "vue-cli-service electron:serve",
+    "electron:serve": "vue-cli-service electron:serve" ,
     "postinstall": "electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps"
   },
   "main": "background.js",
   "dependencies": {
+    "@riophae/vue-treeselect": "^0.4.0",
+    "@smallwei/avue": "2.8.23",
+    "@sscfaith/avue-form-design": "1.4.8",
+    "@wangeditor/editor": "^5.1.0",
+    "@wangeditor/editor-for-vue": "^1.0.1",
+    "animate.css": "^4.1.1",
+    "avue-plugin-ueditor": "^0.0.6",
     "axios": "^0.19.2",
+    "babel-polyfill": "^6.26.0",
+    "classlist-polyfill": "^1.2.0",
+    "crypto-js": "^3.1.9-1",
     "clipboard": "^2.0.11",
     "codemirror": "^5.65.16",
     "core-js": "^3.37.1",
@@ -28,16 +38,24 @@
     "echarts": "^5.5.0",
     "element-ui": "^2.15.14",
     "file-saver": "^2.0.5",
+    "fs": "^0.0.1-security",
     "fuse.js": "^6.6.2",
     "husky": "^7.0.4",
+    "mockjs": "^1.1.0",
     "js-cookie": "2.2.0",
     "jszip": "^3.10.1",
+    "node-sass": "^6.0.1",
     "normalize.css": "8.0.1",
     "nprogress": "0.2.0",
+    "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.2",
+    "rebuild": "^0.1.2",
+    "sass-loader": "^10.0.1",
     "screenfull": "^5.2.0",
     "script-loader": "^0.7.2",
+    "supvue-ui": "^0.2.0",
     "vue": "^2.7.16",
+    "vue-axios": "^2.1.4",
     "vue-count-to": "^1.0.13",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
@@ -45,16 +63,11 @@
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.5.19",
-    "@vue/cli-plugin-eslint": "^4.5.19",
     "@vue/cli-plugin-router": "^4.5.19",
     "@vue/cli-plugin-vuex": "^4.5.19",
     "@vue/cli-service": "^4.5.19",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "babel-eslint": "^10.1.0",
     "electron": "^13.0.0",
     "electron-devtools-installer": "^3.1.0",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.2.3",
     "node-sass": "^6.0.1",
     "sass-loader": "^10.5.2",
     "svg-sprite-loader": "4.1.6",
@@ -74,7 +87,6 @@
   "license": "AGPL-3.0",
   "lint-staged": {
     "src/**/*.{js,vue}": [
-      "eslint --fix",
       "git add"
     ]
   },

--
Gitblit v1.8.0