Merge branch 'feat/v1.6-0621' of git.quantgroup.cn:ui/quantum-blocks into feat/v1.6-0621

app/web/page/editor/view/navigator/components/addOrEditNavigator.vue

@@ -130,6 +130,28 @@ import featurePageTable from './featurePageTable.vue';
 import activityPageTable from './activityPageTable.vue';
 import navigatorPageTable from './navigatorPageTable.vue';
 import navigatorApi from '@api/navigator.api'
+
+// 添加或修改url中的参数
+function addOrEditUrlParams (url, paramName, replaceWith) {
+  if (url.indexOf(paramName) > -1) {
+    // let re = /(' + paramName + '=)([^&]*)/gi;
+    // url = url.replace(re, paramName + '=' + replaceWith);
+    const re = new RegExp(paramName + '=[^&]*', 'gi')
+    url = url.replace(re, paramName + '=' + replaceWith)
+  } else {
+    let paraStr = paramName + '=' + replaceWith;
+    let idx = url.indexOf('?');
+    if (idx < 0) {
+      url += '?';
+    } else if (idx >= 0 && idx !== url.length - 1) {
+      url += '&';
+    }
+    url = url + paraStr;
+  }
+  return url;
+};
+
+
 export default {
   components: {
     uploader,
@@ -346,6 +368,15 @@ export default {
       const arr = this.navigatorData.concat([]);
       const targetIndex = type === 1 ? index - 1 : index + 1;
       arr[index] = arr.splice(targetIndex, 1, arr[index])[0];
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].pageType == 2) {
+          console.log(i);
+          // 活动页面的时候，因上下移动需要重新给index排序
+          arr[i].pageUrl = addOrEditUrlParams(arr[i].pageUrl, 'index', i)
+          console.log(arr[i].pageUrl, i)
+        }
+      }
+      console.log(arr);
       this.navigatorData = arr;
     }
   },

package.json

@@ -30,7 +30,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.53-beta2",
+    "@qg/citrus-ui": "0.3.54-beta1",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",