Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue

@@ -23,7 +23,7 @@
             id="asset-list"
             :params="filter"
             :params-type="paramsType"
-            :permissions="{import: 'main_add', export: 'panel_edit'}"
+            :permissions="{import: 'main_add', export: 'main_edit'}"
             class="top-tool-export margin-r-10"
             export-file-name="asset-charts"
             export-url="visual/panel/export"
@@ -60,8 +60,8 @@
             :showLock="from === fromRoute.endpoint"
             class="top-tool-export margin-r-10"
             export-file-name="endpoint-charts"
-            export-url="visual/panel/export"
-            import-url="visual/panel/import"
+            :export-url="'visual/panel/export'"
+            :import-url="'visual/panel/import'"
             @afterImport="getTableData"
             @panelLockChange="panelLockChange"
           >

nezha-fronted/src/components/common/js/tools.js

@@ -99,6 +99,10 @@ function isEqual (o1, o2) {
   return isEqualForInner(o1, o2)
 }
 export const myLoading = {
+  // v-my-loading:circle3.scaleMin.icon= flag
+  // 参数 circle3 为对应的class 名 需要添加div的 在bind内处理。
+  // 后续可跟多个参数 scaleMin 缩小0.5 scaleMax 放大2倍
+  // icon 为box 没有宽高 、icon 以及flex内的小块使用
   bind: myLoadingFunction,
   update: myLoadingFunctionUpdate,
   unbind: function (el, binding) {

nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue

@@ -13,7 +13,7 @@
         <div id="chart-import" @click="showImportBox(1)"><i class="nz-icon nz-icon-upload"></i>{{$t('overall.importExcel')}}</div>
       </el-dropdown-item>
       <el-dropdown-item v-has="permissions.export" v-if="exportUrl">
-        <div id="chart-export"@click="showImportBox(2)"><i class="nz-icon nz-icon-download1"></i>{{$t('overall.exportExcel')}}</div>
+        <div id="chart-export" @click="showImportBox(2)"><i class="nz-icon nz-icon-download1"></i>{{$t('overall.exportExcel')}}</div>
       </el-dropdown-item>
       <!-- import、export之后的内容 -->
       <slot name="after"></slot>