Merge branch 'main' of http://192.168.1.13:3000/zcy/canneng-admin

src/components/table/fieldRender/index.vue

@@ -40,9 +40,10 @@
     </div>
 
     <!-- customTemplate 自定义模板 -->
-    <div v-if="field.render == 'customTemplate'">
-        {{ field.customTemplate ? field.customTemplate(row, field, fieldValue, column, index) : '' }}
-    </div>
+    <div
+        v-if="field.render == 'customTemplate'"
+        v-html="field.customTemplate ? field.customTemplate(row, field, fieldValue, column, index) : ''"
+    ></div>
 
     <!-- 自定义组件/函数渲染 -->
     <component
@@ -145,7 +146,8 @@ import { ref, inject } from 'vue'
 import type { TagProps } from 'element-plus'
 import type TableStoreClass from '@/utils/tableStore'
 import { fullUrl, timeFormat } from '@/utils/common'
-import { VxeColumnProps } from 'vxe-table/types/all'
+import type { VxeColumnProps } from 'vxe-table'
+
 const TableStore = inject('tableStore') as TableStoreClass
 
 interface Props {