@peng_kai/kit 0.3.0-beta.21 → 0.3.0-beta.23

package/admin/components/date/TtaTimeZoneSimple.vue

@@ -78,7 +78,7 @@ const current = customRef((track, trigger) => {
   <Select class="tta-tz-select" v-model:value="current" :bordered="false" :virtual="false"
     :dropdownMatchSelectWidth="120" :options="offsetOptions">
     <template #suffixIcon>
-      <i class="i-iconoir:time-zone text-5 text-white" />
+      <i class="i-iconoir:time-zone text-5 text-$antd-colorTextBase" />
     </template>
   </Select>
 </template>

package/admin/components/rich-text/src/RichText.new.vue

@@ -25,7 +25,7 @@ const props = withDefaults(
     modelValue: string;
     disabled?: boolean;
     plugins?: string[];
-    height: string;
+    height?: string;
   }>(),
   {
     disabled: false,

package/admin/layout/large/Notice.vue

@@ -28,14 +28,21 @@ interface TNotice {
 
 <script lang="ts" setup>
 const props = defineProps<{
-  noticesQry: UseQueryReturnType<TNotice[], Error>
+  noticesQry: UseQueryReturnType<{num: number; list: TNotice[]}, Error>
+  onOpen?: (item: TNotice) => void;
 }>()
 
 const router = useRouter();
 const visible = ref(false);
-const noticeNum = computed(() => props.noticesQry.data.value?.length ?? 0);
+const noticeNum = computed(() => props.noticesQry.data.value?.num ?? 0);
+const noticeList = computed(() => props.noticesQry.data.value?.list ?? []);
 
 function operate(notice: TNotice) {
+  if (props.onOpen) {
+    props.onOpen(notice);
+    return;
+  }
+
   if (router.currentRoute.value.path !== notice.url) {
     router.push(notice.url);
   }
@@ -87,11 +94,11 @@ useIntervalFn(() => {
       </div>
       <template #overlay>
         <Menu v-if="noticeNum" @click="visible = false" class="max-h-100 overflow-y-auto">
-          <MenuItem v-for="(item, i) of noticesQry.data.value" :key="i" @click="operate(item)">
+          <MenuItem v-for="(item, i) of noticeList" :key="i" @click="operate(item)">
           <div class="min-w-50">
             <div>{{ item.title }}</div>
             <div class="mt-1 text-xs text-$antd-colorTextSecondary">
-              {{ dayjs().format('MM-DD HH:mm:ss') }}
+              {{ dayjs(item.time).format('MM-DD HH:mm:ss') }}
             </div>
           </div>
           </MenuItem>

package/package.json

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

package/utils/number.ts

@@ -1,4 +1,3 @@
-import type { BigNumber } from 'bignumber.js';
 import bn from 'bignumber.js';
 
 export { default as bn } from 'bignumber.js';
@@ -22,42 +21,42 @@ export const numFmt = {
   /** 舍去小数，四舍五入，千位符 */
   d0r5t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_HALF_UP).toFormat(0);
+    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_HALF_UP).toFormat();
   },
   /** 舍去小数，向下取整，千位符 */
   d0r0t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_DOWN).toFormat(0);
+    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_DOWN).toFormat();
   },
   /** 保留2位小数，四舍五入，千位符 */
   d2r5t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_HALF_UP).toFormat(2);
+    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_HALF_UP).toFormat();
   },
   /** 保留2位小数，向下取整，千位符 */
   d2r0t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_DOWN).toFormat(2);
+    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_DOWN).toFormat();
   },
   /** 保留6位小数，四舍五入，千位符 */
   d6r5t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_HALF_UP).toFormat(6);
+    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_HALF_UP).toFormat();
   },
   /** 保留6位小数，向下取整，千位符 */
   d6r0t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_DOWN).toFormat(6);
+    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_DOWN).toFormat();
   },
   /** 保留8位小数，四舍五入，千位符 */
   d8r5t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_HALF_UP).toFormat(8);
+    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_HALF_UP).toFormat();
   },
   /** 保留8位小数，向下取整，千位符 */
   d8r0t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_DOWN).toFormat(8);
+    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_DOWN).toFormat();
   },
 };