@peng_kai/kit 0.3.0-beta.17 → 0.3.0-beta.18

package/admin/components/date/helpers.ts

@@ -70,6 +70,12 @@ export function standardizeTzParam(tz: string) {
   return tz;
 }
 
+export function getLocalOffset(tz: string) {
+  const offsetTzMinutes = dayjs().tz(tz).utcOffset();
+  const offsetLocalMinutes = dayjs().utcOffset();
+  return (offsetLocalMinutes - offsetTzMinutes) * 60 * 1000;
+}
+
 type OfDayType = dayjs.Dayjs | undefined | null;
 type UnitType = dayjs.QUnitType | dayjs.OpUnitType;
 export const datetime = {
@@ -92,14 +98,18 @@ export const datetime = {
 
     const _tz = standardizeTzParam(tz);
     const _keys = (Array.isArray(keys) && keys?.length > 1) ? keys : ['start_time', 'end_time'];
+    const offsetMS = getLocalOffset(_tz);
 
     type RetType = KS extends readonly [string, string]
       ? Simplify<{ [K in KS[0]]: number } & { [K in KS[1]]: number }>
       : { start_time: number; end_time: number };
 
+    const startTime = dayjs(days[0].valueOf()).startOf(unit).valueOf() + offsetMS;
+    const endTime = dayjs(days[1].valueOf()).endOf(unit).valueOf() + offsetMS;
+
     return {
-      [_keys[0]]: dayjs(days[0].valueOf()).tz(_tz).startOf(unit).valueOf(),
-      [_keys[1]]: dayjs(days[1].valueOf()).tz(_tz).endOf(unit).valueOf(),
+      [_keys[0]]: startTime,
+      [_keys[1]]: endTime,
     } as RetType;
   },
   /**

package/admin/components/date/presetProps.ts

@@ -3,18 +3,14 @@ import dayjs, { type Dayjs } from '../../../libs/dayjs';
 import { type ComponentProps } from 'vue-component-type-helpers'
 
 export const  antdRangePickerPresets = [
-  { label: '今天', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
-  { label: '昨天', value: [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')] },
-  { label: '前一天', value: [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')] },
-  { label: '后一天', value: [dayjs().add(1, 'day').startOf('day'), dayjs().add(1, 'day').endOf('day')] },
-  { label: '本周', value: [dayjs().startOf('week'), dayjs().endOf('week')] },
-  { label: '上周', value: [dayjs().subtract(1, 'week').startOf('week'), dayjs().subtract(1, 'week').endOf('week')] },
-  { label: '本月', value: [dayjs().startOf('month'), dayjs().endOf('month')] },
-  { label: '上个月', value: [dayjs().subtract(1, 'month').startOf('month'), dayjs().subtract(1, 'month').endOf('month')] },
-  { label: '上上月', value: [dayjs().subtract(2, 'month').startOf('month'), dayjs().subtract(2, 'month').endOf('month')] },
-  { label: '近7天', value: [dayjs().subtract(6, 'day').startOf('day'), dayjs().endOf('day')] },
-  { label: '近30天', value: [dayjs().subtract(29, 'day').startOf('day'), dayjs().endOf('day')] },
-] as { label: string; value: [Dayjs, Dayjs] }[]
+  { label: '今天', key: 'today', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
+  { label: '昨天', key: 'yesterday', value: [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')] },
+  { label: '本月', key: 'thisMonth', value: [dayjs().startOf('month'), dayjs().endOf('month')] },
+  { label: '上个月', key: 'lastMonth', value: [dayjs().subtract(1, 'month').startOf('month'), dayjs().subtract(1, 'month').endOf('month')] },
+  { label: '近3个月', key: 'last3months', value: [dayjs().subtract(2, 'month').startOf('month'), dayjs().endOf('month')] },
+  { label: '近半年', key: 'last6months', value: [dayjs().subtract(5, 'month').startOf('month'), dayjs().endOf('month')] },
+  { label: '今年', key: 'thisMonth', value: [dayjs().startOf('year'), dayjs().endOf('month')] },
+] as { label: string; key: string; value: [Dayjs, Dayjs] }[]
 
 export const antdRangePickerShowTimeProps: ComponentProps<typeof RangePicker> = {
   presets: antdRangePickerPresets,

package/admin/components/text/src/Amount.v2.vue

@@ -1,9 +1,10 @@
 <!-- eslint-disable jsdoc/no-multi-asterisks -->
 
 <script setup lang="ts">
+import { computed } from 'vue';
 import type { BigNumber } from 'bignumber.js';
 import bignumber from 'bignumber.js';
-import CurrencyIcon from '../../currency/src/CurrencyIcon.vue';
+import CurrencyIcon, {textIcons} from '../../currency/src/CurrencyIcon.vue';
 import Num from './Num.vue';
 
 // 由于 Vue 目前不支持 Props `interface AmountProps extends CurrencyIconProps, NumProps{}` 多继承写法，所以暂时这样写
@@ -95,10 +96,14 @@ const props = withDefaults(defineProps<AmountProps>(), {
   useNumColor: false,
   precision: 0,
 });
+
+const isTextIcon = computed(() => {
+  return props.iconType === 'text' || textIcons.value.includes(String(props.symbol));
+});
 </script>
 
 <template>
-  <span class="amount flex-inline" :class="[props.iconType === 'text' ? 'items-baseline' : 'items-center']">
+  <span class="amount flex-inline" :class="[isTextIcon ? 'items-baseline' : 'items-center']">
     <CurrencyIcon v-if="props.iconPos === 'left' && props.symbol && !props.useNumColor" v-bind="props" class="currency-icon" />
     <Num v-bind="props" :value="bignumber(props.value ?? 0).dividedBy(10 ** props.precision)">
       <template #signLeft>

package/antd/hooks/useAntdTable.ts

@@ -1,5 +1,6 @@
-import { computed, reactive, ref, toValue } from 'vue';
+import { computed, reactive, ref } from 'vue';
 import { pick } from 'lodash-es';
+import { useTableColumns } from './useTableColumns'
 import type { UseQueryReturnType } from '@tanstack/vue-query';
 import type { Table, TableProps } from 'ant-design-vue';
 import type { ColumnType, FilterValue } from 'ant-design-vue/es/table/interface';
@@ -10,6 +11,12 @@ interface ISorter {
   order?: string
 }
 
+type GetRecordType<T> = T extends UseQueryReturnType<infer D, any>
+  ? D extends Api.PageData
+  ? NonNullable<D['list']>[0]
+  : never
+  : never;
+
 const defaultPageSizeOptions = ['10', '20', '50', '100'];
 
 export function useAntdTable<
@@ -125,58 +132,3 @@ export function useAntdTable<
   };
 }
 
-type GetRecordType<T> = T extends UseQueryReturnType<infer D, any>
-  ? D extends Api.PageData
-    ? NonNullable<D['list']>[0]
-    : never
-  : never;
-
-export type ColumnConfig = { title: string, dataIndex: string, visible: boolean, compact: boolean }
-
-function useTableColumns<LCT extends any[]>() {
-
-  const columnsConfig = ref<Array<ColumnConfig> | null>(null);
-  let originalColumns: LCT | null = null;
-
-  const defineColumns = (columnsGetter: () => LCT) => {
-    originalColumns = toValue(columnsGetter) || [] as unknown as LCT;
-
-    return computed(() => {
-      const config =  columnsConfig.value;
-      let columns = columnsGetter();
-
-      if (config?.length) {
-        columns = columns.map((col: any) => {
-          const x = config.find(c => c.dataIndex === col.dataIndex);
-          if (x) {
-            return { ...col, visible: x.visible, compact: x.compact,};
-          }
-          return col;
-        }) as LCT;
-        // 过滤掉不可见的列
-        // columns = columns.filter((col: any) => {
-        //   const x = config.find(c => c.dataIndex === col.dataIndex);
-        //   return x ? x.visible : true;
-        // }) as LCT;
-        // 基于 config 的顺序排序
-        columns = config.map(x => {
-          const col = columns.find(c => c.dataIndex === x.dataIndex);
-          return col ? col : null;
-        }).filter(Boolean) as LCT;
-      }
-
-      return columns;
-    })
-  };
-
-  const setColumnsConfig = (columns: Array<ColumnConfig>) => {
-    columnsConfig.value = columns;
-    console.log('🤡 / columns:', columns);
-  };
-
-
-  return {
-    defineColumns,
-    setColumnsConfig
-  };
-}

package/antd/hooks/useTableColumns.ts

@@ -0,0 +1,124 @@
+import { computed, reactive, ref, toValue, getCurrentInstance } from 'vue';
+import { extendRef } from '@vueuse/core';
+
+export type ColumnConfig = { title: string, dataIndex: string, visible: boolean, compact: boolean }
+
+export function useTableColumns<LCT extends any[]>() {
+  const columnsConfig = ref<Array<ColumnConfig> | null>(null);
+  let originalColumns: LCT | null = null;
+  let tableId = ''
+
+  const _getTableId = () => {
+    if (!originalColumns)
+      throw new Error('请先调用 defineColumns() 方法定义 columns');
+
+    const indexsStr = originalColumns.map((col: any) => col.dataIndex).join(',');
+    if (!tableId) {
+      tableId = genTableId(indexsStr);
+    }
+
+    return tableId;
+  }
+
+  const defineColumns = (columnsGetter: () => LCT) => {
+    originalColumns = toValue(columnsGetter) || [] as unknown as LCT;
+
+
+    const columns = computed(() => {
+      const config = columnsConfig.value;
+      let columns = columnsGetter();
+
+      if (config?.length) {
+        columns = columns.map((col: any) => {
+          const x = config.find(c => c.dataIndex === col.dataIndex);
+          if (x) {
+            return { ...col, visible: x.visible, compact: x.compact, };
+          }
+          return col;
+        }) as LCT;
+        // 过滤掉不可见的列
+        // columns = columns.filter((col: any) => {
+        //   const x = config.find(c => c.dataIndex === col.dataIndex);
+        //   return x ? x.visible : true;
+        // }) as LCT;
+        // 基于 config 的顺序排序
+        columns = config.map(x => {
+          const col = columns.find(c => c.dataIndex === x.dataIndex);
+          return col ? col : null;
+        }).filter(Boolean) as LCT;
+      }
+
+      return columns;
+    })
+
+    return extendRef(columns, {});
+  };
+
+  const getColumnsConfig = () => {
+
+  }
+
+  const setColumnsConfig = (columns: Array<ColumnConfig>) => {
+    columnsConfig.value = columns;
+    console.log('🤡 / columns:', columns);
+  };
+
+  return {
+    defineColumns,
+    setColumnsConfig
+  };
+}
+
+class TableConfigurator {
+  private tableId: string | null = null;
+  private storeKeyPrefix = 'TABLE_CONFIG';
+  private _columnsConfig: Array<ColumnConfig> | null = null;
+  public originalColumns: any[] | null = null;
+
+  public setColumnsConfig() {
+    const tableId = this.genTableId();
+    const key = `${this.storeKeyPrefix}@${tableId}`;
+    const configStr = JSON.stringify(this._columnsConfig);
+
+    localStorage.setItem(key, configStr);
+  }
+
+  public getColumnsConfig() {
+    const tableId = this.genTableId();
+    const key = `${this.storeKeyPrefix}@${tableId}`;
+    const configStr = localStorage.getItem(key);
+
+    if (configStr) {
+      try {
+        return JSON.parse(configStr);
+      }
+      catch {
+        return null;
+      }
+    }
+
+    return null;
+  }
+
+  public genTableId() {
+    if (!this.originalColumns)
+      throw new Error('originalColumns 未设置');
+
+    if (this.tableId)
+      return this.tableId;
+
+    const str = this.originalColumns.map((col: any) => col.dataIndex).join('');
+    let hash = 0;
+    let len = 12;
+
+    for (let i = 0; i < str.length; i++) {
+      const ch = str.charCodeAt(i);
+      hash = (hash << 5) - hash + ch;
+      hash |= 0;
+    }
+
+    const base36 = (hash >>> 0).toString(36);
+    this.tableId = base36.length >= len ? base36.slice(0, len) : base36.padStart(len, '0');
+    return this.tableId;
+  }
+}

package/package.json

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