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" > - + @@ -58,7 +58,7 @@ style="font-weight: bold" :title="col.title" > - + 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 @@ 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 @@ 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 @@ 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, ops?: any, lazyloadNoChildren: boolean = false) { + public setExtraProperty(rows: Array, 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 @@