源码更新

a752cff5 · Tippi.Rao · 65f48332 · a752cff5 · a752cff5 · a752cff5
Commit a752cff5 authored Jul 27, 2023 by Tippi.Rao
--- a/src/App.vue
+++ b/src/App.vue
 <template>
  <div id="app">
    <router-view />
-    <plugin-com v-show="false" ref="de-theme" component-name="ThemeSetting" />
+    <plugin-com
+      v-show="false"
+      ref="de-theme"
+      component-name="ThemeSetting"
+    />
    <el-dialog
      v-if="$route.path !== '/login'"
      :visible.sync="showPasswordModifiedDialog"
@@ -15,36 +19,36 @@
 </template>
 <script>
-import PluginCom from "@/views/system/plugin/PluginCom";
+import PluginCom from '@/views/system/plugin/PluginCom'
-import { mapState } from "vuex";
+import { mapState } from 'vuex'
-import PasswordUpdateForm from "@/views/system/user/PasswordUpdateForm.vue";
+import PasswordUpdateForm from '@/views/system/user/PasswordUpdateForm.vue'
 export default {
-  name: "App",
+  name: 'App',
  components: { PluginCom, PasswordUpdateForm },
  computed: {
-    ...mapState("user", ["passwordModified"]),
+    ...mapState('user', [
+      'passwordModified',
+    ])
  },
  data() {
    return {
-      showPasswordModifiedDialog: false,
+      showPasswordModifiedDialog: false
-    };
+    }
  },
  mounted() {
-    const passwordModified = JSON.parse(
+    const passwordModified = JSON.parse(localStorage.getItem('passwordModified'))
-      localStorage.getItem("passwordModified")
+    if (typeof passwordModified === 'boolean') {
-    );
+      this.$store.commit('user/SET_PASSWORD_MODIFIED', passwordModified)
-    if (typeof passwordModified === "boolean") {
-      this.$store.commit("user/SET_PASSWORD_MODIFIED", passwordModified);
    }
  },
  watch: {
    passwordModified: {
      handler(val) {
-        this.showPasswordModifiedDialog = !val;
+        this.showPasswordModifiedDialog = !val
      },
-      immediate: true,
+      immediate: true
-    },
+    }
-  },
+  }
-};
+}
 </script>
--- a/src/components/asyncComponent/index.vue
+++ b/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: {
@@ -47,15 +54,13 @@ export default {
          // window.SyncComponentCache[this.url] = Axios.get(this.url)
          res = await window.SyncComponentCache[this.url]
        } else {
-          this.mode = await window.SyncComponentCache[this.url]
+          res = await window.SyncComponentCache[this.url]
-          return
        }
        if (res) {
          const Fn = Function
          const dynamicCode = res.data || res
          const component = new Fn(`return ${dynamicCode}`)()
          this.mode = component.default || component
-          window.SyncComponentCache[this.url] = this.mode
        }
      }
    }

--- a/src/components/canvas/components/editor/EditBar.vue
+++ b/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"
+          style="line-height: 24px"
-          icon-class="file-excel"
+          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) {

--- a/src/components/canvas/components/editor/LinkageField.vue
+++ b/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)
+          })
        })
      }
    })

--- a/src/components/canvas/customComponent/UserView.vue
+++ b/src/components/canvas/customComponent/UserView.vue
@@ -360,7 +360,7 @@ export default {
  computed: {
    // 首次加载且非编辑状态新复制的视图，使用外部filter
    initLoad() {
-      return !(this.isEdit && this.currentCanvasNewId.includes(this.element.id)) && this.isFirstLoad
+      return !(this.isEdit && this.currentCanvasNewId.includes(this.element.id)) && this.isFirstLoad && this.canvasId === 'canvas-main'
    },
    scaleCoefficient() {
      if (this.terminal === 'pc' && !this.mobileLayoutStatus) {

--- a/src/components/canvas/utils/utils.js
+++ b/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))

--- a/src/components/dragItem/index.vue
+++ b/src/components/dragItem/index.vue
@@ -6,7 +6,16 @@
      class="item-axis"
      @close="removeItem"
    >
-      {{ item.name }}
+      <el-tooltip
+        v-if="toolTip"
+        class="item"
+        effect="dark"
+        :content="toolTip || item.name"
+        placement="top"
+      >
+        <span>{{ item.name }}</span>
+      </el-tooltip>
+      <span v-else>{{ item.name }}</span>
    </el-tag>
  </span>
 </template>
@@ -22,6 +31,11 @@ export default {
    index: {
      type: Number,
      required: true
+    },
+    toolTip: {
+      type: String,
+      required: false,
+      default: ''
    }
  },

--- a/src/components/elTreeSelect/index.vue
+++ b/src/components/elTreeSelect/index.vue
@@ -410,7 +410,7 @@ export default {
    },
    _filterFun(value, data, node) {
      if (!value) return true
-      return data[this.propsLabel].indexOf(value) !== -1
+      return data[this.propsLabel?.toLocaleUpperCase()].indexOf(value.toLocaleUpperCase()) !== -1
    },
    _treeNodeClickFun(data, node, vm) {
      const { multiple } = this.selectParams

--- a/src/components/elVisualSelect/index.vue
+++ b/src/components/elVisualSelect/index.vue
@@ -121,7 +121,7 @@ export default {
    },
    keyWord(val, old) {
      if (val === old) return
-      const results = val ? this.list.filter(item => item.text.includes(val)) : null
+      const results = val ? this.vagueFilter(val, this.list) : null
      this.resetList(results)
      this.reCacularHeight()
      this.$nextTick(() => {
@@ -136,6 +136,11 @@ export default {
    })
  },
  methods: {
+    vagueFilter(val, nodes) {
+      if (!val || !val.trim()) return nodes
+      const results = nodes.filter(item => item.text?.toLocaleUpperCase().includes(val.toLocaleUpperCase()))
+      return results
+    },
    resetSelectAll() {
      this.selectAll = false
    },
@@ -148,7 +153,7 @@ export default {
    selectAllChange(val) {
      let vals = val ? [...this.list.map(ele => ele.id)] : []
      if (this.keyWord.trim() && val) {
-        vals = this.list.filter(item => item.text.includes(this.keyWord.trim())).map(ele => ele.id)
+        vals = this.vagueFilter(this.keyWord.trim(), this.list).map(ele => ele.id)
      }
      this.visualChange(vals)
      this.selectValue = vals
@@ -233,14 +238,14 @@ export default {
    isAllSelect() {
      let vals = this.list.length
      if (this.keyWord.trim()) {
-        vals = this.list.filter(item => item.text.includes(this.keyWord.trim())).map(ele => ele.id).filter(ele => this.selectValue.includes(ele)).length
+        vals = this.vagueFilter(this.keyWord.trim(), this.list).map(ele => ele.id).filter(ele => this.selectValue.includes(ele)).length
      }
      return vals
    },
    halfSelect() {
      let vals = this.list.length
      if (this.keyWord.trim()) {
-        vals = this.list.filter(item => item.text.includes(this.keyWord.trim())).map(ele => ele.id).length
+        vals = this.vagueFilter(this.keyWord.trim(), this.list).map(ele => ele.id).length
      }
      return vals
    },

--- a/src/components/widget/deWidget/DeSelectGrid.vue
+++ b/src/components/widget/deWidget/DeSelectGrid.vue
@@ -31,7 +31,7 @@
          v-model="value"
          @change="handleCheckedChange"
        >
-          <template v-for="item in data.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))">
+          <template v-for="item in data.filter(node => !keyWord || (node.id && node.id.toLocaleUpperCase().includes(keyWord.toLocaleUpperCase())))">
            <el-checkbox
              :key="item.id"
              :label="item.id"
@@ -51,7 +51,7 @@
          @change="changeRadioBox"
        >
          <el-radio
-            v-for="(item, index) in data.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))"
+            v-for="(item, index) in data.filter(node => !keyWord || (node.id && node.id.toLocaleUpperCase().includes(keyWord.toLocaleUpperCase())))"
            :key="index"
            :label="item.id"
            @click.native.prevent="testChange(item)"

--- a/src/components/widget/deWidget/DeSelectTree.vue
+++ b/src/components/widget/deWidget/DeSelectTree.vue
@@ -381,7 +381,7 @@ export default {
    _filterFun(value, data, node) {
      if (!value) return true
-      return data.id.toString().indexOf(value.toString()) !== -1
+      return data.id.toString().toLocaleUpperCase().indexOf(value.toString().toLocaleUpperCase()) !== -1
    },
    // 树点击
    _nodeClickFun(data, node, vm) {

--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -626,7 +626,8 @@ export default {
    status: 'Authorization status',
    valid: 'Valid',
    invalid: 'Invalid',
-    expired: 'Expired'
+    expired: 'Expired',
+    expired_msg: 'license has expired since {0}.  It is recommended to update the license, which does not affect the use of enterprise version functions'
  },
  member: {
    create: 'Add members',

--- a/src/lang/tw.js
+++ b/src/lang/tw.js
@@ -626,7 +626,8 @@ export default {
    status: '授權狀態',
    valid: '有效',
    invalid: '無效',
-    expired: '已過期'
+    expired: '已過期',
+    expired_msg: 'License已過期，過期時間：{0}，為了不影響企業版功能的使用，建議您更新License'
  },
  member: {
    create: '添加成員',

--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -625,7 +625,8 @@ export default {
    status: '授权状态',
    valid: '有效',
    invalid: '无效',
-    expired: '已过期'
+    expired: '已过期',
+    expired_msg: 'License已过期，过期时间：{0}，为了不影响企业版功能的使用，建议您更新License'
  },
  member: {
    create: '添加成员',
@@ -1938,7 +1939,7 @@ export default {
    jsonpath_info: '请填入JsonPath',
    req_param: '请求参数',
    headers: '请求头',
-    query_param: "QUERY參數",
+    query_param: "QUERY参数",
    query_info: "地址栏中跟在？后面的参数,如: updateapi?id=112",
    key: '键',
    value: '值',

--- a/src/layout/components/Licbar.vue
+++ b/src/layout/components/Licbar.vue
 <template>
  <div
-    v-if="!licValidate && licStatus !== 'no_record'"
+    v-if="!licValidate && licStatus !== 'no_record' && !tipClosed"
-    class="lic"
+    class="lic_tips"
  >
-    <strong>{{ $t(licMsg) }}</strong>
+    <el-alert
+      class="lic_alert"
+      :title="$t(licMsg)"
+      type="warning"
+      show-icon
+      center
+      @close="closeTip"
+    />
  </div>
 </template>
@@ -20,9 +29,7 @@ export default {
    }
  },
  computed: {
-    /* theme() {
-      return this.$store.state.settings.theme
-    }, */
    licValidate() {
      return this.$store.state.lic.validate
    },
@@ -30,40 +37,40 @@ export default {
      return this.$store.state.lic.licStatus || ''
    },
    licMsg() {
+      if (this.$store.state.lic?.licMsg?.includes('expired')) {
+        const message = this.$store.state.lic.licMsg
+        const exp = message.substring(message.indexOf('since ') + 6, message.indexOf(','))
+        return this.$t('license.expired_msg').replace('{0}', exp)
+      }
      return this.$store.state.lic.licMsg ? ('license.' + this.$store.state.lic.licMsg) : null
+    },
+    tipClosed() {
+      return localStorage.getItem('lic_closed')
    }
  },
  mounted() {
-    // this.validate()
  },
  methods: {
-    // validate() {
+    closeTip() {
-    //   validateLic().then(res => {
+      localStorage.setItem('lic_closed', true)
-    //     this.lic = true
+    }
-    //     this.$store.dispatch('lic/setValidate', true)
-    //   }).catch((e) => {
-    //     this.msg = e.response.data.message
-    //     this.lic = false
-    //     this.$store.dispatch('lic/setValidate', false)
-    //   })
-    // }
  }
 }
 </script>
 <style lang="scss" scoped>
+  .lic_tips {
-    .lic {
+    position: absolute;
-        height: 24px;
+    z-index: 2000;
-        background-color: #c92100;
+    position:absolute;
-        color: #fff;
+    top: 0;left:0;right:0;
-        text-align: center;
+    margin: auto;
-        /* padding: 6px 11px; */
+  }
-        position: fixed;
+  .lic_alert ::v-deep .el-icon-close{
-        z-index: 1002;
+    top: 16px !important;
-        top: 0;
+    right: 10px !important;
-        width: 100%;
+  }
-    }
 </style>
--- a/src/layout/components/Topbar.vue
+++ b/src/layout/components/Topbar.vue
@@ -281,7 +281,7 @@ export default {
    unloadHandler(e) {
      this.gap_time = new Date().getTime() - this.beforeUnload_time
      if (this.gap_time <= 5) {
-        this.logout().then(res => {})
+        // this.logout().then(res => {})
      }
    },

--- a/src/main.js
+++ b/src/main.js
-import Vue from "vue";
+import Vue from 'vue'
-import Cookies from "js-cookie";
+import Cookies from 'js-cookie'
-import "@/styles/index.scss"; // global css
+import '@/styles/index.scss' // global css
-import ElementUI from "element-ui";
+import ElementUI from 'element-ui'
-import Vuetify from "vuetify";
+import Vuetify from 'vuetify'
-import Fit2CloudUI from "fit2cloud-ui";
+import Fit2CloudUI from 'fit2cloud-ui'
-import i18n from "./lang"; // internationalization
+import i18n from './lang' // internationalization
-import App from "./App";
+import App from './App'
-import store from "./store";
+import store from './store'
-import router from "./router";
+import router from './router'
-import message from "./utils/message";
+import message from './utils/message'
-import "@/icons"; // icon
+import '@/icons' // icon
-import "@/permission"; // permission control
+import '@/permission' // permission control
-import api from "@/api/index.js";
+import api from '@/api/index.js'
-import filter from "@/filter/filter";
+import filter from '@/filter/filter'
-import directives from "./directive";
+import directives from './directive'
-import VueClipboard from "vue-clipboard2";
+import VueClipboard from 'vue-clipboard2'
-import widgets from "@/components/widget";
+import widgets from '@/components/widget'
-import Treeselect from "@riophae/vue-treeselect";
+import Treeselect from '@riophae/vue-treeselect'
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import "./utils/dialog";
+import './utils/dialog'
-import DeComplexInput from "@/components/business/conditionTable/DeComplexInput";
+import DeComplexInput from '@/components/business/conditionTable/DeComplexInput'
-import DeComplexSelect from "@/components/business/conditionTable/DeComplexSelect";
+import DeComplexSelect from '@/components/business/conditionTable/DeComplexSelect'
-import DeViewSelect from "@/components/deViewSelect";
+import DeViewSelect from '@/components/deViewSelect'
-import RemarkEditor from "@/views/chart/components/componentStyle/dialog/RemarkEditor";
+import RemarkEditor from '@/views/chart/components/componentStyle/dialog/RemarkEditor'
-import TitleRemark from "@/views/chart/view/TitleRemark";
+import TitleRemark from '@/views/chart/view/TitleRemark'
-import "@/components/canvas/customComponent"; // 注册自定义组件
+import '@/components/canvas/customComponent' // 注册自定义组件
-import deBtn from "@/components/deCustomCm/DeBtn.vue";
+import deBtn from '@/components/deCustomCm/DeBtn.vue'
-import "@/utils/DateUtil";
+import '@/utils/DateUtil'
-import draggable from "vuedraggable";
+import draggable from 'vuedraggable'
-import deWebsocket from "@/websocket";
+import deWebsocket from '@/websocket'
-import { GaodeMap } from "@antv/l7-maps";
+import { GaodeMap } from '@antv/l7-maps'
-import * as echarts from "echarts";
+import * as echarts from 'echarts'
-import UmyUi from "umy-ui";
+import UmyUi from 'umy-ui'
 // 全屏插件
-import fullscreen from "vue-fullscreen";
+import fullscreen from 'vue-fullscreen'
-import VueFriendlyIframe from "vue-friendly-iframe";
+import VueFriendlyIframe from 'vue-friendly-iframe'
-import vueToPdf from "vue-to-pdf";
+import vueToPdf from 'vue-to-pdf'
-import VueVideoPlayer from "vue-video-player";
+import VueVideoPlayer from 'vue-video-player'
-import "video.js/dist/video-js.css";
+import 'video.js/dist/video-js.css'
 // 控制标签宽高成比例的指令
-import proportion from "vue-proportion-directive";
+import proportion from 'vue-proportion-directive'
-import xss from "xss";
+import xss from 'xss'
 // 定义全局XSS解决方法
-Object.defineProperty(Vue.prototype, "$xss", {
+Object.defineProperty(Vue.prototype, '$xss', {
-  value: xss,
+  value: xss
-});
+})
-Vue.config.productionTip = false;
+Vue.config.productionTip = false
-Vue.use(VueClipboard);
+Vue.use(VueClipboard)
-Vue.use(widgets);
+Vue.use(widgets)
-Vue.component("Draggable", draggable);
+Vue.component('Draggable', draggable)
-Vue.prototype.$api = api;
+Vue.prototype.$api = api
-Vue.prototype.$echarts = echarts;
+Vue.prototype.$echarts = echarts
-Vue.prototype.$gaodeMap = GaodeMap;
+Vue.prototype.$gaodeMap = GaodeMap
-Vue.use(UmyUi);
+Vue.use(UmyUi)
-Vue.use(fullscreen);
+Vue.use(fullscreen)
-Vue.use(VueFriendlyIframe);
+Vue.use(VueFriendlyIframe)
-Vue.use(Vuetify);
+Vue.use(Vuetify)
 // import TEditor from '@/components/Tinymce/index.vue'
 // Vue.component('TEditor', TEditor)
@@ -75,83 +75,80 @@ Vue.use(Vuetify);
 * Currently MockJs will be used in the production environment,
 * please remove it before going online ! ! !
 */
-if (process.env.NODE_ENV === "production") {
+if (process.env.NODE_ENV === 'production') {
-  //   const { mockXHR } = require('../mock')
+//   const { mockXHR } = require('../mock')
-  //   mockXHR()
+//   mockXHR()
 }
 // set ElementUI lang to EN
 // Vue.use(ElementUI, { locale })
 // 如果想要中文版 element-ui，按如下方式声明
-ElementUI.Dialog.props.closeOnClickModal.default = false;
+ElementUI.Dialog.props.closeOnClickModal.default = false
-ElementUI.Dialog.props.closeOnPressEscape.default = false;
+ElementUI.Dialog.props.closeOnPressEscape.default = false
 Vue.use(ElementUI, {
-  size: Cookies.get("size") || "medium", // set element-ui default size
+  size: Cookies.get('size') || 'medium', // set element-ui default size
-  i18n: (key, value) => i18n.t(key, value),
+  i18n: (key, value) => i18n.t(key, value)
-});
+})
 Vue.use(Fit2CloudUI, {
-  i18n: (key, value) => i18n.t(key, value),
+  i18n: (key, value) => i18n.t(key, value)
-});
+})
 // Vue.use(VueAxios, axios)
-Vue.use(filter);
+Vue.use(filter)
-Vue.use(directives);
+Vue.use(directives)
-Vue.use(message);
+Vue.use(message)
-Vue.component("Treeselect", Treeselect);
+Vue.component('Treeselect', Treeselect)
-Vue.component("DeComplexInput", DeComplexInput);
+Vue.component('DeComplexInput', DeComplexInput)
-Vue.component("DeComplexSelect", DeComplexSelect);
+Vue.component('DeComplexSelect', DeComplexSelect)
-Vue.component("DeViewSelect", DeViewSelect);
+Vue.component('DeViewSelect', DeViewSelect)
-Vue.component("RemarkEditor", RemarkEditor);
+Vue.component('RemarkEditor', RemarkEditor)
-Vue.component("TitleRemark", TitleRemark);
+Vue.component('TitleRemark', TitleRemark)
-Vue.component("DeBtn", deBtn);
+Vue.component('DeBtn', deBtn)
-Vue.config.productionTip = false;
+Vue.config.productionTip = false
-Vue.use(vueToPdf);
+Vue.use(vueToPdf)
-Vue.use(VueVideoPlayer);
+Vue.use(VueVideoPlayer)
-Vue.use(proportion);
+Vue.use(proportion)
-Vue.prototype.hasDataPermission = function (pTarget, pSource) {
+Vue.prototype.hasDataPermission = function(pTarget, pSource) {
-  if (this.$store.state.user.user.isAdmin || pSource === "ignore") {
+  if (this.$store.state.user.user.isAdmin || pSource === 'ignore') {
-    return true;
+    return true
  }
  if (pSource && pTarget) {
-    return pSource.indexOf(pTarget) > -1;
+    return pSource.indexOf(pTarget) > -1
  }
-  return false;
+  return false
-};
+}
-Vue.prototype.checkPermission = function (pers) {
+Vue.prototype.checkPermission = function(pers) {
-  const permissions = store.getters.permissions;
+  const permissions = store.getters.permissions
-  const hasPermission = pers.every((needP) => {
+  const hasPermission = pers.every(needP => {
-    const result = permissions.includes(needP);
+    const result = permissions.includes(needP)
-    return result;
+    return result
-  });
+  })
-  return hasPermission;
+  return hasPermission
-};
+}
-Vue.use(deWebsocket);
+Vue.use(deWebsocket)
-Vue.prototype.$currentHttpRequestList = new Map();
+Vue.prototype.$currentHttpRequestList = new Map()
-Vue.prototype.$cancelRequest = function (cancelkey) {
+Vue.prototype.$cancelRequest = function(cancelkey) {
  if (cancelkey) {
-    if (cancelkey.indexOf("/**") > -1) {
+    if (cancelkey.indexOf('/**') > -1) {
      Vue.prototype.$currentHttpRequestList.forEach((item, key) => {
-        key.indexOf(cancelkey.split("/**")[0]) > -1 &&
+        key.indexOf(cancelkey.split('/**')[0]) > -1 && item('Operation canceled by the user.')
-          item("Operation canceled by the user.");
+      })
-      });
    } else {
-      Vue.prototype.$currentHttpRequestList.get(cancelkey) &&
+      Vue.prototype.$currentHttpRequestList.get(cancelkey) && Vue.prototype.$currentHttpRequestList.get(cancelkey)('Operation canceled by the user.')
-        Vue.prototype.$currentHttpRequestList.get(cancelkey)(
-          "Operation canceled by the user."
-        );
    }
  }
-};
+}
 new Vue({
  router,
  store,
  i18n,
-  render: (h) => h(App),
+  render: h => h(App)
-}).$mount("#app");
+}).$mount('#app')
--- a/src/permission.js
+++ b/src/permission.js
--- a/src/router/index.js
+++ b/src/router/index.js
-import Vue from "vue";
+import Vue from 'vue'
-import Router from "vue-router";
+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(.*)",
+        path: '/redirect/:path(.*)',
-        component: () => import("@/views/redirect/index"),
+        component: () => import('@/views/redirect/index')
-      },
+      }
-    ],
+    ]
  },
  {
-    path: "/login",
+    path: '/login',
-    component: () => import("@/views/login/index"),
+    component: () => import('@/views/login/index'),
-    hidden: true,
+    hidden: true
  },
  {
-    path: "/404",
+    path: '/404',
-    component: () => import("@/views/404"),
+    component: () => import('@/views/404'),
-    hidden: true,
+    hidden: true
  },
  {
-    path: "/401",
+    path: '/401',
-    component: (resolve) => require(["@/views/401"], resolve),
+    component: (resolve) => require(['@/views/401'], resolve),
-    hidden: true,
+    hidden: true
  },
  {
-    path: "/panelEdit",
+    path: '/panelEdit',
    component: Layout,
-    redirect: "/panelEdit/edit",
+    redirect: '/panelEdit/edit',
    hidden: true,
    children: [
      {
-        path: "edit",
+        path: 'edit',
-        component: () => import("@/views/panel/edit"),
+        component: () => import('@/views/panel/edit')
-      },
+      }
-    ],
+    ]
  },
  {
-    path: "/delink",
+    path: '/delink',
-    component: () => import("@/views/link"),
+    component: () => import('@/views/link'),
-    hidden: true,
+    hidden: true
  },
  {
-    path: "/preview/:reportId",
+    path: '/preview/:reportId',
-    component: () =>
+    component: () => import('@/components/canvas/components/editor/PreviewEject'),
-      import("@/components/canvas/components/editor/PreviewEject"),
+    hidden: true
-    hidden: true,
  },
  {
-    path: "/previewScreenShot/:reportId/:backScreenShot",
+    path: '/previewScreenShot/:reportId/:backScreenShot',
-    component: () =>
+    component: () => import('@/components/canvas/components/editor/PreviewEject'),
-      import("@/components/canvas/components/editor/PreviewEject"),
+    hidden: true
-    hidden: true,
  },
  {
-    path: "/previewFullScreen",
+    path: '/previewFullScreen',
-    component: () =>
+    component: () => import('@/components/canvas/components/editor/PreviewFullScreen'),
-      import("@/components/canvas/components/editor/PreviewFullScreen"),
+    hidden: true
-    hidden: true,
  },
  {
-    path: "/de-auto-login",
+    path: '/de-auto-login',
-    component: () => import("@/views/DeAutoLogin"),
+    component: () => import('@/views/DeAutoLogin'),
-    hidden: true,
+    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 = () =>
+const createRouter = () => new Router({
-  new Router({
+  //   mode: 'history', // require service support
-    //   mode: 'history', // require service support
+  mode: 'hash',
-    mode: "hash",
+  scrollBehavior: () => ({ y: 0 }),
-    scrollBehavior: () => ({ y: 0 }),
+  routes: constantRoutes
-    routes: [],
+})
-  });
-const router = createRouter();
+const router = createRouter()
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
-  const newRouter = createRouter();
+  const newRouter = createRouter()
-  router.matcher = newRouter.matcher; // reset router
+  router.matcher = newRouter.matcher // reset router
 }
-export default router;
+export default router
--- a/src/utils/index.js
+++ b/src/utils/index.js
--- a/src/views/chart/components/ChartComponent.vue
+++ b/src/views/chart/components/ChartComponent.vue
@@ -481,9 +481,11 @@ export default {
    trackClick(trackAction) {
      const param = this.pointParam
      if (!param || !param.data || !param.data.dimensionList) {
-        // 地图提示没有关联字段 其他没有维度信息的 直接返回
        if (this.chart.type === 'map') {
-          this.$warning(this.$t('panel.no_drill_field'))
+          const zoom = this.myChart.getOption().geo[0].zoom
+          if (zoom <= 1) {
+            this.$warning(this.$t('panel.no_drill_field'))
+          }
        }
        return
      }

--- a/src/views/chart/components/componentStyle/dialog/RemarkEditor.vue
+++ b/src/views/chart/components/componentStyle/dialog/RemarkEditor.vue
@@ -14,6 +14,22 @@
 <script>
 import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示
 import Editor from '@tinymce/tinymce-vue'
+import 'tinymce/themes/silver/theme' // 编辑器主题
+import 'tinymce/icons/default' // 引入编辑器图标icon，不引入则不显示对应图标
+// 引入编辑器插件（基本免费插件都在这儿了）
+import 'tinymce/plugins/advlist' // 高级列表
+import 'tinymce/plugins/autolink' // 自动链接
+import 'tinymce/plugins/link' // 超链接
+import 'tinymce/plugins/image' // 插入编辑图片
+import 'tinymce/plugins/lists' // 列表插件
+import 'tinymce/plugins/charmap' // 特殊字符
+import 'tinymce/plugins/media' // 插入编辑媒体
+import 'tinymce/plugins/wordcount' // 字数统计
+import 'tinymce/plugins/table' // 表格
+import 'tinymce/plugins/contextmenu' // contextmenu
+import 'tinymce/plugins/directionality'
+import 'tinymce/plugins/nonbreaking'
+import 'tinymce/plugins/pagebreak'
 import { imgUrlTrans } from '@/components/canvas/utils/utils'
 import { mapState } from 'vuex'
 // 编辑器引入

--- a/src/views/chart/components/dragItem/QuotaExtItem.vue
+++ b/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)
    }
  }

--- a/src/views/chart/components/filter/QuotaFilterEditor.vue
+++ b/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: ''
    }

--- a/src/views/chart/components/filter/ResultFilterEditor.vue
+++ b/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: [],

--- a/src/views/chart/view/ChartEdit.vue
+++ b/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'

--- a/src/views/chart/view/PositionAdjust.vue
+++ b/src/views/chart/view/PositionAdjust.vue
@@ -81,7 +81,7 @@ export default {
  props: {},
  data() {
    return {
-      maxHeight: 2000,
+      maxHeight: 10000,
      maxTop: 20000
    }
  },

--- a/src/views/chart/view/TitleRemark.vue
+++ b/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"

--- a/src/views/dataset/common/DatasetChartDetail.vue
+++ b/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.isPlugin && detail.chart.type && detail.chart.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + detail.chart.type + '/svg') : detail.chart.type"
-              :icon-class="detail.chart.type"
+              class="chart-icon"
            />
          </el-col>
          <el-col class="info-item">

--- a/src/views/dataset/data/components/LazyTree.vue
+++ b/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

--- a/src/views/dataset/group/GroupMoveSelector.vue
+++ b/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>

--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -216,6 +216,7 @@ import { changeFavicon, showMultiLoginMsg } from '@/utils/index'
 import { initTheme } from '@/utils/ThemeUtil'
 import PluginCom from '@/views/system/plugin/PluginCom'
 import Cookies from 'js-cookie'
+import xss from 'xss'
 export default {
  name: 'Login',
  components: { PluginCom },
@@ -449,7 +450,27 @@ export default {
        this.showFoot = this.uiInfo['ui.showFoot'].paramValue === true || this.uiInfo['ui.showFoot'].paramValue === 'true'
        if (this.showFoot) {
          const content = this.uiInfo['ui.footContent'] && this.uiInfo['ui.footContent'].paramValue
-          this.footContent = content
+          const myXss = new xss.FilterXSS({
+            css: {
+              whiteList: {
+                'background-color': true,
+                'text-align': true,
+                'color': true,
+                'margin-top': true,
+                'margin-bottom': true,
+                'line-height': true,
+                'box-sizing': true,
+                'padding-top': true,
+                'padding-bottom': true
+              }
+            },
+            whiteList: {
+              ...xss.whiteList,
+              p: ['style'],
+              span: ['style']
+            }
+          })
+          this.footContent = myXss.process(content)
        }
      }
    },

--- a/src/views/panel/export/PDFPreExport.vue
+++ b/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>

--- a/src/views/panel/filter/FilterDialog.vue
+++ b/src/views/panel/filter/FilterDialog.vue
@@ -266,6 +266,7 @@
      <div v-if="currentElement.options && currentElement.options.attrs">
        <filter-head
          :element="currentElement"
+          @dataset-name="dataSetName"
        />
        <filter-control
@@ -463,6 +464,23 @@ export default {
    bus.$off('valid-values-change', this.validateFilterValue)
  },
  methods: {
+    dataSetName(tableId, callback) {
+      let result = null
+      if (tableId) {
+        const stack = [...this.defaultData]
+        while (stack.length) {
+          const tableNode = stack.pop()
+          if (tableNode.id === tableId) {
+            result = tableNode.name
+            break
+          }
+          if (tableNode.children?.length) {
+            tableNode.children.forEach(kid => stack.push(kid))
+          }
+        }
+      }
+      callback && callback(result)
+    },
    async checkSuperior(list, anotherTableIds) {
      let fieldValid = false
      const fieldId = this.myAttrs?.fieldId

--- a/src/views/panel/filter/filterMain/FilterHead.vue
+++ b/src/views/panel/filter/filterMain/FilterHead.vue
@@ -25,6 +25,7 @@
                    :key="item.id"
                    :item="item"
                    :index="index"
+                    :tool-tip="getTableName(item.tableId)"
                    @closeItem="closeItem"
                  />
@@ -70,7 +71,12 @@ export default {
  },
  methods: {
+    getTableName(tableId) {
+      let tableName = null
+      this.$emit('dataset-name', tableId, t => { tableName = t })
+      console.log(tableName)
+      return tableName
+    },
    onMove(e, originalEvent) {
      return true
    },

--- a/src/views/panel/list/PanelList.vue
+++ b/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) => {

--- a/src/views/panel/list/PanelViewShow.vue
+++ b/src/views/panel/list/PanelViewShow.vue
@@ -249,6 +249,7 @@
            <Preview
              v-if="showMainFlag"
              ref="paneViewPreviewRef"
+              :class="fullscreen && 'fullscreen-visual-selects'"
              :component-data="mainCanvasComponentData"
              :canvas-style-data="canvasStyleData"
              :active-tab="activeTab"
@@ -923,5 +924,12 @@ export default {
  color: inherit;
  margin-right: 5px;
 }
+.fullscreen-visual-selects {
+  .VisualSelects {
+    top: inherit !important;
+    left: inherit !important;
+  }
+}
 </style>
--- a/src/views/system/user/index.vue
+++ b/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>

--- a/src/views/wizard/WizardCard.vue
+++ b/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') }}

--- a/src/views/wizard/WizardCardEnterprise.vue
+++ b/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') }}

--- a/src/views/wizard/details/CardDetail.vue
+++ b/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>

--- a/src/views/wizard/details/LatestDevelopments.vue
+++ b/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>

--- a/vue.config.js
+++ b/vue.config.js
-"use strict";
+'use strict'
-const path = require("path");
+const path = require('path')
-const defaultSettings = require("./src/settings.js");
+const defaultSettings = require('./src/settings.js')
-const pkg = require("./package.json");
+const pkg = require('./package.json')
-const CopyWebpackPlugin = require("copy-webpack-plugin");
+const CopyWebpackPlugin = require('copy-webpack-plugin')
 // const CompressionPlugin = require('compression-webpack-plugin')
-const webpack = require("webpack");
+const webpack = require('webpack')
-const AddAssetHtmlPlugin = require("add-asset-html-webpack-plugin");
+const AddAssetHtmlPlugin = require('add-asset-html-webpack-plugin')
 function resolve(dir) {
-  return path.join(__dirname, dir);
+  return path.join(__dirname, dir)
 }
-const name = defaultSettings.title || "vue Admin Template"; // page title
+const name = defaultSettings.title || 'vue Admin Template' // page title
-const port = process.env.port || process.env.npm_config_port || 9528; // dev port
+const port = process.env.port || process.env.npm_config_port || 9528 // dev port
-const parallel = process.env.NODE_ENV === "development";
+const parallel = process.env.NODE_ENV === 'development'
 module.exports = {
  productionSourceMap: true,
  parallel,
@@ -23,78 +23,76 @@ module.exports = {
  devServer: {
    port: port,
    proxy: {
-      "^(?!/login)": {
+      '^(?!/login)': {
-        target: "http://192.168.1.100:8081/",
+        target: 'http://localhost:8081/',
-        ws: true,
+        ws: true
-      },
+      }
    },
    open: true,
    overlay: {
      warnings: false,
-      errors: true,
+      errors: true
-    },
+    }
  },
  pages: {
    index: {
-      entry: "src/main.js",
+      entry: 'src/main.js',
-      template: "public/index.html",
+      template: 'public/index.html',
-      filename: "index.html",
+      filename: 'index.html'
-    },
+    }
  },
  configureWebpack: {
    name: name,
-    devtool: "source-map",
+    devtool: 'source-map',
    resolve: {
      alias: {
-        "@": resolve("src"),
+        '@': resolve('src')
-      },
+      }
+    },
+    output: process.env.NODE_ENV === 'development' ? {} : {
+      filename: `js/[name].[contenthash:8].${pkg.version}.js`,
+      publicPath: '/',
+      chunkFilename: `js/[name].[contenthash:8].${pkg.version}.js`
    },
-    output:
-      process.env.NODE_ENV === "development"
-        ? {}
-        : {
-            filename: `js/[name].[contenthash:8].${pkg.version}.js`,
-            publicPath: "/",
-            chunkFilename: `js/[name].[contenthash:8].${pkg.version}.js`,
-          },
    plugins: [
      new CopyWebpackPlugin([
        {
-          from: path.join(__dirname, "static"),
+          from: path.join(__dirname, 'static'),
-          to: path.join(__dirname, "dist/static"),
+          to: path.join(__dirname, 'dist/static')
-        },
+        }
      ]),
      new webpack.DllReferencePlugin({
        context: process.cwd(),
-        manifest: require("./public/vendor/vendor-manifest.json"),
+        manifest: require('./public/vendor/vendor-manifest.json')
      }),
      // 将 dll 注入到 生成的 html 模板中
      new AddAssetHtmlPlugin({
        // dll文件位置
-        filepath: path.resolve(__dirname, "./public/vendor/*.js"),
+        filepath: path.resolve(__dirname, './public/vendor/*.js'),
        // dll 引用路径
-        publicPath: "./vendor",
+        publicPath: './vendor',
        // dll最终输出的目录
-        outputPath: "./vendor",
+        outputPath: './vendor'
-      }),
+      })
-    ],
+    ]
  },
-  chainWebpack: (config) => {
+  chainWebpack: config => {
-    config.module.rules.delete("svg"); // 删除默认配置中处理svg,
+    config.module.rules.delete('svg') // 删除默认配置中处理svg,
    // const svgRule = config.module.rule('svg')
    // svgRule.uses.clear()
    config.module
-      .rule("svg-sprite-loader")
+      .rule('svg-sprite-loader')
      .test(/\.svg$/)
-      .include.add(resolve("src/icons")) // 处理svg目录
+      .include
+      .add(resolve('src/icons')) // 处理svg目录
      .end()
-      .use("svg-sprite-loader")
+      .use('svg-sprite-loader')
-      .loader("svg-sprite-loader")
+      .loader('svg-sprite-loader')
      .options({
-        symbolId: "icon-[name]",
+        symbolId: 'icon-[name]'
-      });
+      })
-    if (process.env.NODE_ENV === "production") {
+    if (process.env.NODE_ENV === 'production') {
      /* config.plugin('compressionPlugin').use(new CompressionPlugin({
        test: /\.(js|css|less)$/, // 匹配文件名
        threshold: 10240, // 对超过10k的数据压缩
@@ -104,24 +102,25 @@ module.exports = {
    }
    config.module
-      .rule("icons")
+      .rule('icons')
      .test(/\.svg$/)
-      .include.add(resolve("src/deicons"))
+      .include.add(resolve('src/deicons'))
      .end()
-      .use("svg-sprite-loader")
+      .use('svg-sprite-loader')
-      .loader("svg-sprite-loader")
+      .loader('svg-sprite-loader')
      .options({
-        symbolId: "[name]",
+        symbolId: '[name]'
-      });
+      })
  },
  css: {
    loaderOptions: {
      sass: {
-        prependData: `@import "@/style/index.scss"`,
+        prependData: `@import "@/style/index.scss"`
-      },
+      }
    },
    extract: {
-      ignoreOrder: true,
+      ignoreOrder: true
-    },
+    }
-  },
+  }
-};
+}