cnhis-design-vue 0.2.28-beta → 0.2.29-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.28-beta",
+  "version": "0.2.29-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/scale-view/scaleView.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="r-scale">
     <slot v-if="spinning">
-      <a-spin :indicator="indicator" />
+      <a-spin :indicator="indicator" tip="加载中..." />
     </slot>
-    <slot v-else>
+    <slot v-if="!spinning && !hasFrontAddress">
       <div v-if="noData">暂无数据</div>
       <!-- <NoData v-if="noData" :noDataImg="noDataImg" :noDataTip="noDataTip"></NoData> -->
       <template v-else>
@@ -598,7 +598,8 @@ export default create({
       isFinished: false,
       maxScore: 0,
       originConfig: {},
-      paramsEvaluate: null
+      paramsEvaluate: null,
+      hasFrontAddress: true
     };
   },
   mounted() {
@@ -618,6 +619,7 @@ export default create({
         this.initForm(configData);
       } catch (error) {
         this.spinning = false;
+        this.hasFrontAddress = false;
         this.setNoData(true, error?.resultMsg, error?.result);
       }
     },
@@ -627,7 +629,11 @@ export default create({
     },
     initForm(data) {
       let { list = [], map = {}, isFinished = false } = data;
-      this.handleFrontAddress(list);
+      let curUrl = this.handleFrontAddress(list);
+      if (curUrl) {
+        window.location.href = curUrl;
+        return;
+      }
       map.maxScore && (this.maxScore = map.maxScore);
       this.isFinished = isFinished;
       if (data.isLackCustomer) {
@@ -670,13 +676,14 @@ export default create({
       this.rules = this.formatRules(this.formArray);
       this.fontSize = data.fontSize;
       this.spinning = false;
+      this.hasFrontAddress = 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)) {
+      if (matchItem.setting && utils.isJSON(matchItem.setting)) {
         setting = JSON.parse(matchItem.setting);
       }
       if (!setting || !Object.keys(setting).length) return;
@@ -691,7 +698,7 @@ export default create({
           preStr = "&";
         }
         let curUrl = `${frontAddress}${preStr}redirect_url=${encodeURIComponent(urlHref)}`;
-        window.location.href = curUrl;
+        return curUrl;
       }
     },
     handleBtnParamsEvaluate(params) {