@skyfox2000/webui 1.4.13 → 1.4.15

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.4.13",
+   "version": "1.4.15",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/components/content/search/index.vue

@@ -28,7 +28,7 @@ const props = defineProps<{
    /**
     * 表格控制对象
     */
-   gridCtrl: GridControl<AnyData>;
+   gridCtrl?: GridControl<AnyData>;
    /**
     * 模糊查询字段
     */
@@ -39,7 +39,8 @@ const props = defineProps<{
 
 const emits = defineEmits<{
    (e: 'update:search', val: Record<string, any>): void;
-   (e: 'reset'): void;
+   (e: 'onsearch', val: Record<string, any>): void;
+   (e: 'onreset'): void;
 }>();
 
 /**
@@ -60,13 +61,13 @@ const updateHolderSize = () => {
    defaultSlots.value = 0;
    controlSlots.value = 0;
    if (slots.default) defaultSlots.value = getSlotLen(slots.default({}));
-   if (props.gridCtrl.searchBar && slots.control) controlSlots.value = getSlotLen(slots.control({}));
+   if (props.gridCtrl && props.gridCtrl.searchBar && slots.control) controlSlots.value = getSlotLen(slots.control({}));
 
    holderSize.value = 2 - ((defaultSlots.value + controlSlots.value) % 3);
 };
 
 watch(
-   () => props.gridCtrl.searchBar,
+   () => props.gridCtrl?.searchBar,
    () => {
       updateHolderSize();
    },
@@ -77,13 +78,15 @@ const defaultData: Record<string, any> = JSON.parse(JSON.stringify(props.search)
 onMounted(() => {
    updateHolderSize();
    let search = { ...props.search };
-   props.gridCtrl.gridQuery = {
-      ...props.gridCtrl.gridQuery,
-      Query: {
-         ...props.gridCtrl.gridQuery?.Query,
-         ...search,
-      },
-   };
+   if (props.gridCtrl) {
+      props.gridCtrl.gridQuery = {
+         ...props.gridCtrl.gridQuery,
+         Query: {
+            ...props.gridCtrl.gridQuery?.Query,
+            ...search,
+         },
+      };
+   }
 });
 
 const onSearch = () => {
@@ -96,18 +99,21 @@ const onSearch = () => {
       }
    }
 
-   props.gridCtrl.gridQuery = {
-      ...props.gridCtrl.gridQuery,
-      Query: {
-         ...props.gridCtrl.gridQuery?.Query,
-         ...search,
-      },
-   };
+   if (props.gridCtrl) {
+      props.gridCtrl.gridQuery = {
+         ...props.gridCtrl.gridQuery,
+         Query: {
+            ...props.gridCtrl.gridQuery?.Query,
+            ...search,
+         },
+      };
 
-   // 包含分页，需要重新设置
-   props.gridCtrl.pageNo.value = 1;
+      // 包含分页，需要重新设置
+      props.gridCtrl.pageNo.value = 1;
 
-   props.gridCtrl.reload.value = true;
+      props.gridCtrl.reload.value = true;
+   }
+   emits('onsearch', search);
 };
 
 const onReset = () => {
@@ -119,7 +125,7 @@ const onReset = () => {
    }
    emits('update:search', data);
 
-   emits('reset');
+   emits('onreset');
 };
 </script>
 <template>
@@ -130,11 +136,11 @@ const onReset = () => {
       <!-- 默认插槽 -->
       <slot></slot>
       <!-- 受控插槽 -->
-      <slot name="control" v-if="gridCtrl.searchBar"></slot>
+      <slot name="control" v-if="gridCtrl?.searchBar"></slot>
       <!-- 表单操作按钮 占位数量 -->
       <SearchItem class="w-1/3" v-if="holderSize >= 1"> </SearchItem>
       <SearchItem class="w-1/3" v-if="holderSize >= 2"> </SearchItem>
-      <SearchItem v-if="defaultSlots || gridCtrl.searchBar" class="w-1/3 flex justify-end text-right pr-5"
+      <SearchItem v-if="defaultSlots || gridCtrl?.searchBar" class="w-1/3 flex justify-end text-right pr-5"
          :wrapper-col="{ flex: 'auto' }">
          <Space>
             <Button type="primary" @click="onSearch" icon="icon-search">搜索</Button>

package/src/components/content/table/index.vue

@@ -173,6 +173,15 @@ onActivated(() => {
 onMounted(async () => {
    provide(ProviderKeys.GridControl, gridCtrl);
 
+   if (gridCtrl.page && gridCtrl.gridUrl?.url) {
+      if (gridCtrl.gridUrl?.url === gridCtrl.page.urls.list?.url) {
+         gridCtrl.remotePage = false;
+      }
+      if (gridCtrl.gridUrl?.url === gridCtrl.page.urls.find?.url) {
+         gridCtrl.remotePage = true;
+      }
+   }
+
    if (gridCtrl.tableData.value) {
       dataList.value = gridCtrl.tableData.value;
       gridCtrl.total.value = dataList.value.length;
@@ -180,14 +189,6 @@ onMounted(async () => {
          pagination.value.total = gridCtrl.total.value ?? 0;
       }
    } else if (gridCtrl.autoload !== false) {
-      if (gridCtrl.page) {
-         if (gridCtrl.gridUrl?.url === gridCtrl.page.urls.list) {
-            gridCtrl.remotePage = false;
-         }
-         if (gridCtrl.gridUrl?.url === gridCtrl.page.urls.find) {
-            gridCtrl.remotePage = true;
-         }
-      }
       if (gridCtrl.remotePage) {
          dataList.value = (await gridQueryFind(gridCtrl)).rows;
       } else {

package/src/utils/export-table.ts

@@ -81,9 +81,9 @@ const formatFileName = (fileName: string) => {
       return dayjs().format(formatStr);
    });
 };
+
 // 下载当前条件全部数据
 // 表头相同
-
 export const exportResults = async <T extends Record<string, any>>(
    fileName: string,
    columns: TableColumn[],