flame-plus 0.1.16 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flame-plus",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "private": false,
   "description": "基于 element-plus 的组件库",
   "main": "packages/index.ts",

package/packages/components/page/flmReportPage/flmReportPage.vue

@@ -93,6 +93,8 @@ const props = defineProps({
 const emit = defineEmits(['customEvent'])
 const reportPageRef = ref()
 
+const safeTableName = computed(() => props.tableName.replace(/_/g, ''))
+
 let isLoaded: Ref<boolean> = ref(false)
 let reportPageConfig: Ref<ReportPageSetting> = ref({
   search: {},
@@ -169,7 +171,7 @@ const queryPageData = () => {
     ['page-size']: page_size = 20,
   }: ReportPageSetting['pagination'] = reportPageConfig.value.pagination
   request.flameApi.pageSearch({
-    tableName: props.tableName,
+    tableName: safeTableName.value,
     data: {
       page_no,
       page_size,
@@ -238,16 +240,29 @@ const paginationEvent: Record<string, (event?: any) => void> = {
 const pageDefaultEvent: Record<string, (event?: any) => void> = {
   // 打开详情弹窗
   openReadDialog:(scope: any) => {
-    reportPageConfig.value.readForm['model'] = scope.row
-    reportPageConfig.value.readDialog['model-value'] = true
+    request.flameApi.singleSearch({
+      tableName: safeTableName.value,
+      data: { key: scope.row.flame_id }
+    })
+      .then(({ items }: any) => {
+        reportPageConfig.value.readForm['model'] = items
+        reportPageConfig.value.readDialog['model-value'] = true
+      })
   },
   // 关闭详情弹窗
   closeReadDialog:() => {
     reportPageConfig.value.readDialog['model-value'] = false
   },
   // 查看详情
-  pageRead:() => {
-    reportPageConfig.value.readDialog['model-value'] = true
+  pageRead:(scope: any) => {
+    request.flameApi.singleSearch({
+      tableName: safeTableName.value,
+      data: { key: scope.row.flame_id }
+    })
+      .then(({ items }: any) => {
+        reportPageConfig.value.readForm['model'] = items
+        reportPageConfig.value.readDialog['model-value'] = true
+      })
   },
   // 打开新增弹窗
   openAddDialog:() => {
@@ -259,7 +274,15 @@ const pageDefaultEvent: Record<string, (event?: any) => void> = {
   },
   // 页面新增
   pageAdd:(formModel: FormConfig['model']) => {
-    pageDefaultEvent.closeAddDialog()
+    request.flameApi.singleAdd({
+      tableName: safeTableName.value,
+      data: { data: formModel }
+    })
+      .then(() => {
+        pageRefresh()
+        ElMessage.success('新增成功')
+        pageDefaultEvent.closeAddDialog()
+      })
   },
   // 页面删除
   pageDelete:(scope: any) => {
@@ -274,7 +297,7 @@ const pageDefaultEvent: Record<string, (event?: any) => void> = {
     )
       .then(() => {
         request.flameApi.singleDelete({
-          tableName: props.tableName,
+          tableName: safeTableName.value,
           data: { key: scope.row.flame_id }
         })
           .then(() => {
@@ -288,8 +311,18 @@ const pageDefaultEvent: Record<string, (event?: any) => void> = {
   },
   // 打开编辑弹窗
   openEditDialog:(scope: any) => {
-    reportPageConfig.value.editForm['model'] = scope.row
-    reportPageConfig.value.editDialog['model-value'] = true
+    request.flameApi.singleSearch({
+      tableName: safeTableName.value,
+      data: { key: scope.row.flame_id }
+    })
+      .then(({ result, message, items }: any) => {
+        if (result) {
+          reportPageConfig.value.editForm['model'] = items
+          reportPageConfig.value.editDialog['model-value'] = true
+        } else {
+          ElMessage.warning(message)
+        }
+      })
   },
   // 关闭详情弹窗
   closeEditDialog:() => {
@@ -298,7 +331,7 @@ const pageDefaultEvent: Record<string, (event?: any) => void> = {
   // 页面编辑
   pageEdit:(formModel: FormConfig['model']) => {
     request.flameApi.singleUpdate({
-      tableName: props.tableName,
+      tableName: safeTableName.value,
       data: {
         key: formModel?.flame_id,
         data: formModel
@@ -327,7 +360,7 @@ const pageDefaultEvent: Record<string, (event?: any) => void> = {
         .then(() => {
           // 此处需要请求删除接口，并完成回显
             request.flameApi.batchDelete({
-            tableName: props.tableName,
+            tableName: safeTableName.value,
             data: {
               conditions: {
                 flame_id: tableSelection.value.map(({ flame_id }) => flame_id)