Merge branch 'master' into master

packages/mall-cook-platform-electron/package.json

@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
-    "axios-shortcut": "~0.0.1",
+    "axios-shortcut": "^0.1.3",
     "compression-webpack-plugin": "5.0.1",
     "core-js": "^3.6.5",
     "cross-env": "^7.0.3",
@@ -58,17 +58,15 @@
     "electron-window-state": "^5.0.3",
     "element-ui": "^2.15.13",
     "element-verify": "^0.2.3",
-    "imgpond": "~0.6.0",
+    "faim": "^0.6.2",
     "jr-qrcode": "^1.1.4",
     "js-cookie": "^3.0.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
     "mammoth": "^1.4.21",
-    "minimce": "^0.8.3",
     "moment": "^2.29.4",
-    "pic-viewer": "~0.5.0",
     "postcss-plugin-px2rem": "^0.8.1",
-    "tinymce": "^6.3.2",
+    "tinymce": "^6.8.2",
     "vue": "^2.7.8",
     "vue-json-viewer": "^2.2.19",
     "vue-router": "^3.5.2",
@@ -87,7 +85,6 @@
     "sass-loader": "^13.2.0",
     "typescript": "^4.6.4",
     "vite": "^3.2.3",
-    "vite-plugin-externals": "^0.6.2",
     "vite-plugin-vue2": "^2.0.3",
     "vue-tsc": "^1.0.9"
   }

packages/mall-cook-platform-electron/src/main.js

@@ -39,7 +39,6 @@ import '@/scss/element/index.css'
 import draggable from 'vuedraggable'
 import ElementVerify from 'element-verify'
 import _ from 'lodash'
-import global from '@/config/global'
 
 import '@/utils/schemaRegister.js'
 
@@ -68,39 +67,30 @@ for (let k in axiosShortcut) {
 }
 
 /**
- * 图片预览
+ * String.prototype.replaceAll polyfill
  */
-import 'pic-viewer/dist/style.css'
-import PicViewer from 'pic-viewer'
-Vue.use(PicViewer)
+import 'core-js/es/string/replace-all'
+
+/**
+ * 表单对话框（目前仅用于富文本的插件）
+ */
+import FaFormDialog from 'faim/dist/components/FormDialog/index.vue'
+import globalConfigForFaFormDialog from '@/faim/FormDialog/globalConfig'
+Vue.use(FaFormDialog, globalConfigForFaFormDialog)
 
 /**
  * 图片上传
  */
-import 'imgpond/dist/style.css'
-import Imgpond from 'imgpond'
-
-Vue.use(Imgpond, {
-  upload: (file, context) => new Promise((resolve, reject) => {
-    Vue.prototype.$POST.upload(global.baseApi + 'upload', ({
-      file,
-      ...context.$attrs.requestParam,
-    }), {
-      baseURL: '',
-      timeout: 20000,
-    }).then(res => {
-      resolve(res.data)
-    }).catch(e => {
-      reject(e)
-    })
-  }),
-})
+import FaImageUpload from 'faim/dist/components/ImageUpload/index.vue'
+import globalConfigForFaImageUpload from '@/faim/ImageUpload/globalConfig'
+Vue.use(FaImageUpload, globalConfigForFaImageUpload)
 
 /**
  * 富文本
  */
-import useMiniMCE from '@/components/MiniMCE'
-useMiniMCE()
+import FaRichText from 'faim/dist/components/RichText/index'
+import globalConfigForFaRichText from '@/faim/RichText/globalConfig'
+Vue.use(FaRichText, globalConfigForFaRichText)
 
 Vue.prototype.$jump = jump
 Vue.prototype.$getWrapStyle = getWrapStyle