cloud-web-corejs 1.0.54-dev.73 → 1.0.54-dev.730

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.73",
+  "version": "1.0.54-dev.730",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -16,31 +16,35 @@
     "publishDev": "npm publish --tag dev"
   },
   "dependencies": {
+    "@codemirror/lang-javascript": "^6.1.9",
+    "@formulajs/formulajs": "^4.3.1",
     "@vue/preload-webpack-plugin": "^2.0.0",
-    "@zxing/library": "^0.21.3",
     "axios": "0.18.1",
+    "codemirror": "^6.0.1",
     "concurrent-tasks": "1.0.7",
     "copy-webpack-plugin": "5.1.2",
     "core-js": "^3.8.3",
-    "dayjs": "^1.11.13",
+    "dhtmlx-gantt": "^9.1.1",
+    "dompurify": "^3.3.1",
     "element-ui": "^2.15.14",
+    "esdk-obs-browserjs": "^3.25.6",
+    "exceljs": "^4.4.0",
+    "FileSaver": "^0.10.0",
+    "html2canvas": "^1.4.1",
     "js-base64": "^3.7.7",
     "js-cookie": "2.2.0",
+    "jspdf": "^3.0.1",
     "jsqr": "^1.4.0",
-    "jszip": "^3.10.1",
-    "less": "^4.2.0",
-    "less-loader": "^7.0.1",
     "lodash": "4.17.21",
+    "luckyexcel": "^1.0.1",
     "moment": "2.29.4",
     "node-polyfill-webpack-plugin": "^4.0.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
+    "qiankun": "^2.10.16",
     "qrcode": "^1.5.1",
-    "qrcode-decoder": "^0.3.4",
-    "qrcode-reader": "^1.0.4",
     "qs": "6.10.3",
-    "quagga": "^0.12.1",
-    "sortablejs": "1.8.4",
+    "sortablejs": "^1.8.4",
     "spark-md5": "^3.0.1",
     "swiper": "4.0.7",
     "vue": "2.6.12",
@@ -48,9 +52,8 @@
     "vue-ls": "^4.2.0",
     "vue-router": "3.0.2",
     "vuex": "3.1.0",
-    "vxe-table": "^3.7.6",
-    "xlsx": "0.14.1",
-    "zxing": "^0.1.2"
+    "vxe-table": "3.5.9",
+    "xlsx": "^0.14.1"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",
@@ -119,11 +122,13 @@
     "src/components/advancedSearchDialog",
     "src/components/baseAlert",
     "src/components/baseAttachment",
+    "src/components/baseArea",
     "src/components/baseInputBatch",
     "src/components/baseInputExport",
     "src/components/baseInputNumber",
     "src/components/baseInputPrint",
     "src/components/baseTabs",
+    "src/components/base-textarea",
     "src/components/cnPrint",
     "src/components/code-editor",
     "src/components/confirmDialog",
@@ -150,6 +155,8 @@
     "src/components/table",
     "src/components/tempStorage",
     "src/components/Tinymce",
+    "src/components/luckysheet",
+    "src/components/obsUpload",
     "src/components/VabUpload",
     "src/components/vb-tabs",
     "src/components/video",
@@ -169,10 +176,12 @@
     "src/store",
     "src/resources/js",
     "src/lang/index.js",
+    "src/lang/locale/en/login.js",
+    "src/lang/locale/zh/login.js",
     "src/layout",
     "src/filters",
     "src/router",
-    "permission.js",
+    "src/permission.js",
     "src/index.js",
     "src/App.vue"
   ],

package/src/App.vue

@@ -1,67 +1,63 @@
 <template>
-  <div id="app" :class="{mobileApp:isMobile}">
-    <router-view/>
+  <div id="app" :class="{ mobileApp: isMobile }">
+    <router-view />
   </div>
 </template>
 
 <script>
-import settting from '@/settings.js';
+import settting from "@/settings.js";
 
 export default {
-  name: 'App',
+  name: "App",
   data() {
     let isMobile = this.getIsMobile();
     return {
-      isMobile: isMobile
-    }
+      isMobile: isMobile,
+    };
   },
   created() {
-    if (process.env.NODE_ENV !== "development") {
+    if (settting.reflushRouter!== true && process.env.NODE_ENV !== "development") {
       window.addEventListener(
-        'hashchange',
-        event => {
-          var currentPath = window.location.hash.slice(1).split('?')[0]; // 获取输入的路由
-          if (currentPath != '/404' && currentPath != '/login' && this.$router.path !== currentPath) {
-            this.$store.dispatch('tagsView/delAllViews').then(visitedViews => {
-              this.$router.replace({path: '/redirect' + '/home'});
+        "hashchange",
+        (event) => {
+          var currentPath = window.location.hash.slice(1).split("?")[0]; // 获取输入的路由
+          if (
+            currentPath != "/404" &&
+            currentPath != "/login" &&
+            this.$router.path !== currentPath
+          ) {
+            this.$store.dispatch("tagsView/delAllViews").then((visitedViews) => {
+              this.$router.replace({ path: "/redirect" + "/home" });
             });
           }
         },
         false
       );
 
-      window.addEventListener('beforeunload', async event => {
+      window.addEventListener("beforeunload", async (event) => {
         // 如果按下的键是 F5，则执行相应的操作
-        var currentPath = window.location.hash.slice(1).split('?')[0]; // 获取输入的路由
-        if (currentPath != '/home' && currentPath != '/' && currentPath != '/login' && currentPath != '/404') {
-          sessionStorage.setItem('toHome', '1');
+        var currentPath = window.location.hash.slice(1).split("?")[0]; // 获取输入的路由
+        if (
+          currentPath != "/home" &&
+          currentPath != "/" &&
+          currentPath != "/login" &&
+          currentPath != "/404"
+        ) {
+          sessionStorage.setItem("toHome", "1");
         }
       });
     }
 
-    window.addEventListener('load', async event => {
-      // 滚动事件变为 scroll
-      let title = settting.title;
-      if (location.host.indexOf('pcp.sc.5mall.com') == 0 || location.host.indexOf('pipuat.bears.com.cn') == 0) {
-        title = '产品创新平台PIP';
-      } else if (location.host.indexOf('chigo.sc.5mall.com') == 0) {
-        title = '志高营销平台';
-      } else if (location.host.indexOf('ngerp.sc.5mall.com') == 0) {
-        title = 'NG ERP';
-      }
-      document.title = title;
-    });
-
-  },
-  mounted() {
+    document.title = settting.title;
   },
+  mounted() {},
   methods: {
     getIsMobile() {
       const userAgent = navigator.userAgent;
       const mobileRegex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i;
       return mobileRegex.test(userAgent);
-    }
-  }
+    },
+  },
 };
 </script>
 <style>

package/src/api/user.js

@@ -1,91 +1,136 @@
-import request from '@base/utils/request'
+import request from "@base/utils/request";
 
 export function loginYx(option) {
   return request({
-    url: USER_PREFIX + '/auth/login',
-    method: 'post',
-    ...option
-  })
+    url: USER_PREFIX + "/auth/login",
+    method: "post",
+    ...option,
+  });
 }
 
 export function getInfo(option) {
   return request({
-    url: USER_PREFIX + '/user/currentUser',
-    method: 'post',
-    ...option
-  })
+    url: USER_PREFIX + "/user/currentUser",
+    method: "post",
+    ...option,
+  });
 }
 
 export function logout(option) {
   return request({
-    url: USER_PREFIX + '/auth/logout',
-    method: 'post',
-    ...option
-  })
+    url: USER_PREFIX + "/auth/logout",
+    method: "post",
+    ...option,
+  });
 }
 
 export function saveAccessMenuLog(option) {
   return request({
-    url: USER_PREFIX + '/access_log/saveAccessMenuLog',
-    method: 'post',
-    ...option
-  })
+    url: USER_PREFIX + "/access_log/saveAccessMenuLog",
+    method: "post",
+    ...option,
+  });
+}
+
+export function saveUserLog(option) {
+  let data = {
+    logType: "operationLog",
+    ...option.data,
+  };
+  return request({
+    url: USER_PREFIX + "/user_log/save",
+    method: "post",
+    ...option,
+    data,
+  });
 }
 
 export function getLoginTp(duration, option) {
   return request({
-    url: USER_PREFIX + '/thirdparty_auth/getTp',
-    method: 'post',
+    url: USER_PREFIX + "/thirdparty_auth/getTp",
+    method: "post",
     isLoading: true,
-    data: {duration: duration},
-    ...option
-  })
+    data: { duration: duration },
+    ...option,
+  });
 }
 
 export function loginByTp(tp, option) {
   return request({
-    url: USER_PREFIX + '/thirdparty_auth/login',
-    method: 'post',
+    url: USER_PREFIX + "/thirdparty_auth/login",
+    method: "post",
     isLoading: true,
     useToken: false,
-    data: {tp: tp},
-    ...option
-  })
+    data: { tp: tp },
+    ...option,
+  });
 }
 
 export function getParameterVauleByCode(option) {
   //初始化外部用户编码
   return request({
-    url: USER_PREFIX + '/system_parameter/getByCode',
-    method: 'post',
-    ...option
+    url: USER_PREFIX + "/system_parameter/getByCode",
+    method: "post",
+    ...option,
   });
 }
 
 export function languageSettingListPage(option) {
   //获取语种
   return request({
-    url: USER_PREFIX + '/language_setting/listPage',
-    method: 'post',
+    url: USER_PREFIX + "/language_setting/listPage",
+    method: "post",
     data: {
-      enabled: true
+      enabled: true,
     },
-    ...option
+    ...option,
   });
 }
 
 export function getBdEnv(option) {
   return request({
     url: USER_PREFIX + `/form_develop/getBdEnv`,
-    method: 'post',
-    ...option
-  })
+    method: "post",
+    ...option,
+  });
 }
 
 export function getBdFlag(option) {
   return request({
     url: USER_PREFIX + `/form_develop/getBdFlag`,
-    method: 'post',
-    ...option
-  })
+    method: "post",
+    ...option,
+  });
+}
+
+export function getFileServerInfo(option) {
+  return request({
+    url: USER_PREFIX + "/logic_param/getFileServerInfo",
+    method: "post",
+    ...option,
+  });
+}
+
+export function getLoginConfig(option) {
+  return request({
+    url: USER_PREFIX + "/login_page/readData",
+    method: "post",
+    ...option,
+  });
+}
+
+export function getLogicParamValue(option) {
+  return request({
+    url: USER_PREFIX + "/logic_param/getParamValue",
+    method: "post",
+    ...option,
+  });
+}
+
+export function getIdmLoginUrl(option) {
+  return request({
+    url: USER_PREFIX + "/auth/idmLoginUrl",
+    method: "post",
+    ...option,
+  });
 }

package/src/components/Qrcode/fileParse.vue

@@ -174,7 +174,6 @@ export default {
       // 获取上传的第一个文件
 
       /* const file = event.target.files[0];
-      debugger
       let a = 2; */
 
       // 如果文件存在，则进行处理