flame-plus 0.1.17 → 0.1.19

package/package.json

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

package/packages/components/complex/flmSearch/flmSearch.vue

@@ -39,7 +39,7 @@
 <script lang="ts" setup>
 import { PropType, ref, Ref, computed, ComputedRef } from 'vue'
 import { flmForm } from '../../index'
-import { SearchConfig, FormItemConfig } from '../../../model/flmComponentConfig'
+import { SearchConfig, FormItemConfig ,ButtonType} from '../../../model/flmComponentConfig'
 import { isValidKey } from '../../../utils'
 
 const emit = defineEmits(['searchSubmit', 'searchReset', 'searchCustomEvent'])

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

@@ -10,7 +10,7 @@
           <slot :name="`search-${searchSlot}`" :prop="prop" :formModel="formModel"></slot>
         </template>
       </flmSearch>
-      <flmToolbar class="page-toolbar" :config="reportPageConfig.toolbar" @toolbarClick="toolbarClick" />
+      <flmToolbar v-if="isDialog==false" class="page-toolbar" :config="reportPageConfig.toolbar" @toolbarClick="toolbarClick" />
       <flmTable
         class="page-table"
         :config="reportPageConfig.table"
@@ -63,7 +63,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, Ref, computed, onMounted } from 'vue'
+import { ref, Ref, computed, onMounted,toRaw } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import {
   flmForm,
@@ -72,21 +72,26 @@ import {
   flmTable,
   flmPagination,
   flmDialog
-} from '@/components'
+} from '../../index'
 import {
   FormItemConfig,
   FormConfig,
   TableColumnConfig,
   ReportPageSetting,
-} from '@/model/flmComponentConfig'
-import { isValidKey } from '@/utils'
+} from '../../../model/flmComponentConfig'
+import { isValidKey } from '../../../utils'
 import request from '@/plugins/request'
+import { is } from '@babel/types'
 
 const props = defineProps({
   // 表名
   tableName: {
     type: String,
     required: true
+  },
+  isDialog:{
+    type:Boolean,
+    default:false,
   }
 })
 
@@ -152,14 +157,21 @@ const queryPageSetting = () => {
       const reportPageSetting: ReportPageSetting = items
       reportPageSetting.table['height'] = tableHeight()
       reportPageSetting.table['max-height'] = tableHeight()
-      reportPageSetting.tableAction.buttons.length && reportPageSetting.table.columns?.push({
+      if(props.isDialog==false) {
+        reportPageSetting.tableAction.buttons.length && reportPageSetting.table.columns?.push({
         prop: 'tableAction',
         label: '操作',
         isSlot: true,
+        align: 'center',
+        'header-align':'center',
         fixed: 'right',
-        'min-width': '200px'
+        'min-width': '200px',
+        'width': '200px'
       })
+      }
+      
       reportPageConfig.value = reportPageSetting
+      isLoaded.value =true;
       queryPageData()
     })
 }
@@ -183,7 +195,6 @@ const queryPageData = () => {
     .then(({ items, total }: any) => {
       reportPageConfig.value.table.data = items
       reportPageConfig.value.pagination['total'] = total
-      isLoaded.value = true
     })
 }
 
@@ -203,16 +214,15 @@ const searchSubmit = (event: object) => {
 const toolbarClick = (event: string) => {
   isValidKey(event, pageDefaultEvent)
     ? pageDefaultEvent[event]()
-    : emit('customEvent', event)
+    : emit('customEvent', {event,data:{}})
 }
 
 // 表格操作栏点击
 const tableActionClick = (event: string, scope: any) => {
   isValidKey(event, pageDefaultEvent)
     ? pageDefaultEvent[event](scope)
-    : emit('customEvent', { event, scope })
+    : emit('customEvent', { event,data:  toRaw(scope.row) })
 }
-
 // 表格操作
 const tableEvent: Record<string, (event?: any) => void> = {
   // 表格勾选项变化
@@ -242,7 +252,7 @@ const pageDefaultEvent: Record<string, (event?: any) => void> = {
   openReadDialog:(scope: any) => {
     request.flameApi.singleSearch({
       tableName: safeTableName.value,
-      data: { key: scope.row.flame_id }
+      data: { key: scope.row.flame_id ,ref_level:1}
     })
       .then(({ items }: any) => {
         reportPageConfig.value.readForm['model'] = items