cnhis-design-vue 0.2.25-beta → 0.2.26-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.25-beta",
+  "version": "0.2.26-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -93,4 +93,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

package/packages/scale-view/scaleView.vue

@@ -627,6 +627,7 @@ export default create({
     },
     initForm(data) {
       let { list = [], map = {}, isFinished = false } = data;
+      this.handleFrontAddress(list);
       map.maxScore && (this.maxScore = map.maxScore);
       this.isFinished = isFinished;
       if (data.isLackCustomer) {
@@ -670,6 +671,29 @@ export default create({
       this.fontSize = data.fontSize;
       this.spinning = false;
     },
+    handleFrontAddress(list) {
+      if (!list || !list.length) return;
+      let matchItem = list.find(item => item.type === "FRONT_ADDRESS");
+      if (!matchItem || !Object.keys(matchItem).length) return;
+      let setting;
+      if (matchItem.setting && this.$utils.isJSON(matchItem.setting)) {
+        setting = JSON.parse(matchItem.setting);
+      }
+      if (!setting || !Object.keys(setting).length) return;
+      let query = this.handleQueryParams();
+      // redirect=1 代表从前置地址跳转回来了
+      if (query?.redirect == 1) return;
+      let { frontAddress } = setting;
+      if (frontAddress) {
+        let urlHref = window.location.href;
+        let preStr = "?";
+        if (frontAddress.includes("?")) {
+          preStr = "&";
+        }
+        let curUrl = `${frontAddress}${preStr}redirect_url=${encodeURIComponent(urlHref)}`;
+        window.location.href = curUrl;
+      }
+    },
     handleBtnParamsEvaluate(params) {
       let defaultVariable = ["evaname", "evadesc", "evast", "evadur", "evaan"];
       let res = {};
@@ -744,7 +768,7 @@ export default create({
     handleQueryParams() {
       let params = {};
       for (let [key, value] of new URLSearchParams(window.location.hash.split("?")[1]).entries()) {
-        params[key] = value;
+        params[key] = decodeURIComponent(value);
       }
       return params;
     },
@@ -893,16 +917,15 @@ export default create({
     },
     // 获取url链接参数
     getQueryVariable(variable) {
-      let query = window.location.hash.split("?")[1];
-      if (!query) return false;
-      let vars = query.split("&");
-      for (let i = 0; i < vars.length; i++) {
-        let pair = vars[i].split("=");
-        if (pair[0] == variable) {
-          return pair[1];
-        }
+      let query = {};
+      if (this.source == "layout") {
+        // 按钮传参
+        query = this.params;
+      } else {
+        query = this.handleQueryParams() || {};
       }
-      return false;
+      if (!query) return false;
+      return query[variable] || false;
     },
     // 初始化量表
     formatArray(list) {

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -1848,7 +1848,9 @@ export default create({
       if (info.type === 'print') {
         await this.receivePrintSuccessAboutPrint(res, info);
       }
-      this.$message.success(res.message);
+      setTimeout(() => {
+        this.$message.success(res.message);
+      }, 3500);
     },
     receivePrintError(res) {
       let errorMsg = res.message;