cloud-web-corejs 1.0.276 → 1.0.278

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.276",
+  "version": "1.0.278",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -16,73 +16,79 @@
     "publishDev": "npm publish --tag dev"
   },
   "dependencies": {
+    "@claviska/jquery-minicolors": "2.3.6",
     "@codemirror/lang-javascript": "^6.1.9",
+    "@codemirror/state": "^6.5.4",
+    "@codemirror/view": "^6.39.13",
     "@formulajs/formulajs": "^4.3.1",
-    "@vue/preload-webpack-plugin": "^2.0.0",
+    "@vue/composition-api": "1.0.5",
+    "ace-builds": "1.11.0",
     "axios": "0.18.1",
+    "canvg": "3.0.10",
+    "clipboard": "2.0.8",
     "codemirror": "^6.0.1",
     "concurrent-tasks": "1.0.7",
-    "copy-webpack-plugin": "5.1.2",
     "core-js": "^3.8.3",
-    "dayjs": "^1.11.13",
+    "crypto-js": "^4.2.0",
     "dhtmlx-gantt": "^9.1.1",
+    "dompurify": "^3.3.1",
+    "echarts": "5.1.2",
     "element-ui": "^2.15.14",
     "esdk-obs-browserjs": "^3.25.6",
     "exceljs": "^4.4.0",
-    "FileSaver": "^0.10.0",
+    "file-saver": "2.0.5",
     "html2canvas": "^1.4.1",
+    "jquery": "3.6.0",
     "js-base64": "^3.7.7",
     "js-cookie": "2.2.0",
+    "jsbarcode": "3.11.5",
     "jspdf": "^3.0.1",
     "jsqr": "^1.4.0",
     "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",
+    "nzh": "1.0.8",
     "qiankun": "^2.10.16",
     "qrcode": "^1.5.1",
     "qs": "6.10.3",
-    "sortablejs": "1.8.4",
+    "socket.io-client": "4.5.1",
+    "sortablejs": "^1.8.4",
     "spark-md5": "^3.0.1",
     "swiper": "4.0.7",
     "vue": "2.6.12",
+    "vue-echarts": "6.0.0",
     "vue-i18n": "^8.22.2",
     "vue-ls": "^4.2.0",
     "vue-router": "3.0.2",
+    "vuedraggable": "2.24.3",
     "vuex": "3.1.0",
     "vxe-table": "3.5.9",
+    "xe-utils": "3.5.2",
     "xlsx": "^0.14.1"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@claviska/jquery-minicolors": "2.3.6",
     "@vue/cli-plugin-babel": "~5.0.0",
     "@vue/cli-plugin-eslint": "~5.0.0",
+    "@vue/cli-plugin-unit-jest": "~5.0.9",
     "@vue/cli-service": "~5.0.0",
-    "@vue/composition-api": "1.0.5",
-    "ace-builds": "1.11.0",
+    "@vue/test-utils": "^1.3.6",
+    "@vue/vue2-jest": "^27.0.0",
     "autoprefixer": "9.5.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
-    "canvg": "3.0.10",
     "chalk": "2.4.2",
-    "clipboard": "2.0.8",
     "compression-webpack-plugin": "5.0.2",
     "connect": "3.6.6",
-    "crypto-js": "^4.2.0",
-    "echarts": "5.1.2",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
-    "file-saver": "2.0.5",
     "html-webpack-plugin": "~5.0.0",
     "husky": "1.3.1",
-    "jquery": "3.6.0",
-    "jsbarcode": "3.11.5",
     "lint-staged": "8.1.5",
-    "nzh": "1.0.8",
+    "node-polyfill-webpack-plugin": "^4.0.0",
     "plop": "2.3.0",
     "postcss": "^8.2.8",
     "postcss-loader": "^4.0.4",
@@ -90,15 +96,11 @@
     "sass": "^1.32.7",
     "sass-loader": "^12.0.0",
     "serve-static": "1.13.2",
-    "socket.io-client": "4.5.1",
     "speed-measure-webpack-plugin": "^1.5.0",
     "svg-sprite-loader": "^6.0.11",
     "svgo": "1.2.0",
-    "vue-echarts": "6.0.0",
     "vue-template-compiler": "2.6.12",
-    "vuedraggable": "2.24.3",
-    "webpack-bundle-analyzer": "^4.9.1",
-    "xe-utils": "3.5.2"
+    "webpack-bundle-analyzer": "^4.9.1"
   },
   "eslintConfig": {
     "root": true,
@@ -121,8 +123,8 @@
   "files": [
     "src/components/advancedSearchDialog",
     "src/components/baseAlert",
-    "src/components/baseArea",
     "src/components/baseAttachment",
+    "src/components/baseArea",
     "src/components/baseInputBatch",
     "src/components/baseInputExport",
     "src/components/baseInputNumber",
@@ -142,6 +144,7 @@
     "src/components/jdPrint",
     "src/components/jsonImport",
     "src/components/langImport",
+    "src/components/micro-view-host",
     "src/components/mobile",
     "src/components/onlineTalk",
     "src/components/oplogTable",
@@ -165,6 +168,8 @@
     "src/components/xform",
     "src/components/xhsPrint",
     "src/components/langTag",
+    "src/components/formDialog",
+    "src/components/formDrawer",
     "src/api",
     "src/views/bd",
     "src/views/support",
@@ -183,6 +188,7 @@
     "src/router",
     "src/permission.js",
     "src/index.js",
+    "src/public-path.js",
     "src/microRouter",
     "src/App.vue"
   ],

package/src/App.vue

@@ -1,71 +1,73 @@
-<template>
-  <div id="app" :class="{ mobileApp: isMobile }">
-    <router-view />
-  </div>
-</template>
-
-<script>
-import settting from "@/settings.js";
-
-export default {
-  name: "App",
-  data() {
-    let isMobile = this.getIsMobile();
-    return {
-      isMobile: isMobile,
-    };
-  },
-  created() {
-    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" });
-            });
-          }
-        },
-        false
-      );
-
-      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");
-        }
-      });
-    }
-
-    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>
-.inner-dialog .el-dialog__wrapper {
-  top: 0;
-}
-
-/* #app .el-submenu .el-menu {
-  height: 500px;
-} */
-</style>
+<template>
+  <div id="app" :class="{ mobileApp: isMobile }">
+    <router-view />
+  </div>
+</template>
+
+<script>
+import settting from "@/settings.js";
+
+export default {
+  name: "App",
+  data() {
+    let isMobile = this.getIsMobile();
+    return {
+      isMobile: isMobile,
+    };
+  },
+  created() {
+    // qiankun 子应用模式跳过：hashchange 事件在真实 window 派发，子应用的处理器会
+    // 干扰主应用导航；sessionStorage.toHome 同域共享，子应用写入会污染主应用
+    if (settting.reflushRouter!== true && process.env.NODE_ENV !== "development" && !window.__POWERED_BY_QIANKUN__) {
+      window.addEventListener(
+        "hashchange",
+        (event) => {
+          var currentPath = window.location.hash.slice(1).split("?")[0]; // 获取输入的路由
+          if (
+            currentPath != "/404" &&
+            currentPath != "/login" &&
+            this.$route.path !== currentPath
+          ) {
+            this.$store.dispatch("tagsView/delAllViews").then((visitedViews) => {
+              this.$router.replace({ path: "/redirect" + "/home" });
+            });
+          }
+        },
+        false
+      );
+
+      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");
+        }
+      });
+    }
+
+    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>
+.inner-dialog .el-dialog__wrapper {
+  top: 0;
+}
+
+/* #app .el-submenu .el-menu {
+  height: 500px;
+} */
+</style>

package/src/api/user.js

@@ -32,6 +32,19 @@ export function saveAccessMenuLog(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",
@@ -113,3 +126,11 @@ export function getLogicParamValue(option) {
     ...option,
   });
 }
+
+export function getIdmLoginUrl(option) {
+  return request({
+    url: USER_PREFIX + "/auth/idmLoginUrl",
+    method: "post",
+    ...option,
+  });
+}

package/src/components/baseArea/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="base-area">
     <el-popover
+      ref="popoverRef"
       v-model="popoverVisible"
       placement="bottom-start"
       trigger="click"
@@ -268,13 +269,28 @@ export default {
       if (this.labelValue) {
         return this.labelValue;
       }
-      const pathLabel = this.selectedPath.length
+      /* 弹层浏览中的选择未确认，输入框只回显打开弹层时的已提交值 */
+      if (this.popoverVisible) {
+        return this.committedPathLabel;
+      }
+      if (!this.selectedPath.length) {
+        return "";
+      }
+      /* 外部未回传 label 时的兜底：仅当浏览路径与已绑定值一致才回显 */
+      const leafId = this.getLeafIdFromValue(this.value);
+      return this.isValueSynced(leafId)
         ? this.buildPathLabel(this.selectedPath)
         : "";
-      if (this.popoverVisible && pathLabel) {
-        return pathLabel;
+    },
+    committedPathLabel() {
+      const snapshot = this.committedBrowseSnapshot;
+      if (!snapshot || !snapshot.selectedPath || !snapshot.selectedPath.length) {
+        return "";
       }
-      return pathLabel || "";
+      if (!this.isSameBoundValue(this.value, snapshot.boundValue)) {
+        return "";
+      }
+      return this.buildPathLabel(snapshot.selectedPath);
     },
     tabs() {
       const tabs = [];
@@ -336,8 +352,43 @@ export default {
   },
   beforeDestroy() {
     clearTimeout(this.searchTimer);
+    this.unbindOutsideClick();
   },
   methods: {
+    bindOutsideClick() {
+      /* 捕获阶段监听：外层若阻止了 click 冒泡，el-popover 自带的 document 监听收不到，弹层不会关闭 */
+      document.addEventListener("mousedown", this.handleOutsideClick, true);
+    },
+    unbindOutsideClick() {
+      document.removeEventListener("mousedown", this.handleOutsideClick, true);
+    },
+    isInsidePopover(target) {
+      if (!target || !target.nodeType) {
+        return false;
+      }
+      /* 触发器（含输入框）在组件根节点内 */
+      if (this.$el && this.$el.contains(target)) {
+        return true;
+      }
+      /* 弹层默认 append 到 body，需单独判断 */
+      const popoverRef = this.$refs.popoverRef;
+      const popper = popoverRef && popoverRef.$refs && popoverRef.$refs.popper;
+      return !!(popper && popper.contains(target));
+    },
+    handleOutsideClick(evt) {
+      if (!this.popoverVisible) {
+        return;
+      }
+      const target = evt.target;
+      /* 已从文档移除的节点无法判断归属，不做处理 */
+      if (!target || !document.contains(target)) {
+        return;
+      }
+      if (this.isInsidePopover(target)) {
+        return;
+      }
+      this.popoverVisible = false;
+    },
     getResolveDepthLimit(item) {
       if (item && item.treePath) {
         const ids = this.parseTreePathIds(item.treePath);
@@ -565,6 +616,7 @@ export default {
     },
     handlePopoverShow() {
       this.pendingLeaf = false;
+      this.bindOutsideClick();
       this.saveCommittedBrowseSnapshot();
       this.$emit("popover-open");
       this.$nextTick(() => {
@@ -1060,6 +1112,7 @@ export default {
       this.emitResolvedLabelIfNeeded();
     },
     handlePopoverHide() {
+      this.unbindOutsideClick();
       this.searchKeyword = "";
       this.searchList = [];
       this.searchDropdownVisible = false;
@@ -1299,13 +1352,13 @@ export default {
 }
 
 .base-area-panel {
-  padding: 4px 0 0;
+  padding: 0;
   overflow: visible;
 }
 
 .base-area-search {
   position: relative;
-  margin-bottom: 8px;
+  margin-bottom: 6px;
   z-index: 2;
 }
 
@@ -1360,8 +1413,8 @@ export default {
 }
 
 .base-area-path {
-  padding: 6px 10px;
-  margin-bottom: 10px;
+  padding: 3px 8px;
+  margin-bottom: 6px;
   background: #f5f7fa;
   border: 1px solid #ebeef5;
   border-radius: 4px;
@@ -1380,7 +1433,7 @@ export default {
   padding: 0 2px;
   font-size: 12px;
   color: #c0c4cc;
-  line-height: 24px;
+  line-height: 22px;
   user-select: none;
 }
 
@@ -1389,8 +1442,8 @@ export default {
   min-width: 0;
   max-width: 100%;
   padding: 0 4px;
-  height: 24px;
-  line-height: 24px;
+  height: 22px;
+  line-height: 22px;
   border: none;
   border-bottom: 2px solid transparent;
   border-radius: 0;
@@ -1427,7 +1480,7 @@ export default {
 }
 
 .base-area-grid-wrap {
-  padding: 8px;
+  padding: 6px;
   background: #fff;
   border: 1px solid #eee;
   border-radius: 8px;
@@ -1436,20 +1489,22 @@ export default {
 .base-area-grid {
   display: flex;
   flex-wrap: wrap;
-  min-height: 120px;
-  max-height: 294px;
+  align-content: flex-start;
+  min-height: 82px;
+  /* 5 行：(28 + 6) * 5 + 4 */
+  max-height: 174px;
   overflow-y: auto;
   margin: 0 -4px;
 }
 
 .base-area-item {
   width: calc(25% - 8px);
-  margin: 0 4px 8px;
+  margin: 0 4px 6px;
   padding: 0 10px;
-  height: 34px;
-  line-height: 34px;
+  height: 28px;
+  line-height: 28px;
   border: 1px solid #eee;
-  border-radius: 8px;
+  border-radius: 6px;
   font-size: 12px;
   cursor: pointer;
   overflow: hidden;
@@ -1470,7 +1525,7 @@ export default {
 
 .base-area-empty {
   width: 100%;
-  padding: 24px 0;
+  padding: 16px 0;
   text-align: center;
   color: #909399;
   font-size: 12px;
@@ -1480,12 +1535,12 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-top: 8px;
+  margin-top: 6px;
 
   .base-area-nav-btn {
     min-width: 32px;
-    padding: 7px 10px;
-    border-radius: 8px;
+    padding: 5px 10px;
+    border-radius: 6px;
     color: #fff;
     border-color: $baseColor;
     background-color: $baseColor;
@@ -1522,7 +1577,7 @@ export default {
     text-align: center;
     font-size: 12px;
     color: #606266;
-    line-height: 28px;
+    line-height: 24px;
     user-select: none;
   }
 }
@@ -1531,8 +1586,8 @@ export default {
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  margin-top: 8px;
-  padding-top: 8px;
+  margin-top: 6px;
+  padding-top: 6px;
   border-top: 1px solid #ebeef5;
 }
 </style>
@@ -1577,7 +1632,7 @@ export default {
 }
 
 .base-area-popover {
-  padding: 10px 12px;
+  padding: 8px 10px;
   overflow: visible;
   box-sizing: border-box;
 
@@ -1599,7 +1654,7 @@ export default {
   }
 
   .base-area-nav-btn.el-button {
-    border-radius: 8px;
+    border-radius: 6px;
     color: #fff;
     border-color: $baseColor;
     background-color: $baseColor;

package/src/components/baseTabs/mixins.js

@@ -122,7 +122,11 @@ baseTabPaneMixin = {
     }
   },
   beforeDestroy() {
-    let navList = this.getParent().navList;
+    //getParent() 只认 baseTabs 父级/祖父级,拿不到就是没被 baseTabs 包着(如设计期画布、
+    //或中间隔了 draggable),此时没有 navList 可维护,直接跳过——原来这里直接取 .navList 会崩。
+    let parentPanel = this.getParent();
+    if (!parentPanel) return;
+    let navList = parentPanel.navList;
     if (navList.length <= 1) {
       this.updateNav();
     }