Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/Tippi

src/components/asyncComponent/index.vue

@@ -3,6 +3,8 @@
     :is="mode"
     :ref="refId"
     :obj="obj"
+    :bus="bus"
+    :axios-request="request"
     v-bind="$attrs"
     v-on="$listeners"
   />
@@ -11,6 +13,9 @@
 <script>
 import { uuid } from 'vue-uuid'
 import { get } from '@/api/system/dynamic'
+import bus from '@/utils/bus'
+import request from '@/utils/request'
+
 export default {
   name: 'AsyncComponent',
   inheritAttrs: true,
@@ -29,7 +34,9 @@ export default {
     return {
       resData: '',
       mode: '',
-      refId: null
+      refId: null,
+      bus: bus,
+      request: request
     }
   },
   watch: {

src/components/canvas/components/editor/EditBar.vue

@@ -82,10 +82,10 @@
         />
       </span>
       <span :title="$t('route.exportExcel')">
-        <svg-icon
+        <i
           v-if="exportExcelShow"
-          style="color: white"
-          icon-class="file-excel"
+          style="line-height: 24px"
+          class="el-icon-document-delete"
           @click.stop="exportExcelDownload()"
         />
       </span>
@@ -469,7 +469,7 @@ export default {
       this.$emit('showViewDetails', { openType: openType })
     },
     exportExcelDownload() {
-      exportExcelDownload(this.chart, null, null, null, null, null)
+      exportExcelDownload(this.chart)
     },
     auxiliaryMatrixChange() {
       if (this.curComponent.auxiliaryMatrix) {

src/components/canvas/components/editor/LinkageField.vue

@@ -171,23 +171,19 @@ export default {
       return this.targetLinkageInfo[this.curLinkageView.propValue.viewId]
     },
     ...mapState([
-      'menuTop',
-      'menuLeft',
-      'menuShow',
-      'curComponent',
-      'componentData',
-      'canvasStyleData',
-      'linkageSettingStatus',
       'targetLinkageInfo',
       'curLinkageView'
     ])
   },
   mounted() {
+    const _this = this
     // 初始化映射关系 如果当前是相同的数据集且没有关联关系，则自动补充映射关系
     checkSameDataSet(this.curLinkageView.propValue.viewId, this.element.propValue.viewId).then(res => {
       if (res.data === 'YES' && this.linkageInfo.linkageFields.length === 0) {
         this.sourceLinkageInfo.targetViewFields.forEach(item => {
-          this.addLinkageField(item.id, item.id)
+          _this.$nextTick(() => {
+            this.addLinkageField(item.id, item.id)
+          })
         })
       }
     })

src/components/canvas/utils/utils.js

@@ -429,7 +429,10 @@ export function getCacheTree(treeName) {
 }
 
 export function exportExcelDownload(chart, snapshot, width, height, loadingWrapper, callBack) {
-  if (!chart.data?.data?.length) {
+  if (chart.render === 'antv' && !chart.data?.data?.length) {
+    return
+  }
+  if (chart.type === 'echarts' && !(chart.data?.series?.length && chart.data?.series[0].data?.length)) {
     return
   }
   const fields = JSON.parse(JSON.stringify(chart.data.fields))

src/lang/zh.js

@@ -1938,7 +1938,7 @@ export default {
     jsonpath_info: '请填入JsonPath',
     req_param: '请求参数',
     headers: '请求头',
-    query_param: "QUERY參數",
+    query_param: "QUERY参数",
     query_info: "地址栏中跟在？后面的参数,如: updateapi?id=112",
     key: '键',
     value: '值',

src/router/index.js

-import Vue from "vue";
-import Router from "vue-router";
+import Vue from 'vue'
+import Router from 'vue-router'
 
-Vue.use(Router);
+Vue.use(Router)
 
 /* Layout */
-import Layout from "@/layout";
+import Layout from '@/layout'
 
 /**
  * Note: sub-menu only appear when route children.length >= 1
@@ -32,74 +32,71 @@ import Layout from "@/layout";
  */
 export const constantRoutes = [
   {
-    path: "/redirect",
+    path: '/redirect',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: "/redirect/:path(.*)",
-        component: () => import("@/views/redirect/index"),
-      },
-    ],
+        path: '/redirect/:path(.*)',
+        component: () => import('@/views/redirect/index')
+      }
+    ]
   },
   {
-    path: "/login",
-    component: () => import("@/views/login/index"),
-    hidden: true,
+    path: '/login',
+    component: () => import('@/views/login/index'),
+    hidden: true
   },
 
   {
-    path: "/404",
-    component: () => import("@/views/404"),
-    hidden: true,
+    path: '/404',
+    component: () => import('@/views/404'),
+    hidden: true
   },
   {
-    path: "/401",
-    component: (resolve) => require(["@/views/401"], resolve),
-    hidden: true,
+    path: '/401',
+    component: (resolve) => require(['@/views/401'], resolve),
+    hidden: true
   },
 
   {
-    path: "/panelEdit",
+    path: '/panelEdit',
     component: Layout,
-    redirect: "/panelEdit/edit",
+    redirect: '/panelEdit/edit',
     hidden: true,
     children: [
       {
-        path: "edit",
-        component: () => import("@/views/panel/edit"),
-      },
-    ],
+        path: 'edit',
+        component: () => import('@/views/panel/edit')
+      }
+    ]
   },
   {
-    path: "/delink",
-    component: () => import("@/views/link"),
-    hidden: true,
+    path: '/delink',
+    component: () => import('@/views/link'),
+    hidden: true
   },
 
   {
-    path: "/preview/:reportId",
-    component: () =>
-      import("@/components/canvas/components/editor/PreviewEject"),
-    hidden: true,
+    path: '/preview/:reportId',
+    component: () => import('@/components/canvas/components/editor/PreviewEject'),
+    hidden: true
   },
   {
-    path: "/previewScreenShot/:reportId/:backScreenShot",
-    component: () =>
-      import("@/components/canvas/components/editor/PreviewEject"),
-    hidden: true,
+    path: '/previewScreenShot/:reportId/:backScreenShot',
+    component: () => import('@/components/canvas/components/editor/PreviewEject'),
+    hidden: true
   },
   {
-    path: "/previewFullScreen",
-    component: () =>
-      import("@/components/canvas/components/editor/PreviewFullScreen"),
-    hidden: true,
+    path: '/previewFullScreen',
+    component: () => import('@/components/canvas/components/editor/PreviewFullScreen'),
+    hidden: true
   },
   {
-    path: "/de-auto-login",
-    component: () => import("@/views/DeAutoLogin"),
-    hidden: true,
-  },
+    path: '/de-auto-login',
+    component: () => import('@/views/DeAutoLogin'),
+    hidden: true
+  }
 
   //   {
   //     path: '/',
@@ -217,22 +214,21 @@ export const constantRoutes = [
   //   },
   // 404 page must be placed at the end !!!
   //   { path: '*', redirect: '/404', hidden: true }
-];
+]
 
-const createRouter = () =>
-  new Router({
-    //   mode: 'history', // require service support
-    mode: "hash",
-    scrollBehavior: () => ({ y: 0 }),
-    routes: [],
-  });
+const createRouter = () => new Router({
+  //   mode: 'history', // require service support
+  mode: 'hash',
+  scrollBehavior: () => ({ y: 0 }),
+  routes: constantRoutes
+})
 
-const router = createRouter();
+const router = createRouter()
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
-  const newRouter = createRouter();
-  router.matcher = newRouter.matcher; // reset router
+  const newRouter = createRouter()
+  router.matcher = newRouter.matcher // reset router
 }
 
-export default router;
+export default router

src/views/chart/components/dragItem/QuotaExtItem.vue

@@ -449,7 +449,7 @@ export default {
 
     valueFormatter() {
       this.item.index = this.index
-      this.item.formatterType = 'quota'
+      this.item.formatterType = 'quotaExt'
       this.$emit('valueFormatter', this.item)
     }
   }

src/views/chart/components/filter/QuotaFilterEditor.vue

@@ -117,6 +117,13 @@ export default {
           value: 'ge',
           label: this.$t('chart.filter_ge')
         }]
+      },
+      {
+        label: '',
+        options: [{
+          value: 'not_null',
+          label: this.$t('chart.filter_not_null')
+        }]
       }],
       logic: ''
     }

src/views/chart/components/filter/ResultFilterEditor.vue

@@ -194,6 +194,13 @@ export default {
             value: 'ge',
             label: this.$t('chart.filter_ge')
           }]
+        },
+        {
+          label: '',
+          options: [{
+            value: 'not_null',
+            label: this.$t('chart.filter_not_null')
+          }]
         }
       ],
       valueOptions: [
@@ -226,6 +233,13 @@ export default {
             value: 'ge',
             label: this.$t('chart.filter_ge')
           }]
+        },
+        {
+          label: '',
+          options: [{
+            value: 'not_null',
+            label: this.$t('chart.filter_not_null')
+          }]
         }
       ],
       options: [],

src/views/chart/view/ChartEdit.vue

@@ -473,7 +473,8 @@
                   <plugin-com
                     v-if="view.isPlugin"
                     :component-name="view.type + '-data'"
-                    :obj="{view, param, chart, dimensionData, quotaData}"
+                    :obj="{view, param, chart, dimension, dimensionData, quota, quotaData}"
+                    :bus="bus"
                   />
                   <div v-else>
 
@@ -819,6 +820,7 @@
                             @editItemFilter="showQuotaEditFilter"
                             @onNameEdit="showRename"
                             @editItemCompare="showQuotaEditCompare"
+                            @valueFormatter="valueFormatter"
                           />
                         </transition-group>
                       </draggable>
@@ -1795,7 +1797,7 @@ export default {
     DrillPath,
     PluginCom,
     MapMapping,
-    MarkMapDataEditor,
+    MarkMapDataEditor
   },
   props: {
     param: {
@@ -1815,6 +1817,7 @@ export default {
   },
   data() {
     return {
+      bus: bus,
       positionActiveNames: 'positionAdjust',
       loading: false,
       table: {},
@@ -2954,7 +2957,7 @@ export default {
 
     // 更换数据集
     changeChart() {
-      const optType = this.view.tableId === this.changeTable.id && this.view.dataFrom!=='template' ? 'same' : 'change'
+      const optType = this.view.tableId === this.changeTable.id && this.view.dataFrom !== 'template' ? 'same' : 'change'
       // 更换数据集后清空视图字段，并重新请求数据；否则没有操作
       if (optType === 'change') {
         this.view.dataFrom = 'dataset'

src/views/chart/view/PositionAdjust.vue

@@ -81,7 +81,7 @@ export default {
   props: {},
   data() {
     return {
-      maxHeight: 2000,
+      maxHeight: 10000,
       maxTop: 20000
     }
   },

src/views/chart/view/TitleRemark.vue

@@ -10,7 +10,7 @@
       <div
         class="remark-style"
         :style="{backgroundColor:remarkCfg.bgFill}"
-        v-html="remarkCfg.content"
+        v-html="$xss(remarkCfg.content)"
       />
       <i
         slot="reference"

src/views/dataset/common/DatasetChartDetail.vue

@@ -21,8 +21,8 @@
           <el-col class="info-item">
             <p class="info-title">{{ $t('chart.chart_type') }}</p>
             <svg-icon
-              v-if="detail.chart.type"
-              :icon-class="detail.chart.type"
+              :icon-class="detail.chart.isPlugin && detail.chart.type && detail.chart.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + detail.chart.type + '/svg') : detail.chart.type"
+              class="chart-icon"
             />
           </el-col>
           <el-col class="info-item">

src/views/dataset/data/components/LazyTree.vue

@@ -34,7 +34,7 @@
           <span>
             <span
               style="margin-left: 6px"
-              v-html="data.name"
+              v-html="$xss(data.name)"
             />
           </span>
           <span

src/views/dataset/group/GroupMoveSelector.vue

@@ -34,7 +34,7 @@
                 text-overflow: ellipsis;
               "
               :title="data.name"
-              v-html="highlights(data.name)"
+              v-html="$xss(highlights(data.name))"
             />
           </span>
         </span>

src/views/login/index.vue

@@ -202,7 +202,7 @@
     <div
       v-if="showFoot"
       class="dynamic-login-foot"
-      v-html="footContent"
+      v-html="$xss(footContent)"
     />
   </div>
 </template>

src/views/panel/export/PDFPreExport.vue

@@ -15,7 +15,7 @@
         <div
           class="export_body_inner_class"
           :style="templateHtmlStyle"
-          v-html="templateContentChange"
+          v-html="$xss(templateContentChange)"
         />
       </div>
     </el-row>

src/views/panel/list/PanelList.vue

@@ -670,7 +670,10 @@ export default {
         if (this.editPanel.optType === 'toDefaultPanel') {
           this.defaultTree(false)
         }
-        updateCacheTree(this.editPanel.optType, 'panel-main-tree', panelInfo, this.tData)
+
+        updateCacheTree(this.editPanel.optType,
+          panelInfo.panelType === 'system' ? 'panel-default-tree' : 'panel-main-tree', panelInfo,
+          panelInfo.panelType === 'system' ? this.defaultData : this.tData)
         if (this.editPanel.optType === 'rename' && panelInfo.id === this.$store.state.panel.panelInfo.id) {
           this.$store.state.panel.panelInfo.name = panelInfo.name
         }
@@ -850,7 +853,7 @@ export default {
 
     delete(data) {
       const params = {
-        title: data.nodeType === 'folder'?'commons.delete_this_folder':'commons.delete_this_dashboard',
+        title: data.nodeType === 'folder' ? 'commons.delete_this_folder' : 'commons.delete_this_dashboard',
         type: 'danger',
         cb: () => {
           delGroup(data.id).then((response) => {

src/views/system/user/index.vue

@@ -202,7 +202,7 @@
               <!-- // {{}}会将数据解释为普通文本，而非 HTML 代码。 -->
               <div
                 slot="content"
-                v-html="filterRoles(scope.row.roles)"
+                v-html="$xss(filterRoles(scope.row.roles))"
               />
               <div class="de-one-line">{{ filterRoles(scope.row.roles) }}</div>
             </el-tooltip>

src/views/wizard/WizardCard.vue

@@ -9,7 +9,7 @@
         {{ details.head }}
       </el-row>
       <el-row class="card_content">
-        <span v-html="details.content" />
+        <span v-html="$xss(details.content)" />
       </el-row>
       <el-row class="card_bottom">
         {{ $t('wizard.click_show') }}

src/views/wizard/WizardCardEnterprise.vue

@@ -9,7 +9,7 @@
         {{ details.head }}
       </el-row>
       <el-row class="card_content">
-        <span v-html="details.content" />
+        <span v-html="$xss(details.content)" />
       </el-row>
       <el-row class="card_bottom">
         {{ $t('wizard.apply') }}

src/views/wizard/details/CardDetail.vue

@@ -18,7 +18,7 @@
         <span>{{ details.head }}</span>
       </el-row>
       <el-row class="content">
-        <span v-html="details.content" />
+        <span v-html="$xss(details.content)" />
       </el-row>
       <el-row class="bottom">
         <span class="span-box">{{ details.bottom }}</span>

src/views/wizard/details/LatestDevelopments.vue

@@ -18,7 +18,7 @@
         <span>{{ details.head }}</span>
       </el-row>
       <el-row class="content">
-        <span v-html="details.content" />
+        <span v-html="$xss(details.content)" />
       </el-row>
       <el-row class="bottom">
         <span class="span-box">{{ details.bottom }}</span>