@peng_kai/kit 0.2.40 → 0.2.41

package/admin/components/text/index.ts

@@ -5,6 +5,7 @@ import Duration from './src/Duration.vue';
 import IP from './src/IP.vue';
 
 export { createTagGetter } from './src/createTagGetter';
+export { createDateTypeSwitcher } from './src/createDateTypeSwitcher';
 
 export const Text = {
   Hash,

package/admin/components/text/src/createDateTypeSwitcher.tsx

@@ -0,0 +1,41 @@
+import { useCycleList } from '@vueuse/core';
+import { computed, defineComponent } from 'vue';
+import Datetime from './Datetime.vue';
+
+export function createDateTypeSwitcher() {
+  const cycle = useCycleList(['local', 'utc'] as const);
+
+  const Switcher = defineComponent({
+    props: [],
+    setup(props) {
+      const title = computed(() => {
+        const state = cycle.state.value;
+        return ({
+          local: '本地',
+          utc: 'UTC',
+        } satisfies Record<typeof state, string>)[state];
+      });
+
+      return () => (
+        <div
+          class="flex-inline items-center ml-1 cursor-pointer select-none text-$antd-colorPrimary hover:op-60"
+          onClick={() => cycle.next()}
+        >
+          (
+          <span class="min-w-2em inline-block text-center">
+            {title.value}
+          </span>
+          )
+          <i class="i-mi:switch text-1.2em" />
+        </div>
+      );
+    },
+  });
+  const Display = defineComponent({
+    setup(props, { attrs }) {
+      return () => (<Datetime {...attrs} utc={cycle.state.value === 'utc'} />);
+    },
+  });
+
+  return { Switcher, Display };
+}

package/antd/hooks/useAntdForm.ts

@@ -6,7 +6,7 @@
 import type { FormInstance, FormItemProps, RuleObject } from 'ant-design-vue/es/form';
 import type { FormProps } from 'ant-design-vue';
 import { type MaybeRefOrGetter, computed, reactive, ref, shallowRef, toRef, watch, watchEffect } from 'vue';
-import { mapValues } from 'lodash-es';
+import { cloneDeep, mapValues } from 'lodash-es';
 import { reactiveComputed } from '@vueuse/core';
 import { GROUP_SEP, buildGroupField, getGroupIndex } from './useAntdForm.helpers';
 
@@ -50,15 +50,16 @@ function useAntdForm<S extends Record<string, unknown>, TS = S>(schemas: MaybeRe
     get scrollToField() {
       return formRef.value?.scrollToField;
     },
-    get validate() {
-      return formRef.value?.validate;
-    },
     get validateFields() {
       return formRef.value?.validateFields;
     },
     get clearValidate() {
       return formRef.value?.clearValidate;
     },
+    async validate(...args: Parameters<FormInstance['validate']>) {
+      const res = await formRef.value?.validate(...args);
+      return cloneDeep(reactive(res ?? {}));
+    },
     addGroup(groupName: string, groupSchemas: Record<string, ItemSchema>) {
       const i = getGroupIndex(groupName, schemasR.value) + 1;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.2.40",
+  "version": "0.2.41",
   "description": "",
   "author": "",
   "license": "ISC",