af-mobile-client-vue3 1.2.59 → 1.3.2

package/src/components/data/XFormItem/index.vue

@@ -2,7 +2,6 @@
 import type { FieldType } from 'vant'
 import type { Numeric } from 'vant/es/utils'
 import ImageUploader from '@af-mobile-client-vue3/components/core/ImageUploader/index.vue'
-import Uploader from '@af-mobile-client-vue3/components/core/Uploader/index.vue'
 import XGridDropOption from '@af-mobile-client-vue3/components/core/XGridDropOption/index.vue'
 import XMultiSelect from '@af-mobile-client-vue3/components/core/XMultiSelect/index.vue'
 import XSelect from '@af-mobile-client-vue3/components/core/XSelect/index.vue'
@@ -964,29 +963,9 @@ function findOptionInTree(options, value) {
     </VanField>
 
     <!-- 文件上传 -->
-    <VanField
-      v-if="attr.type === 'file' && showItem"
-      name="uploader"
-      :label="labelData"
-      :label-align="labelAlign"
-      :input-align="attr.inputAlign ? attr.inputAlign : 'left'"
-      :rules="[{ required: attr.rule.required === 'true', message: `请选择${attr.name}` }]"
-      :required="attr.rule.required === 'true'"
-    >
-      <template #input>
-        <!--      <van-uploader v-model="localValue" /> -->
-        <Uploader
-          upload-mode="server"
-          :image-list="(modelData as any[])"
-          authority="admin"
-          @update-file-list="updateFile"
-        />
-      </template>
-    </VanField>
-
     <!-- 图片上传, 手机端拍照 -->
     <VanField
-      v-if="attr.type === 'image' && showItem"
+      v-if="(attr.type === 'image' || attr.type === 'file') && showItem"
       name="image"
       :label="labelData"
       :label-align="labelAlign"
@@ -1000,6 +979,7 @@ function findOptionInTree(options, value) {
           :image-list="(modelData as any[])"
           authority="admin"
           :attr="attr"
+          :mode="props.mode"
           @update-file-list="updateFile"
         />
       </template>

package/src/components/data/XOlMap/utils/wgs84ToGcj02.js

@@ -1,154 +1,154 @@
-// 导入proj控件
-import * as proj from 'ol/proj'
-
-function forEachPoint(func) {
-  return function (input, opt_output, opt_dimension) {
-    const len = input.length
-
-    const dimension = opt_dimension || 2
-    let output
-
-    if (opt_output) {
-      output = opt_output
-    }
-    else {
-      if (dimension !== 2) {
-        output = input.slice()
-      }
-      else {
-        output = [len]
-      }
-    }
-    for (let offset = 0; offset < len; offset += dimension) {
-      func(input, output, offset)
-    }
-    return output
-  }
-}
-
-const gcj02 = {}
-const PI = Math.PI
-const AXIS = 6378245.0
-// eslint-disable-next-line no-loss-of-precision
-const OFFSET = 0.00669342162296594323 // (a^2 - b^2) / a^2
-
-function delta(wgLon, wgLat) {
-  let dLat = transformLat(wgLon - 105.0, wgLat - 35.0)
-  let dLon = transformLon(wgLon - 105.0, wgLat - 35.0)
-  const radLat = (wgLat / 180.0) * PI
-  let magic = Math.sin(radLat)
-  magic = 1 - OFFSET * magic * magic
-  const sqrtMagic = Math.sqrt(magic)
-  dLat = (dLat * 180.0) / (((AXIS * (1 - OFFSET)) / (magic * sqrtMagic)) * PI)
-  dLon = (dLon * 180.0) / ((AXIS / sqrtMagic) * Math.cos(radLat) * PI)
-  return [dLon, dLat]
-}
-
-function outOfChina(lon, lat) {
-  if (lon < 72.004 || lon > 137.8347) {
-    return true
-  }
-  return lat < 0.8293 || lat > 55.8271
-}
-
-function transformLat(x, y) {
-  let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
-  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
-  ret += ((20.0 * Math.sin(y * PI) + 40.0 * Math.sin((y / 3.0) * PI)) * 2.0) / 3.0
-  ret += ((160.0 * Math.sin((y / 12.0) * PI) + 320 * Math.sin((y * PI) / 30.0)) * 2.0) / 3.0
-  return ret
-}
-
-function transformLon(x, y) {
-  let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
-  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
-  ret += ((20.0 * Math.sin(x * PI) + 40.0 * Math.sin((x / 3.0) * PI)) * 2.0) / 3.0
-  ret += ((150.0 * Math.sin((x / 12.0) * PI) + 300.0 * Math.sin((x / 30.0) * PI)) * 2.0) / 3.0
-  return ret
-}
-
-gcj02.toWGS84 = forEachPoint((input, output, offset) => {
-  let lng = input[offset]
-  let lat = input[offset + 1]
-  if (!outOfChina(lng, lat)) {
-    const deltaD = delta(lng, lat)
-    lng = lng - deltaD[0] // 改回减法
-    lat = lat - deltaD[1] // 改回减法
-  }
-  output[offset] = lng
-  output[offset + 1] = lat
-})
-
-gcj02.fromWGS84 = forEachPoint((input, output, offset) => {
-  let lng = input[offset]
-  let lat = input[offset + 1]
-  if (!outOfChina(lng, lat)) {
-    const deltaD = delta(lng, lat)
-    lng = lng + deltaD[0] // 改回加法
-    lat = lat + deltaD[1] // 改回加法
-  }
-  output[offset] = lng
-  output[offset + 1] = lat
-})
-
-const sphericalMercator = {}
-const RADIUS = 6378137
-const MAX_LATITUDE = 85.0511287798
-const RAD_PER_DEG = Math.PI / 180
-
-sphericalMercator.forward = forEachPoint((input, output, offset) => {
-  const lat = Math.max(Math.min(MAX_LATITUDE, input[offset + 1]), -MAX_LATITUDE)
-  const sin = Math.sin(lat * RAD_PER_DEG)
-  output[offset] = RADIUS * input[offset] * RAD_PER_DEG
-  output[offset + 1] = (RADIUS * Math.log((1 + sin) / (1 - sin))) / 2
-})
-
-sphericalMercator.inverse = forEachPoint((input, output, offset) => {
-  output[offset] = input[offset] / RADIUS / RAD_PER_DEG
-  output[offset + 1] = (2 * Math.atan(Math.exp(input[offset + 1] / RADIUS)) - Math.PI / 2) / RAD_PER_DEG
-})
-
-const projzh = {}
-
-projzh.ll2gmerc = function (input, opt_output, opt_dimension) {
-  const output = gcj02.toWGS84(input, opt_output, opt_dimension) // 改用 toWGS84
-  return projzh.ll2smerc(output, output, opt_dimension)
-}
-
-projzh.gmerc2ll = function (input, opt_output, opt_dimension) {
-  const output = projzh.smerc2ll(input, input, opt_dimension)
-  return gcj02.fromWGS84(output, opt_output, opt_dimension) // 改用 fromWGS84
-}
-
-// smerc2gmerc 需要修改
-
-projzh.smerc2gmerc = function (input, opt_output, opt_dimension) {
-  let output = projzh.smerc2ll(input, input, opt_dimension)
-  output = gcj02.toWGS84(output, output, opt_dimension) // 这里应该用 toWGS84
-  return projzh.ll2smerc(output, output, opt_dimension)
-}
-
-// gmerc2smerc 需要修改
-
-projzh.gmerc2smerc = function (input, opt_output, opt_dimension) {
-  let output = projzh.smerc2ll(input, input, opt_dimension)
-  output = gcj02.fromWGS84(output, output, opt_dimension) // 这里应该用 fromWGS84
-  return projzh.ll2smerc(output, output, opt_dimension)
-}
-
-projzh.ll2smerc = sphericalMercator.forward
-projzh.smerc2ll = sphericalMercator.inverse
-
-// 定义WGS84转GCJ02的投影
-const extent = [-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]
-export const wgs84ToGcj02Projection = new proj.Projection({
-  code: 'WGS84-TO-GCJ02',
-  extent,
-  units: 'm',
-})
-
-// 添加投影和转换方法
-proj.addProjection(wgs84ToGcj02Projection)
-// 注意这里转换方法的顺序与原来相反
-proj.addCoordinateTransforms('EPSG:4326', wgs84ToGcj02Projection, projzh.ll2gmerc, projzh.gmerc2ll)
-proj.addCoordinateTransforms('EPSG:3857', wgs84ToGcj02Projection, projzh.smerc2gmerc, projzh.gmerc2smerc)
+// 导入proj控件
+import * as proj from 'ol/proj'
+
+function forEachPoint(func) {
+  return function (input, opt_output, opt_dimension) {
+    const len = input.length
+
+    const dimension = opt_dimension || 2
+    let output
+
+    if (opt_output) {
+      output = opt_output
+    }
+    else {
+      if (dimension !== 2) {
+        output = input.slice()
+      }
+      else {
+        output = [len]
+      }
+    }
+    for (let offset = 0; offset < len; offset += dimension) {
+      func(input, output, offset)
+    }
+    return output
+  }
+}
+
+const gcj02 = {}
+const PI = Math.PI
+const AXIS = 6378245.0
+// eslint-disable-next-line no-loss-of-precision
+const OFFSET = 0.00669342162296594323 // (a^2 - b^2) / a^2
+
+function delta(wgLon, wgLat) {
+  let dLat = transformLat(wgLon - 105.0, wgLat - 35.0)
+  let dLon = transformLon(wgLon - 105.0, wgLat - 35.0)
+  const radLat = (wgLat / 180.0) * PI
+  let magic = Math.sin(radLat)
+  magic = 1 - OFFSET * magic * magic
+  const sqrtMagic = Math.sqrt(magic)
+  dLat = (dLat * 180.0) / (((AXIS * (1 - OFFSET)) / (magic * sqrtMagic)) * PI)
+  dLon = (dLon * 180.0) / ((AXIS / sqrtMagic) * Math.cos(radLat) * PI)
+  return [dLon, dLat]
+}
+
+function outOfChina(lon, lat) {
+  if (lon < 72.004 || lon > 137.8347) {
+    return true
+  }
+  return lat < 0.8293 || lat > 55.8271
+}
+
+function transformLat(x, y) {
+  let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
+  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
+  ret += ((20.0 * Math.sin(y * PI) + 40.0 * Math.sin((y / 3.0) * PI)) * 2.0) / 3.0
+  ret += ((160.0 * Math.sin((y / 12.0) * PI) + 320 * Math.sin((y * PI) / 30.0)) * 2.0) / 3.0
+  return ret
+}
+
+function transformLon(x, y) {
+  let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
+  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
+  ret += ((20.0 * Math.sin(x * PI) + 40.0 * Math.sin((x / 3.0) * PI)) * 2.0) / 3.0
+  ret += ((150.0 * Math.sin((x / 12.0) * PI) + 300.0 * Math.sin((x / 30.0) * PI)) * 2.0) / 3.0
+  return ret
+}
+
+gcj02.toWGS84 = forEachPoint((input, output, offset) => {
+  let lng = input[offset]
+  let lat = input[offset + 1]
+  if (!outOfChina(lng, lat)) {
+    const deltaD = delta(lng, lat)
+    lng = lng - deltaD[0] // 改回减法
+    lat = lat - deltaD[1] // 改回减法
+  }
+  output[offset] = lng
+  output[offset + 1] = lat
+})
+
+gcj02.fromWGS84 = forEachPoint((input, output, offset) => {
+  let lng = input[offset]
+  let lat = input[offset + 1]
+  if (!outOfChina(lng, lat)) {
+    const deltaD = delta(lng, lat)
+    lng = lng + deltaD[0] // 改回加法
+    lat = lat + deltaD[1] // 改回加法
+  }
+  output[offset] = lng
+  output[offset + 1] = lat
+})
+
+const sphericalMercator = {}
+const RADIUS = 6378137
+const MAX_LATITUDE = 85.0511287798
+const RAD_PER_DEG = Math.PI / 180
+
+sphericalMercator.forward = forEachPoint((input, output, offset) => {
+  const lat = Math.max(Math.min(MAX_LATITUDE, input[offset + 1]), -MAX_LATITUDE)
+  const sin = Math.sin(lat * RAD_PER_DEG)
+  output[offset] = RADIUS * input[offset] * RAD_PER_DEG
+  output[offset + 1] = (RADIUS * Math.log((1 + sin) / (1 - sin))) / 2
+})
+
+sphericalMercator.inverse = forEachPoint((input, output, offset) => {
+  output[offset] = input[offset] / RADIUS / RAD_PER_DEG
+  output[offset + 1] = (2 * Math.atan(Math.exp(input[offset + 1] / RADIUS)) - Math.PI / 2) / RAD_PER_DEG
+})
+
+const projzh = {}
+
+projzh.ll2gmerc = function (input, opt_output, opt_dimension) {
+  const output = gcj02.toWGS84(input, opt_output, opt_dimension) // 改用 toWGS84
+  return projzh.ll2smerc(output, output, opt_dimension)
+}
+
+projzh.gmerc2ll = function (input, opt_output, opt_dimension) {
+  const output = projzh.smerc2ll(input, input, opt_dimension)
+  return gcj02.fromWGS84(output, opt_output, opt_dimension) // 改用 fromWGS84
+}
+
+// smerc2gmerc 需要修改
+
+projzh.smerc2gmerc = function (input, opt_output, opt_dimension) {
+  let output = projzh.smerc2ll(input, input, opt_dimension)
+  output = gcj02.toWGS84(output, output, opt_dimension) // 这里应该用 toWGS84
+  return projzh.ll2smerc(output, output, opt_dimension)
+}
+
+// gmerc2smerc 需要修改
+
+projzh.gmerc2smerc = function (input, opt_output, opt_dimension) {
+  let output = projzh.smerc2ll(input, input, opt_dimension)
+  output = gcj02.fromWGS84(output, output, opt_dimension) // 这里应该用 fromWGS84
+  return projzh.ll2smerc(output, output, opt_dimension)
+}
+
+projzh.ll2smerc = sphericalMercator.forward
+projzh.smerc2ll = sphericalMercator.inverse
+
+// 定义WGS84转GCJ02的投影
+const extent = [-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]
+export const wgs84ToGcj02Projection = new proj.Projection({
+  code: 'WGS84-TO-GCJ02',
+  extent,
+  units: 'm',
+})
+
+// 添加投影和转换方法
+proj.addProjection(wgs84ToGcj02Projection)
+// 注意这里转换方法的顺序与原来相反
+proj.addCoordinateTransforms('EPSG:4326', wgs84ToGcj02Projection, projzh.ll2gmerc, projzh.gmerc2ll)
+proj.addCoordinateTransforms('EPSG:3857', wgs84ToGcj02Projection, projzh.smerc2gmerc, projzh.gmerc2smerc)

package/src/components/data/XReportForm/XReportFormJsonRender.vue

@@ -81,10 +81,10 @@ initComponent()
 function initComponent() {
   for (let i = 0; i < props.jsonConfig.content.length; i++) {
     receivedFunction.push({
-      // eslint-disable-next-line no-eval
-      labelFunction: eval(`(${props.jsonConfig.content[i].customFunctionForLabel})`),
-      // eslint-disable-next-line no-eval
-      valueFunction: eval(`(${props.jsonConfig.content[i].customFunctionForValue})`),
+      // eslint-disable-next-line no-new-func
+      labelFunction: new Function(`return ${props.jsonConfig.content[i].customFunctionForLabel}`)(),
+      // eslint-disable-next-line no-new-func
+      valueFunction: new Function(`return ${props.jsonConfig.content[i].customFunctionForValue}`)(),
     })
   }
   formatConfig()
@@ -127,25 +127,25 @@ function initComponent() {
 </template>
 
 <style scoped lang="less">
-.main{
+.main {
   padding-top: 4vh;
   width: 100vw;
   height: 100vh;
   background-color: #eff2f5;
 
-  .title{
+  .title {
     padding-bottom: 2vh;
     color: rgb(50, 50, 51);
     text-align: center;
     margin: 0 0 3vh;
   }
 
-  .text_box{
+  .text_box {
     margin-top: 2vh;
     margin-bottom: 2vh;
   }
 
-  .main_text{
+  .main_text {
     padding-left: 16px;
     font-weight: 400;
     line-height: 1.6;
@@ -154,53 +154,53 @@ function initComponent() {
     font-size: 14px;
   }
 
-  .show_value_item{
+  .show_value_item {
     text-align: center;
     font-size: 1.2em;
   }
 
-  .cell_group{
+  .cell_group {
     margin-top: 2vh;
     margin-bottom: 2vh;
   }
 
-  .form_item{
+  .form_item {
     margin-top: 2vh;
   }
 
-  .button_group{
+  .button_group {
     text-align: center;
     margin-top: 3vh;
     margin-bottom: 3vh;
   }
 
-  .button_group>:first-child {
+  .button_group > :first-child {
     margin-right: 3vw;
   }
 
-  .divider{
+  .divider {
     color: #1989fa;
     border-color: #1989fa;
-    padding: 0 16px
+    padding: 0 16px;
   }
 
-  .submit_button{
+  .submit_button {
     background-color: #eff2f5;
     padding: 5vh;
   }
 }
 
-.skeleton{
-  margin-top: 5vh
+.skeleton {
+  margin-top: 5vh;
 }
-.my-cell-group{
-  margin: 0 0 10px 0
+.my-cell-group {
+  margin: 0 0 10px 0;
 }
 :deep(.van-collapse-item__content) {
   background-color: #eff2f5;
   padding: 10px 0;
 }
-:deep(.van-cell-group__title){
+:deep(.van-cell-group__title) {
   padding-top: 10px;
   padding-bottom: 10px;
 }
@@ -210,7 +210,7 @@ function initComponent() {
 :deep(.van-cell__title) {
   font-weight: 600;
 }
-:deep(.van-uploader__wrapper){
+:deep(.van-uploader__wrapper) {
   padding: 10px;
   display: flex;
   flex-wrap: wrap;

package/src/components/data/XReportForm/index.vue

@@ -143,10 +143,7 @@ function isFieldEmpty(value: any): boolean {
   if (Array.isArray(value) && value.length === 0) {
     return true
   }
-  if (typeof value === 'object' && Object.keys(value).length === 0) {
-    return true
-  }
-  return false
+  return typeof value === 'object' && Object.keys(value).length === 0
 }
 
 // 表单校验
@@ -432,16 +429,28 @@ function getConfigAndJoin(config: configDefine, outerLock: getConfigLock): void
   }
 }
 
-function deserializeFunctionAndRun(functionStr, value) {
-  // eslint-disable-next-line no-eval
-  const fun = eval(`(${functionStr})`)
-  return fun(value, activatedConfig)
+function deserializeFunctionAndRun(functionStr: string, value: any) {
+  try {
+    // eslint-disable-next-line no-new-func
+    const fun = new Function('value', 'activatedConfig', `return (${functionStr})(value, activatedConfig)`)
+    return fun(value, activatedConfig)
+  }
+  catch (err) {
+    console.error('Failed to deserialize and run function:', err)
+    return null
+  }
 }
 
-function deserializeFunctionAndRunWithConfig(functionStr) {
-  // eslint-disable-next-line no-eval
-  const fun = eval(`(${functionStr})`)
-  return fun(activatedConfig)
+function deserializeFunctionAndRunWithConfig(functionStr: string) {
+  try {
+    // eslint-disable-next-line no-new-func
+    const fun = new Function('activatedConfig', `return (${functionStr})(activatedConfig)`)
+    return fun(activatedConfig)
+  }
+  catch (err) {
+    console.error('Failed to deserialize and run function with config:', err)
+    return null
+  }
 }
 
 // 将table配置的表格转换为适合Form展示的格式
@@ -1009,9 +1018,9 @@ function getNow() {
                 <van-cell-group v-else-if="row.type === 'signature'" inset style="margin-top: 4vh">
                   <van-field
                     :label="row.valueText ? `${row.valueText}:` : ''"
-                    readonly
+
                     rows="1"
-                    autosize
+                    autosize readonly
                   >
                     <template #button>
                       <XSignature v-model="activatedConfig.data[row.dataIndex]" />

package/src/components/data/XReportGrid/XAddReport/XAddReport.vue

@@ -33,7 +33,7 @@ const attr = ref({})
 
 // Store
 const userStore = useUserStore()
-const { user: currUser } = storeToRefs(userStore)
+const currUser = storeToRefs(userStore)
 
 // Refs
 const mainRef = ref()
@@ -142,7 +142,6 @@ async function onSubmit() {
       if (result?.message) {
         showDialog({
           message: result.message,
-          type: messageType,
         })
       }
 

package/src/components/data/XReportGrid/XReport.vue

@@ -295,7 +295,7 @@ function exportData() {
 }
 
 function printDocument() {
-  const printContent = window.rawDocument.getElementById('printReady')
+  const printContent = (window as any).rawDocument.getElementById('printReady')
   // printElement(printContent)
   showDialog({ message: '操作成功！' })
 }
@@ -321,8 +321,8 @@ function configInit() {
   activeConfig.value.columns.forEach((row: any[]) => {
     row.forEach((cell) => {
       if (cell.dynamicDataIndex === true) {
-        // eslint-disable-next-line no-eval
-        const func = eval(`(${cell.customFunctionForDynamicDataIndex})`)
+        // eslint-disable-next-line no-new-func
+        const func = new Function(`return ${cell.customFunctionForDynamicDataIndex}`)()
         cell.dataIndex = func(config.value)
       }
       if (['action', 'click'].includes(cell.eventType) && cell.customFunction && !cell.events) {

package/src/components/data/XReportGrid/XReportDesign.vue

@@ -151,7 +151,7 @@ onMounted(() => {
 })
 
 // 监听
-watch(() => props.config, (newVal) => {
+watch(() => props.config, () => {
   // 配置变化时的处理
 }, { deep: true })
 
@@ -248,10 +248,10 @@ watch(() => activatedConfig.value, (val) => {
                   <span class="inputsDivItemLabel">{{ displayFormatStartText(item.format) }}</span>
                   <template v-if="!forDisplay">
                     <template v-if="item.inputReadOnly === true">
-                      <a-input v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" :disabled="true" />
+                      <van-field v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" :disabled="true" />
                     </template>
                     <template v-else>
-                      <a-input v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" />
+                      <van-field v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" />
                     </template>
                   </template>
                   <template v-else>
@@ -446,7 +446,7 @@ watch(() => activatedConfig.value, (val) => {
 </template>
 
 <style lang="less" scoped>
-.img{
+.img {
   width: 95%;
   height: 180px;
   object-fit: cover;
@@ -490,8 +490,8 @@ watch(() => activatedConfig.value, (val) => {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
 .reportMainForDisplay {
@@ -532,8 +532,8 @@ watch(() => activatedConfig.value, (val) => {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
 .reportMainNoPadding {
@@ -544,7 +544,7 @@ watch(() => activatedConfig.value, (val) => {
   // background-color: #fff;
   border-radius: 8px;
   height: auto;
-  min-height : 20vh;
+  min-height: 20vh;
   overflow-y: auto;
   overflow-x: hidden;
 
@@ -578,17 +578,17 @@ watch(() => activatedConfig.value, (val) => {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
-.tools{
+.tools {
   position: fixed;
   right: 2%;
   text-align: right;
   width: 60%;
   cursor: pointer;
-  .toolsItem{
+  .toolsItem {
     width: 15%;
     margin-right: 3%;
     display: inline-block;

package/src/components/data/XReportGrid/XReportDrawer/XReportDrawer.vue

@@ -31,7 +31,7 @@ const attr = ref({})
 
 // Store
 const userStore = useUserStore()
-const { user: currUser } = storeToRefs(userStore)
+const currUser = storeToRefs(userStore)
 
 // Refs
 const mainRef = ref()