flame-plus 0.1.23 → 0.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flame-plus",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "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"
@@ -67,7 +67,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,
@@ -76,21 +76,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,
   }
 })
 
@@ -156,14 +161,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()
     })
 }
@@ -187,7 +199,6 @@ const queryPageData = () => {
     .then(({ items, total }: any) => {
       reportPageConfig.value.table.data = items
       reportPageConfig.value.pagination['total'] = total
-      isLoaded.value = true
     })
 }
 
@@ -207,16 +218,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> = {
   // 表格勾选项变化
@@ -246,7 +256,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
@@ -288,6 +298,63 @@ const pageDefaultEvent: Record<string, (event?: any) => void> = {
         pageDefaultEvent.closeAddDialog()
       })
   },
+  // 页面导入
+  pageImport:() => {
+    const inputFile: any = document.createElement('input')
+    inputFile.type = 'file'
+    inputFile.style.display = 'none'
+    document.body.appendChild(inputFile)
+    inputFile.click()
+    inputFile.addEventListener('change', () => {
+      const file = inputFile.files[0]
+      var fileType = file.name.substring(file.name.lastIndexOf('.') + 1)
+      if (!['xls', 'xlsx', 'et'].includes(fileType)) {
+        ElMessage.warning('请上传 xls、xlsx、et 格式的文件！')
+        document.body.removeChild(inputFile)
+        return false
+      }
+      const formData = new FormData()
+      formData.append("file", file)
+      request.flameAxios({
+        headers: { 'Content-Type': 'multipart/form-data' },
+        method: 'post',
+        url: `/resource-service/upload_file?source=mongo&token=${request.token}`,
+        data: formData
+      })
+        .then(({ key: code }: any) => {
+          request.flameRequest({
+            tableName: safeTableName.value,
+            flameMethod: 'importfile',
+            data: { code }
+          })
+            .then((res: any) => {
+              if(res.result){
+                ElMessage.success('导入成功！')
+              pageRefresh()
+              }
+              else{
+                ElMessage.error(res.message)
+              }
+            })
+        })
+        .finally(() => document.body.removeChild(inputFile))
+    })
+  },
+  // 页面导出
+  pageExport:() => {
+    request.flameApi.exportFile({
+      tableName: safeTableName.value,
+      data: {
+      conditions: searchParams.value,
+      ref_level: 1,
+      order_by: "flame_id DESC"
+    }
+    })
+      .then(({ items }: any) => {
+        window.open(items.download_url)
+        ElMessage.success('导出成功')
+      })
+  },
   // 页面删除
   pageDelete:(scope: any) => {
     ElMessageBox.confirm(

package/packages/model/flmComponentConfig/complex/flmSearch.ts

@@ -1,4 +1,12 @@
-import { FormConfig } from '@/model/flmComponentConfig'
+/*
+ * @Author: 关羽 xiaobing525@163.com
+ * @Date: 2023-01-04 22:32:16
+ * @LastEditors: 关羽 xiaobing525@163.com
+ * @LastEditTime: 2023-01-05 19:54:43
+ * @FilePath: /flame-components/packages/model/flmComponentConfig/complex/flmSearch.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import { FormConfig } from '../../../model/flmComponentConfig'
 
 export interface SearchConfig extends FormConfig {
   maxFormItem?: number

package/packages/model/flmComponentConfig/page/flmReportPage.ts

@@ -1,5 +1,14 @@
+/*
+ * @Author: 关羽 xiaobing525@163.com
+ * @Date: 2023-01-04 22:32:16
+ * @LastEditors: 关羽 xiaobing525@163.com
+ * @LastEditTime: 2023-01-11 21:37:39
+ * @FilePath: /flame-components/packages/model/flmComponentConfig/page/flmReportPage.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import {
   FormConfig,
+  SearchConfig,
   ToolbarConfig,
   TableConfig,
   PaginationConfig,
@@ -8,7 +17,7 @@ import {
 
 // 报表页面设置
 export interface ReportPageSetting {
-  'search': FormConfig
+  'search': SearchConfig
   'toolbar': ToolbarConfig
   'table': TableConfig
   'tableAction': ToolbarConfig