@peng_kai/kit 0.3.0-beta.35 → 0.3.0-beta.37

package/admin/components/filter/src/FilterReset.vue

@@ -85,6 +85,9 @@ onTtaTimeZone(() => {
         </Button>
         <template #overlay>
           <Menu>
+            <MenuItem @click="props.filterParams?.update?.(true, false);">
+              刷新本页
+            </MenuItem>
             <MenuItem v-if="tableColumns" @click="openTableSettingModal">
               设置表格
             </MenuItem>

package/admin/components/filter/src/useFilterParams.ts

@@ -1,5 +1,5 @@
 import { cloneDeep, eq, mapValues } from 'lodash-es';
-import { type DeepReadonly, type MaybeRefOrGetter, reactive, toRef, watch } from 'vue';
+import { type DeepReadonly, type MaybeRefOrGetter, reactive, toRef, watch, isReadonly, toRaw } from 'vue';
 
 export type ShcemeConfig<T> = {
   [P in keyof T]: {
@@ -40,24 +40,26 @@ export function useFilterParams<T extends Record<string, any>>(shcemes: ShcemeCo
   const pesponsiveParams = Object.keys(modifiableParams).filter(k => !!shcemes[k]?.responsive).map(k => toRef(modifiableParams, k));
   const readonlyParams = reactive(cloneDeep(modifiableParams));
 
-  const update = (force?: boolean) => {
+  const update = (force?: boolean, resetPage?: boolean) => {
     const prevParams = Object.freeze({ ...modifiableParams });
     const beforeParams = {};
     const modifiedParamKeys = Object.keys(readonlyParams).filter(pk => !eq(modifiableParams[pk], readonlyParams[pk]));
     const beforeFuns = Object.entries(shcemes).filter(([k, s]) => modifiedParamKeys.includes(k) && !!s.before).map(([_, s]) => s.before!);
-    const needResetPage = modifiedParamKeys.some(k => !!shcemes[k]?.resetPage);
-    const pageParams = needResetPage || !!force ? { page: 1 } : {};
+    let needResetPage = modifiedParamKeys.some(k => !!shcemes[k]?.resetPage);
+    needResetPage = needResetPage || !!force;
+    needResetPage = typeof resetPage === 'boolean' ? resetPage : needResetPage;
+    const pageParams = needResetPage ? { page: 1 } : {};
 
     beforeFuns.forEach(fun => fun(beforeParams, prevParams));
     Object.assign(readonlyParams, prevParams, pageParams, beforeParams);
 
+    const modifiableParamsRaw = toRaw(modifiableParams);
+    const isReadonlyParams = (k: keyof T) => isReadonly(modifiableParamsRaw[k]);
     for (const k in readonlyParams) {
-      // 为了拦截“只读属性赋值”的报错，因为无法判断哪些属性是只读的
-      try {
+      if (!isReadonlyParams(k)) {
         // @ts-expect-error 类型错误，暂时不理会
         modifiableParams[k] = readonlyParams[k];
       }
-      catch {}
     }
 
     if (force)

package/admin/components/settings/src/SchemaForm.vue

@@ -5,6 +5,7 @@ import { computed, toRef } from 'vue';
 import dayjs from '../../../../libs/dayjs';
 import { type ItemSchema, useAntdForm } from '../../../../antd';
 import { PictureCardUpload } from '../../../components/upload';
+import InputNumberRange from '../../../../antd/components/InputNumberRange.vue';
 
 export interface IConfigDetail {
   category_id: number
@@ -43,6 +44,8 @@ export enum FormTypes {
   SINGLE_DATE_PICKER = 13,
   /** 日期范围选择器 */
   RANGE_DATE_PICKER = 14,
+  /** 数字范围输入框 */
+  NUMBER_RANGE = 15,
 }
 
 const antdPropsResolvers: Record<number, (config: IConfigDetail) => IConfigDetail> = {
@@ -122,6 +125,12 @@ const antdPropsResolvers: Record<number, (config: IConfigDetail) => IConfigDetai
 
     return config;
   },
+  [FormTypes.NUMBER_RANGE](config) {
+    config.value = config.value === '' ? undefined : config.value.split(',');
+    const [min, max] = config.options?.split(',') || [];
+    config.options = { min: Number(min), max: Number(max) };
+    return config;
+  },
 };
 
 const antdValueResolvers: Record<number, (value: any) => any> = {
@@ -154,6 +163,11 @@ const antdValueResolvers: Record<number, (value: any) => any> = {
 
     return value;
   },
+  [FormTypes.NUMBER_RANGE](value) {
+    if (Array.isArray(value))
+      return value.join(',');
+    return value;
+  },
 };
 </script>
 
@@ -291,6 +305,10 @@ defineExpose({ reset, validate });
             <RangePicker v-model:value="settingForm.state[item.key]" v-bind="item.options" />
           </slot>
 
+          <slot v-else-if="item.form_type === FormTypes.NUMBER_RANGE" :name="FormTypes.NUMBER_RANGE">
+            <InputNumberRange v-model:value="settingForm.state[item.key]" v-bind="item.options" />
+          </slot>
+
           <span v-else class="text-red">没有找到预设 form_type:{{ item.form_type }}，可以通过 {{ item.key }} 插槽自定义</span>
         </template>
       </FormItem>

package/antd/hooks/useAntdModal.ts

@@ -1,6 +1,6 @@
 import { Modal as AntModal } from 'ant-design-vue';
 import { tryOnBeforeUnmount, tryOnMounted } from '@vueuse/core';
-import { createVNode, defineComponent, isProxy, onDeactivated, onMounted, reactive, toRef, toRefs } from 'vue';
+import { createVNode, defineComponent, isProxy, onBeforeUnmount, onDeactivated, onMounted, reactive, toRef, toRefs } from 'vue';
 import type { Component } from 'vue';
 import type { ModalProps } from 'ant-design-vue';
 import type { ComponentEmit, ComponentProps } from 'vue-component-type-helpers';
@@ -110,6 +110,8 @@ export function useAntdModal<Comp extends Component>(
   const PresetComponent = defineComponent({
     setup(props) {
       onMounted(() => _modalProps.opener?.(open as any));
+      onBeforeUnmount(_onClose);
+      onDeactivated(_onClose);
 
       return () => {
         return createVNode(AntModal, { ..._modalProps, ...props }, {
@@ -127,8 +129,8 @@ export function useAntdModal<Comp extends Component>(
   (compProps as any).onClose = onClose;
   (compProps as any).onConfirm = onConfirm;
 
-  tryOnBeforeUnmount(_onClose);
-  tryOnMounted(() => onDeactivated(_onClose));
+  // tryOnBeforeUnmount(_onClose);
+  // tryOnMounted(() => onDeactivated(_onClose));
 
   return {
     PresetComponent,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.3.0-beta.35",
+  "version": "0.3.0-beta.37",
   "description": "",
   "author": "",
   "license": "ISC",