From 551db54b646d40e6ed518b7c11fd06ab12ed860b Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Thu, 9 Jan 2025 10:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BD=BF=E7=94=A8v-html=E6=B8=B2=E6=9F=93=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E9=AB=98=E6=B8=B2=E6=9F=93=E9=80=9F=E5=BA=A6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 io.sc.platform.core.frontend/.eslintrc.cjs                    | 1 +
 .../src/platform/components/grid/Header.vue                   | 4 ++--
 .../src/platform/components/grid/TdContent.vue                | 2 +-
 .../src/platform/components/grid/WGrid.vue                    | 4 ++--
 .../platform/components/grid/extra/append/AppendContent.vue   | 2 +-
 .../src/platform/components/grid/extra/append/AppendRow.vue   | 2 +-
 .../src/platform/components/grid/ts/function/RowData.ts       | 4 ++--
 .../src/platform/components/panel/WInfoPanel.vue              | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/io.sc.platform.core.frontend/.eslintrc.cjs b/io.sc.platform.core.frontend/.eslintrc.cjs
index 90511fd3..3c6261c6 100644
--- a/io.sc.platform.core.frontend/.eslintrc.cjs
+++ b/io.sc.platform.core.frontend/.eslintrc.cjs
@@ -66,5 +66,6 @@ module.exports = {
     'prefer-rest-params': 'off',
     'no-control-regex': 'off',
     'no-case-declarations': 'off',
+    'vue/no-v-html': 'off'
   },
 };
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue b/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue
index 2915ac87..3cb937ae 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/Header.vue
@@ -28,7 +28,7 @@
         style="font-weight: bold"
         :title="c.title"
       >
-        <span v-dompurify-html="Tools.isUndefinedOrNull(c.label) ? '' : c.label"></span>
+        <span v-html="Tools.isUndefinedOrNull(c.label) ? '' : c.label"></span>
       </q-th>
     </q-tr>
     <q-tr v-if="tools.table.rows.length === 0" :style="tools.cm.noDataStyle.value" class="noDataTr">
@@ -58,7 +58,7 @@
           style="font-weight: bold"
           :title="col.title"
         >
-          <span v-dompurify-html="Tools.isUndefinedOrNull(col.label) ? '' : col.label"></span>
+          <span v-html="Tools.isUndefinedOrNull(col.label) ? '' : col.label"></span>
         </q-th>
       </template>
     </q-tr>
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/TdContent.vue b/io.sc.platform.core.frontend/src/platform/components/grid/TdContent.vue
index 15f4ddcf..75b327e5 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/TdContent.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/TdContent.vue
@@ -10,7 +10,7 @@
     <component :is="value.componentType" v-bind="value.attrs"></component>
   </template>
   <template v-else>
-    <span v-dompurify-html="Tools.isUndefinedOrNull(value) ? '' : value"></span>
+    <span v-html="Tools.isUndefinedOrNull(value) ? '' : value"></span>
   </template>
 </template>
 
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
index b825dfa9..ff93caaf 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
@@ -156,14 +156,14 @@ watchEffect(() => {
 });
 
 // 表格挂载完成后钩子函数
-onMounted(() => {
+onMounted(async () => {
   tools.opFM.propsValidate();
   if (tools.table.columns?.length > tools.table.originalColumns?.length) {
     tools.titleFM.handleColumnTitle();
   }
   topRef.value?.handleQueryFormShowField();
   if (props.autoFetchData && (!Tools.isEmpty(props.dataUrl) || !Tools.isEmpty(props.fetchDataUrl))) {
-    tools.reqApiFM.fetchData({
+    await tools.reqApiFM.fetchData({
       pagination: tools.table.store.pagination,
     });
   } else {
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/extra/append/AppendContent.vue b/io.sc.platform.core.frontend/src/platform/components/grid/extra/append/AppendContent.vue
index cb445290..9f871d44 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/extra/append/AppendContent.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/extra/append/AppendContent.vue
@@ -3,7 +3,7 @@
     <component :is="props.value.componentType" v-bind="props.value.attrs"></component>
   </template>
   <template v-else>
-    <span v-dompurify-html="!Tools.isEmpty(props.value) ? props.value : ''"></span>
+    <span v-html="!Tools.isEmpty(props.value) ? props.value : ''"></span>
   </template>
 </template>
 
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/extra/append/AppendRow.vue b/io.sc.platform.core.frontend/src/platform/components/grid/extra/append/AppendRow.vue
index 755f3ddc..1d5ff6f6 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/extra/append/AppendRow.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/extra/append/AppendRow.vue
@@ -6,7 +6,7 @@
           <AppendContent :value="col.value({ grid: tools.instance, rows: tools.apiFM.getData.getRows() })"></AppendContent>
         </template>
         <template v-else>
-          <span v-dompurify-html="!Tools.isEmpty(col['value']) ? col['value'] : ''"></span>
+          <span v-html="!Tools.isEmpty(col['value']) ? col['value'] : ''"></span>
         </template>
       </q-td>
     </q-tr>
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts
index 8c03683e..dd845f90 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts
@@ -132,7 +132,7 @@ export class RowData extends Base {
    * @param rows
    * @returns
    */
-  public async setExtraProperty(rows: Array<any>, ops?: any, lazyloadNoChildren: boolean = false) {
+  public setExtraProperty(rows: Array<any>, ops?: any, lazyloadNoChildren: boolean = false) {
     // 清空分组记录
     this.table.configStore.aloneGroupRecords = [];
     // 重置分组行下标
@@ -362,7 +362,7 @@ export class RowData extends Base {
    * 初始化行数据附加属性
    * @param rowData 行数据对象
    */
-  private async initRowDataExtraProperty(rowData: any, lazyloadNoChildren: boolean = false) {
+  private initRowDataExtraProperty(rowData: any, lazyloadNoChildren: boolean = false) {
     rowData[Constant.FIELD_NAMES.ROW_KEY] = Tools.uuid();
     rowData[this.props.tickedField] = this.getInitRowTicked(rowData);
     rowData[this.props.selectedField] = this.getInitRowSelected(rowData);
diff --git a/io.sc.platform.core.frontend/src/platform/components/panel/WInfoPanel.vue b/io.sc.platform.core.frontend/src/platform/components/panel/WInfoPanel.vue
index 7d8a30c0..dfbd444b 100644
--- a/io.sc.platform.core.frontend/src/platform/components/panel/WInfoPanel.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/panel/WInfoPanel.vue
@@ -14,7 +14,7 @@
                   <component :is="tdItem.value.componentType" v-bind="tdItem.value.attrs"></component>
                 </template>
                 <template v-else>
-                  <span v-dompurify-html="Tools.isUndefinedOrNull(tdItem.value) ? '' : tdItem.value"></span>
+                  <span v-html="Tools.isUndefinedOrNull(tdItem.value) ? '' : tdItem.value"></span>
                 </template>
               </td>
             </template>