@oiij/naive-ui 0.0.50 → 0.0.52
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/data-table-plus/DataTablePlus.vue.d.ts +217 -28
- package/dist/components/data-table-plus/index.d.ts +14 -61
- package/dist/components/preset-form/PresetForm.vue.d.ts +48 -62
- package/dist/components/preset-form/_utils.d.ts +8 -2
- package/dist/components/preset-form/index.d.ts +14 -18
- package/dist/components/preset-input/index.d.ts +132 -22
- package/dist/components/preset-picker/PresetPicker.vue.d.ts +21 -12
- package/dist/components/preset-picker/index.d.ts +4 -6
- package/dist/components/preset-select/PresetSelect.vue.d.ts +155 -22
- package/dist/components/preset-select/index.d.ts +12 -12
- package/dist/components/remote-request/RemoteRequest.vue.d.ts +29 -36
- package/dist/components/remote-request/index.d.ts +5 -4
- package/dist/components.cjs +27 -27
- package/dist/components.js +2908 -3223
- package/dist/components.umd.cjs +27 -27
- package/dist/composables/useDataRequest.cjs +102 -0
- package/dist/composables/useDataRequest.d.cts +61 -0
- package/dist/composables/useDataRequest.d.ts +61 -0
- package/dist/composables/useDataRequest.js +101 -0
- package/dist/composables/useNaiveForm.cjs +6 -2
- package/dist/composables/useNaiveForm.d.cts +13 -11
- package/dist/composables/useNaiveForm.d.ts +13 -11
- package/dist/composables/useNaiveForm.js +6 -2
- package/dist/index.cjs +2 -0
- package/dist/index.d.cts +2 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +2 -1
- package/package.json +5 -5
- package/dist/components/data-table-plus/FlexFilter.vue.d.ts +0 -24
- package/dist/components/data-table-plus/GridFilter.vue.d.ts +0 -24
- package/dist/components/preset-input/_utils.d.ts +0 -6
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
|
|
2
|
+
const __vueuse_core = require_rolldown_runtime.__toESM(require("@vueuse/core"));
|
|
3
|
+
const vue = require_rolldown_runtime.__toESM(require("vue"));
|
|
4
|
+
const vue_hooks_plus_es_useRequest = require_rolldown_runtime.__toESM(require("vue-hooks-plus/es/useRequest"));
|
|
5
|
+
|
|
6
|
+
//#region src/composables/useDataRequest.ts
|
|
7
|
+
function useDataRequest(api, options) {
|
|
8
|
+
const { defaultParams, manual, fields, requestOptions, requestPlugins } = options ?? {};
|
|
9
|
+
const _fields = {
|
|
10
|
+
page: "page",
|
|
11
|
+
pageSize: "pageSize",
|
|
12
|
+
list: "list",
|
|
13
|
+
count: "count",
|
|
14
|
+
...fields
|
|
15
|
+
};
|
|
16
|
+
const pagination = (0, vue.ref)({
|
|
17
|
+
page: defaultParams?.[_fields.page] ?? 1,
|
|
18
|
+
pageSize: defaultParams?.[_fields.pageSize] ?? 10,
|
|
19
|
+
itemCount: 0
|
|
20
|
+
});
|
|
21
|
+
const onBeforeEvent = (0, __vueuse_core.createEventHook)();
|
|
22
|
+
const onSuccessEvent = (0, __vueuse_core.createEventHook)();
|
|
23
|
+
const onErrorEvent = (0, __vueuse_core.createEventHook)();
|
|
24
|
+
const onFinallyEvent = (0, __vueuse_core.createEventHook)();
|
|
25
|
+
const { loading, data, error, params, run, runAsync, refresh, refreshAsync, cancel, mutate } = (0, vue_hooks_plus_es_useRequest.default)(api, {
|
|
26
|
+
defaultParams: [{
|
|
27
|
+
[_fields.page]: pagination.value.page,
|
|
28
|
+
[_fields.pageSize]: pagination.value.pageSize,
|
|
29
|
+
...defaultParams
|
|
30
|
+
}],
|
|
31
|
+
manual,
|
|
32
|
+
...requestOptions,
|
|
33
|
+
onBefore: (params$1) => {
|
|
34
|
+
requestOptions?.onBefore?.(params$1);
|
|
35
|
+
onBeforeEvent.trigger(params$1);
|
|
36
|
+
},
|
|
37
|
+
onSuccess: (data$1, params$1) => {
|
|
38
|
+
requestOptions?.onSuccess?.(data$1, params$1);
|
|
39
|
+
onSuccessEvent.trigger(data$1, params$1);
|
|
40
|
+
if (_fields.page in params$1?.[0]) {
|
|
41
|
+
const _page = Number(params$1?.[0][_fields.page]);
|
|
42
|
+
if (!Number.isNaN(_page)) pagination.value.page = _page;
|
|
43
|
+
}
|
|
44
|
+
if (_fields.pageSize in params$1?.[0]) {
|
|
45
|
+
const _pageSize = Number(params$1?.[0][_fields.pageSize]);
|
|
46
|
+
if (!Number.isNaN(_pageSize)) pagination.value.pageSize = _pageSize;
|
|
47
|
+
}
|
|
48
|
+
if (_fields.count in data$1) {
|
|
49
|
+
const _count = Number(data$1[_fields.count]);
|
|
50
|
+
if (!Number.isNaN(_count)) pagination.value.itemCount = _count;
|
|
51
|
+
}
|
|
52
|
+
},
|
|
53
|
+
onError: (err, params$1) => {
|
|
54
|
+
requestOptions?.onError?.(err, params$1);
|
|
55
|
+
onErrorEvent.trigger(err, params$1);
|
|
56
|
+
},
|
|
57
|
+
onFinally: (params$1, data$1, err) => {
|
|
58
|
+
requestOptions?.onFinally?.(params$1, data$1, err);
|
|
59
|
+
onFinallyEvent.trigger(params$1, data$1, err);
|
|
60
|
+
}
|
|
61
|
+
}, requestPlugins);
|
|
62
|
+
const list = (0, vue.computed)(() => data.value?.[_fields.list] ?? []);
|
|
63
|
+
function setParams(_params) {
|
|
64
|
+
Object.assign(params.value?.[0], _params);
|
|
65
|
+
}
|
|
66
|
+
function runParams(_params) {
|
|
67
|
+
return run({
|
|
68
|
+
...params.value?.[0],
|
|
69
|
+
..._params
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
function runParamsAsync(_params) {
|
|
73
|
+
return runAsync({
|
|
74
|
+
...params.value?.[0],
|
|
75
|
+
..._params
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
return {
|
|
79
|
+
loading,
|
|
80
|
+
data,
|
|
81
|
+
error,
|
|
82
|
+
params,
|
|
83
|
+
list,
|
|
84
|
+
pagination,
|
|
85
|
+
run,
|
|
86
|
+
runAsync,
|
|
87
|
+
refresh,
|
|
88
|
+
refreshAsync,
|
|
89
|
+
cancel,
|
|
90
|
+
mutate,
|
|
91
|
+
setParams,
|
|
92
|
+
runParams,
|
|
93
|
+
runParamsAsync,
|
|
94
|
+
onBefore: onBeforeEvent.on,
|
|
95
|
+
onSuccess: onSuccessEvent.on,
|
|
96
|
+
onError: onErrorEvent.on,
|
|
97
|
+
onFinally: onFinallyEvent.on
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
//#endregion
|
|
102
|
+
exports.useDataRequest = useDataRequest;
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import * as vue0 from "vue";
|
|
2
|
+
import * as _vueuse_core0 from "@vueuse/core";
|
|
3
|
+
import { UseRequestOptions, UseRequestPlugin } from "vue-hooks-plus/es/useRequest/types";
|
|
4
|
+
|
|
5
|
+
//#region src/composables/useDataRequest.d.ts
|
|
6
|
+
type DataObject = Record<string, any>;
|
|
7
|
+
type DataRequestFields = Record<string, string | undefined> & {
|
|
8
|
+
page?: string;
|
|
9
|
+
pageSize?: string;
|
|
10
|
+
list?: string;
|
|
11
|
+
count?: string;
|
|
12
|
+
rowKey?: string;
|
|
13
|
+
};
|
|
14
|
+
type UseDataRequestOptions<P extends DataObject = DataObject, D extends DataObject = DataObject> = {
|
|
15
|
+
defaultParams?: Partial<P>;
|
|
16
|
+
manual?: boolean;
|
|
17
|
+
fields?: DataRequestFields;
|
|
18
|
+
requestOptions?: UseRequestOptions<D, P[]>;
|
|
19
|
+
requestPlugins?: UseRequestPlugin<D, P[]>[];
|
|
20
|
+
};
|
|
21
|
+
type UseDataRequestPagination = {
|
|
22
|
+
page: number;
|
|
23
|
+
pageSize: number;
|
|
24
|
+
itemCount: number;
|
|
25
|
+
};
|
|
26
|
+
declare function useDataRequest<P extends DataObject = DataObject, D extends DataObject = DataObject, R extends DataObject = DataObject>(api: (...args: P[]) => Promise<D>, options?: UseDataRequestOptions<P, D>): {
|
|
27
|
+
loading: Readonly<vue0.Ref<boolean, boolean>>;
|
|
28
|
+
data: Readonly<vue0.Ref<D | undefined, D | undefined>>;
|
|
29
|
+
error: Readonly<vue0.Ref<Error | undefined, Error | undefined>>;
|
|
30
|
+
params: Readonly<vue0.Ref<P[] | [], P[] | []>>;
|
|
31
|
+
list: vue0.ComputedRef<R[]>;
|
|
32
|
+
pagination: vue0.Ref<{
|
|
33
|
+
page: number;
|
|
34
|
+
pageSize: number;
|
|
35
|
+
itemCount: number;
|
|
36
|
+
}, {
|
|
37
|
+
page: number;
|
|
38
|
+
pageSize: number;
|
|
39
|
+
itemCount: number;
|
|
40
|
+
} | {
|
|
41
|
+
page: number;
|
|
42
|
+
pageSize: number;
|
|
43
|
+
itemCount: number;
|
|
44
|
+
}>;
|
|
45
|
+
run: (...params: P[]) => void;
|
|
46
|
+
runAsync: (...params: P[]) => Promise<D>;
|
|
47
|
+
refresh: () => void;
|
|
48
|
+
refreshAsync: () => Promise<D>;
|
|
49
|
+
cancel: () => void;
|
|
50
|
+
mutate: (data?: D | ((oldData?: D | undefined) => D | undefined) | undefined) => void;
|
|
51
|
+
setParams: (_params: Partial<P>) => void;
|
|
52
|
+
runParams: (_params: Partial<P>) => void;
|
|
53
|
+
runParamsAsync: (_params: Partial<P>) => Promise<D>;
|
|
54
|
+
onBefore: _vueuse_core0.EventHookOn<[P[]]>;
|
|
55
|
+
onSuccess: _vueuse_core0.EventHookOn<[D, P[]]>;
|
|
56
|
+
onError: _vueuse_core0.EventHookOn<[Error, P[]]>;
|
|
57
|
+
onFinally: _vueuse_core0.EventHookOn<[P[], D | undefined, Error | undefined]>;
|
|
58
|
+
};
|
|
59
|
+
type UseDataRequestReturns<P extends DataObject = DataObject, D extends DataObject = DataObject, R extends DataObject = DataObject> = ReturnType<typeof useDataRequest<P, D, R>>;
|
|
60
|
+
//#endregion
|
|
61
|
+
export { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest };
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import * as _vueuse_core0 from "@vueuse/core";
|
|
2
|
+
import * as vue0 from "vue";
|
|
3
|
+
import { UseRequestOptions, UseRequestPlugin } from "vue-hooks-plus/es/useRequest/types";
|
|
4
|
+
|
|
5
|
+
//#region src/composables/useDataRequest.d.ts
|
|
6
|
+
type DataObject = Record<string, any>;
|
|
7
|
+
type DataRequestFields = Record<string, string | undefined> & {
|
|
8
|
+
page?: string;
|
|
9
|
+
pageSize?: string;
|
|
10
|
+
list?: string;
|
|
11
|
+
count?: string;
|
|
12
|
+
rowKey?: string;
|
|
13
|
+
};
|
|
14
|
+
type UseDataRequestOptions<P extends DataObject = DataObject, D extends DataObject = DataObject> = {
|
|
15
|
+
defaultParams?: Partial<P>;
|
|
16
|
+
manual?: boolean;
|
|
17
|
+
fields?: DataRequestFields;
|
|
18
|
+
requestOptions?: UseRequestOptions<D, P[]>;
|
|
19
|
+
requestPlugins?: UseRequestPlugin<D, P[]>[];
|
|
20
|
+
};
|
|
21
|
+
type UseDataRequestPagination = {
|
|
22
|
+
page: number;
|
|
23
|
+
pageSize: number;
|
|
24
|
+
itemCount: number;
|
|
25
|
+
};
|
|
26
|
+
declare function useDataRequest<P extends DataObject = DataObject, D extends DataObject = DataObject, R extends DataObject = DataObject>(api: (...args: P[]) => Promise<D>, options?: UseDataRequestOptions<P, D>): {
|
|
27
|
+
loading: Readonly<vue0.Ref<boolean, boolean>>;
|
|
28
|
+
data: Readonly<vue0.Ref<D | undefined, D | undefined>>;
|
|
29
|
+
error: Readonly<vue0.Ref<Error | undefined, Error | undefined>>;
|
|
30
|
+
params: Readonly<vue0.Ref<P[] | [], P[] | []>>;
|
|
31
|
+
list: vue0.ComputedRef<R[]>;
|
|
32
|
+
pagination: vue0.Ref<{
|
|
33
|
+
page: number;
|
|
34
|
+
pageSize: number;
|
|
35
|
+
itemCount: number;
|
|
36
|
+
}, {
|
|
37
|
+
page: number;
|
|
38
|
+
pageSize: number;
|
|
39
|
+
itemCount: number;
|
|
40
|
+
} | {
|
|
41
|
+
page: number;
|
|
42
|
+
pageSize: number;
|
|
43
|
+
itemCount: number;
|
|
44
|
+
}>;
|
|
45
|
+
run: (...params: P[]) => void;
|
|
46
|
+
runAsync: (...params: P[]) => Promise<D>;
|
|
47
|
+
refresh: () => void;
|
|
48
|
+
refreshAsync: () => Promise<D>;
|
|
49
|
+
cancel: () => void;
|
|
50
|
+
mutate: (data?: D | ((oldData?: D | undefined) => D | undefined) | undefined) => void;
|
|
51
|
+
setParams: (_params: Partial<P>) => void;
|
|
52
|
+
runParams: (_params: Partial<P>) => void;
|
|
53
|
+
runParamsAsync: (_params: Partial<P>) => Promise<D>;
|
|
54
|
+
onBefore: _vueuse_core0.EventHookOn<[P[]]>;
|
|
55
|
+
onSuccess: _vueuse_core0.EventHookOn<[D, P[]]>;
|
|
56
|
+
onError: _vueuse_core0.EventHookOn<[Error, P[]]>;
|
|
57
|
+
onFinally: _vueuse_core0.EventHookOn<[P[], D | undefined, Error | undefined]>;
|
|
58
|
+
};
|
|
59
|
+
type UseDataRequestReturns<P extends DataObject = DataObject, D extends DataObject = DataObject, R extends DataObject = DataObject> = ReturnType<typeof useDataRequest<P, D, R>>;
|
|
60
|
+
//#endregion
|
|
61
|
+
export { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest };
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import { createEventHook } from "@vueuse/core";
|
|
2
|
+
import { computed, ref } from "vue";
|
|
3
|
+
import useRequest from "vue-hooks-plus/es/useRequest";
|
|
4
|
+
|
|
5
|
+
//#region src/composables/useDataRequest.ts
|
|
6
|
+
function useDataRequest(api, options) {
|
|
7
|
+
const { defaultParams, manual, fields, requestOptions, requestPlugins } = options ?? {};
|
|
8
|
+
const _fields = {
|
|
9
|
+
page: "page",
|
|
10
|
+
pageSize: "pageSize",
|
|
11
|
+
list: "list",
|
|
12
|
+
count: "count",
|
|
13
|
+
...fields
|
|
14
|
+
};
|
|
15
|
+
const pagination = ref({
|
|
16
|
+
page: defaultParams?.[_fields.page] ?? 1,
|
|
17
|
+
pageSize: defaultParams?.[_fields.pageSize] ?? 10,
|
|
18
|
+
itemCount: 0
|
|
19
|
+
});
|
|
20
|
+
const onBeforeEvent = createEventHook();
|
|
21
|
+
const onSuccessEvent = createEventHook();
|
|
22
|
+
const onErrorEvent = createEventHook();
|
|
23
|
+
const onFinallyEvent = createEventHook();
|
|
24
|
+
const { loading, data, error, params, run, runAsync, refresh, refreshAsync, cancel, mutate } = useRequest(api, {
|
|
25
|
+
defaultParams: [{
|
|
26
|
+
[_fields.page]: pagination.value.page,
|
|
27
|
+
[_fields.pageSize]: pagination.value.pageSize,
|
|
28
|
+
...defaultParams
|
|
29
|
+
}],
|
|
30
|
+
manual,
|
|
31
|
+
...requestOptions,
|
|
32
|
+
onBefore: (params$1) => {
|
|
33
|
+
requestOptions?.onBefore?.(params$1);
|
|
34
|
+
onBeforeEvent.trigger(params$1);
|
|
35
|
+
},
|
|
36
|
+
onSuccess: (data$1, params$1) => {
|
|
37
|
+
requestOptions?.onSuccess?.(data$1, params$1);
|
|
38
|
+
onSuccessEvent.trigger(data$1, params$1);
|
|
39
|
+
if (_fields.page in params$1?.[0]) {
|
|
40
|
+
const _page = Number(params$1?.[0][_fields.page]);
|
|
41
|
+
if (!Number.isNaN(_page)) pagination.value.page = _page;
|
|
42
|
+
}
|
|
43
|
+
if (_fields.pageSize in params$1?.[0]) {
|
|
44
|
+
const _pageSize = Number(params$1?.[0][_fields.pageSize]);
|
|
45
|
+
if (!Number.isNaN(_pageSize)) pagination.value.pageSize = _pageSize;
|
|
46
|
+
}
|
|
47
|
+
if (_fields.count in data$1) {
|
|
48
|
+
const _count = Number(data$1[_fields.count]);
|
|
49
|
+
if (!Number.isNaN(_count)) pagination.value.itemCount = _count;
|
|
50
|
+
}
|
|
51
|
+
},
|
|
52
|
+
onError: (err, params$1) => {
|
|
53
|
+
requestOptions?.onError?.(err, params$1);
|
|
54
|
+
onErrorEvent.trigger(err, params$1);
|
|
55
|
+
},
|
|
56
|
+
onFinally: (params$1, data$1, err) => {
|
|
57
|
+
requestOptions?.onFinally?.(params$1, data$1, err);
|
|
58
|
+
onFinallyEvent.trigger(params$1, data$1, err);
|
|
59
|
+
}
|
|
60
|
+
}, requestPlugins);
|
|
61
|
+
const list = computed(() => data.value?.[_fields.list] ?? []);
|
|
62
|
+
function setParams(_params) {
|
|
63
|
+
Object.assign(params.value?.[0], _params);
|
|
64
|
+
}
|
|
65
|
+
function runParams(_params) {
|
|
66
|
+
return run({
|
|
67
|
+
...params.value?.[0],
|
|
68
|
+
..._params
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
function runParamsAsync(_params) {
|
|
72
|
+
return runAsync({
|
|
73
|
+
...params.value?.[0],
|
|
74
|
+
..._params
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
return {
|
|
78
|
+
loading,
|
|
79
|
+
data,
|
|
80
|
+
error,
|
|
81
|
+
params,
|
|
82
|
+
list,
|
|
83
|
+
pagination,
|
|
84
|
+
run,
|
|
85
|
+
runAsync,
|
|
86
|
+
refresh,
|
|
87
|
+
refreshAsync,
|
|
88
|
+
cancel,
|
|
89
|
+
mutate,
|
|
90
|
+
setParams,
|
|
91
|
+
runParams,
|
|
92
|
+
runParamsAsync,
|
|
93
|
+
onBefore: onBeforeEvent.on,
|
|
94
|
+
onSuccess: onSuccessEvent.on,
|
|
95
|
+
onError: onErrorEvent.on,
|
|
96
|
+
onFinally: onFinallyEvent.on
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
//#endregion
|
|
101
|
+
export { useDataRequest };
|
|
@@ -34,14 +34,17 @@ function useNaiveForm(value, options) {
|
|
|
34
34
|
const { rules, clearRules } = options ?? {};
|
|
35
35
|
const cacheValue = structuredClone((0, vue.toRaw)((0, vue.toValue)(value)));
|
|
36
36
|
const formValue = (0, vue.ref)((0, vue.toValue)(value ?? {}));
|
|
37
|
-
const formRules = rules;
|
|
37
|
+
const formRules = (0, vue.ref)((0, vue.toValue)(rules) ?? {});
|
|
38
38
|
const formRef = (0, vue.ref)();
|
|
39
39
|
const formProps = {
|
|
40
40
|
ref: formRef,
|
|
41
41
|
model: (0, vue.reactive)(formValue.value),
|
|
42
|
-
rules: formRules
|
|
42
|
+
rules: (0, vue.reactive)(formRules.value)
|
|
43
43
|
};
|
|
44
44
|
const onValidatedEvent = (0, __vueuse_core.createEventHook)();
|
|
45
|
+
function setValue(_value) {
|
|
46
|
+
Object.assign(formValue.value, _value);
|
|
47
|
+
}
|
|
45
48
|
function validate() {
|
|
46
49
|
return new Promise((resolve, reject) => {
|
|
47
50
|
if (!formRef.value) return reject(/* @__PURE__ */ new Error("useNaiveForm: formRef is not found."));
|
|
@@ -71,6 +74,7 @@ function useNaiveForm(value, options) {
|
|
|
71
74
|
formValue,
|
|
72
75
|
formRules,
|
|
73
76
|
formProps,
|
|
77
|
+
setValue,
|
|
74
78
|
validate,
|
|
75
79
|
resetValidation,
|
|
76
80
|
resetForm,
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { DataObject } from "./useDataRequest.cjs";
|
|
2
|
+
import * as vue5 from "vue";
|
|
2
3
|
import { Ref } from "vue";
|
|
3
|
-
import * as
|
|
4
|
+
import * as _vueuse_core3 from "@vueuse/core";
|
|
4
5
|
import { ValidateError } from "async-validator";
|
|
5
6
|
import { FormInst, FormItemRule, FormRules } from "naive-ui";
|
|
6
7
|
|
|
@@ -10,20 +11,21 @@ type NaiveFormClearRules = {
|
|
|
10
11
|
number?: number | null;
|
|
11
12
|
boolean?: boolean | null;
|
|
12
13
|
};
|
|
13
|
-
type NaiveFormRules<T extends
|
|
14
|
-
type NaiveFormOptions<T extends
|
|
15
|
-
rules?: NaiveFormRules<T
|
|
14
|
+
type NaiveFormRules<T extends DataObject> = Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>;
|
|
15
|
+
type NaiveFormOptions<T extends DataObject> = {
|
|
16
|
+
rules?: NaiveFormRules<T> | Ref<NaiveFormRules<T>>;
|
|
16
17
|
clearRules?: NaiveFormClearRules;
|
|
17
18
|
};
|
|
18
|
-
declare function useNaiveForm<T extends
|
|
19
|
+
declare function useNaiveForm<T extends DataObject = DataObject>(value?: T | Ref<T>, options?: NaiveFormOptions<T>): {
|
|
19
20
|
formRef: Ref<FormInst | undefined, FormInst | undefined>;
|
|
20
21
|
formValue: Ref<T, T>;
|
|
21
|
-
formRules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]
|
|
22
|
+
formRules: Ref<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>, Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
|
|
22
23
|
formProps: {
|
|
23
24
|
ref: Ref<FormInst | undefined, FormInst | undefined>;
|
|
24
|
-
model:
|
|
25
|
-
rules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]
|
|
25
|
+
model: vue5.Reactive<T>;
|
|
26
|
+
rules: vue5.Reactive<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
|
|
26
27
|
};
|
|
28
|
+
setValue: (_value: Partial<T>) => void;
|
|
27
29
|
validate: () => Promise<{
|
|
28
30
|
warnings?: ValidateError[][];
|
|
29
31
|
}>;
|
|
@@ -31,8 +33,8 @@ declare function useNaiveForm<T extends Record<string, any> = Record<string, any
|
|
|
31
33
|
resetForm: () => void;
|
|
32
34
|
reset: () => void;
|
|
33
35
|
clear: () => void;
|
|
34
|
-
onValidated:
|
|
36
|
+
onValidated: _vueuse_core3.EventHookOn<[T]>;
|
|
35
37
|
};
|
|
36
|
-
type NaiveFormReturns<T extends
|
|
38
|
+
type NaiveFormReturns<T extends DataObject = DataObject> = ReturnType<typeof useNaiveForm<T>>;
|
|
37
39
|
//#endregion
|
|
38
40
|
export { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm };
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import * as
|
|
1
|
+
import { DataObject } from "./useDataRequest.js";
|
|
2
|
+
import * as _vueuse_core3 from "@vueuse/core";
|
|
3
|
+
import * as vue5 from "vue";
|
|
3
4
|
import { Ref } from "vue";
|
|
4
5
|
import { FormInst, FormItemRule, FormRules } from "naive-ui";
|
|
5
6
|
import { ValidateError } from "async-validator";
|
|
@@ -10,20 +11,21 @@ type NaiveFormClearRules = {
|
|
|
10
11
|
number?: number | null;
|
|
11
12
|
boolean?: boolean | null;
|
|
12
13
|
};
|
|
13
|
-
type NaiveFormRules<T extends
|
|
14
|
-
type NaiveFormOptions<T extends
|
|
15
|
-
rules?: NaiveFormRules<T
|
|
14
|
+
type NaiveFormRules<T extends DataObject> = Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>;
|
|
15
|
+
type NaiveFormOptions<T extends DataObject> = {
|
|
16
|
+
rules?: NaiveFormRules<T> | Ref<NaiveFormRules<T>>;
|
|
16
17
|
clearRules?: NaiveFormClearRules;
|
|
17
18
|
};
|
|
18
|
-
declare function useNaiveForm<T extends
|
|
19
|
+
declare function useNaiveForm<T extends DataObject = DataObject>(value?: T | Ref<T>, options?: NaiveFormOptions<T>): {
|
|
19
20
|
formRef: Ref<FormInst | undefined, FormInst | undefined>;
|
|
20
21
|
formValue: Ref<T, T>;
|
|
21
|
-
formRules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]
|
|
22
|
+
formRules: Ref<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>, Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
|
|
22
23
|
formProps: {
|
|
23
24
|
ref: Ref<FormInst | undefined, FormInst | undefined>;
|
|
24
|
-
model:
|
|
25
|
-
rules: Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]
|
|
25
|
+
model: vue5.Reactive<T>;
|
|
26
|
+
rules: vue5.Reactive<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
|
|
26
27
|
};
|
|
28
|
+
setValue: (_value: Partial<T>) => void;
|
|
27
29
|
validate: () => Promise<{
|
|
28
30
|
warnings?: ValidateError[][];
|
|
29
31
|
}>;
|
|
@@ -31,8 +33,8 @@ declare function useNaiveForm<T extends Record<string, any> = Record<string, any
|
|
|
31
33
|
resetForm: () => void;
|
|
32
34
|
reset: () => void;
|
|
33
35
|
clear: () => void;
|
|
34
|
-
onValidated:
|
|
36
|
+
onValidated: _vueuse_core3.EventHookOn<[T]>;
|
|
35
37
|
};
|
|
36
|
-
type NaiveFormReturns<T extends
|
|
38
|
+
type NaiveFormReturns<T extends DataObject = DataObject> = ReturnType<typeof useNaiveForm<T>>;
|
|
37
39
|
//#endregion
|
|
38
40
|
export { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm };
|
|
@@ -33,14 +33,17 @@ function useNaiveForm(value, options) {
|
|
|
33
33
|
const { rules, clearRules } = options ?? {};
|
|
34
34
|
const cacheValue = structuredClone(toRaw(toValue(value)));
|
|
35
35
|
const formValue = ref(toValue(value ?? {}));
|
|
36
|
-
const formRules = rules;
|
|
36
|
+
const formRules = ref(toValue(rules) ?? {});
|
|
37
37
|
const formRef = ref();
|
|
38
38
|
const formProps = {
|
|
39
39
|
ref: formRef,
|
|
40
40
|
model: reactive(formValue.value),
|
|
41
|
-
rules: formRules
|
|
41
|
+
rules: reactive(formRules.value)
|
|
42
42
|
};
|
|
43
43
|
const onValidatedEvent = createEventHook();
|
|
44
|
+
function setValue(_value) {
|
|
45
|
+
Object.assign(formValue.value, _value);
|
|
46
|
+
}
|
|
44
47
|
function validate() {
|
|
45
48
|
return new Promise((resolve, reject) => {
|
|
46
49
|
if (!formRef.value) return reject(/* @__PURE__ */ new Error("useNaiveForm: formRef is not found."));
|
|
@@ -70,6 +73,7 @@ function useNaiveForm(value, options) {
|
|
|
70
73
|
formValue,
|
|
71
74
|
formRules,
|
|
72
75
|
formProps,
|
|
76
|
+
setValue,
|
|
73
77
|
validate,
|
|
74
78
|
resetValidation,
|
|
75
79
|
resetForm,
|
package/dist/index.cjs
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
const require_useDataRequest = require('./composables/useDataRequest.cjs');
|
|
1
2
|
const require_useNaiveForm = require('./composables/useNaiveForm.cjs');
|
|
2
3
|
const require_useNaiveTheme = require('./composables/useNaiveTheme.cjs');
|
|
3
4
|
|
|
5
|
+
exports.useDataRequest = require_useDataRequest.useDataRequest;
|
|
4
6
|
exports.useNaiveForm = require_useNaiveForm.useNaiveForm;
|
|
5
7
|
exports.useNaiveTheme = require_useNaiveTheme.useNaiveTheme;
|
package/dist/index.d.cts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./composables/useDataRequest.cjs";
|
|
1
2
|
import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./composables/useNaiveForm.cjs";
|
|
2
3
|
import { NaiveThemeReturns, useNaiveTheme } from "./composables/useNaiveTheme.cjs";
|
|
3
|
-
export { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, NaiveThemeReturns, useNaiveForm, useNaiveTheme };
|
|
4
|
+
export { DataObject, DataRequestFields, NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, NaiveThemeReturns, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest, useNaiveForm, useNaiveTheme };
|
package/dist/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./composables/useDataRequest.js";
|
|
1
2
|
import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./composables/useNaiveForm.js";
|
|
2
3
|
import { NaiveThemeReturns, useNaiveTheme } from "./composables/useNaiveTheme.js";
|
|
3
|
-
export { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, NaiveThemeReturns, useNaiveForm, useNaiveTheme };
|
|
4
|
+
export { DataObject, DataRequestFields, NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, NaiveThemeReturns, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest, useNaiveForm, useNaiveTheme };
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import { useDataRequest } from "./composables/useDataRequest.js";
|
|
1
2
|
import { useNaiveForm } from "./composables/useNaiveForm.js";
|
|
2
3
|
import { useNaiveTheme } from "./composables/useNaiveTheme.js";
|
|
3
4
|
|
|
4
|
-
export { useNaiveForm, useNaiveTheme };
|
|
5
|
+
export { useDataRequest, useNaiveForm, useNaiveTheme };
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oiij/naive-ui",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.0.
|
|
5
|
-
"description": "
|
|
4
|
+
"version": "0.0.52",
|
|
5
|
+
"description": "Some Composable Functions And Components for Vue 3",
|
|
6
6
|
"author": "oiij",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"homepage": "https://github.com/oiij/use",
|
|
@@ -45,8 +45,8 @@
|
|
|
45
45
|
"prismjs": "^1.30.0",
|
|
46
46
|
"vue": "^3.5.18",
|
|
47
47
|
"vue-hooks-plus": "^2.4.0",
|
|
48
|
-
"@oiij/markdown-it": "0.0.5",
|
|
49
48
|
"@oiij/css-render": "0.0.3",
|
|
49
|
+
"@oiij/markdown-it": "0.0.5",
|
|
50
50
|
"@oiij/use": "0.0.22"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
@@ -60,8 +60,8 @@
|
|
|
60
60
|
"vue-component-type-helpers": "^3.0.5",
|
|
61
61
|
"vue-hooks-plus": "^2.4.0",
|
|
62
62
|
"@oiij/css-render": "0.0.3",
|
|
63
|
-
"@oiij/
|
|
64
|
-
"@oiij/
|
|
63
|
+
"@oiij/markdown-it": "0.0.5",
|
|
64
|
+
"@oiij/use": "0.0.22"
|
|
65
65
|
},
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
import { FlexProps } from 'naive-ui';
|
|
2
|
-
import { RObject } from '../remote-request/index';
|
|
3
|
-
import { DataTablePlusExposeActions, DataTablePlusExposeRefs, DataTablePlusFilterOptionItem } from './index';
|
|
4
|
-
declare const _default: <P extends RObject, D extends RObject, R extends RObject>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
|
|
5
|
-
props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
|
|
6
|
-
readonly "onUpdate:value"?: ((val: unknown, key: keyof P) => any) | undefined;
|
|
7
|
-
} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onUpdate:value"> & {
|
|
8
|
-
options?: DataTablePlusFilterOptionItem<P, D, R>[];
|
|
9
|
-
exposeRefs: DataTablePlusExposeRefs<P, D, R>;
|
|
10
|
-
exposeActions: DataTablePlusExposeActions<P, D>;
|
|
11
|
-
params: P[];
|
|
12
|
-
flexProps?: FlexProps;
|
|
13
|
-
} & Partial<{}>> & import('vue').PublicProps;
|
|
14
|
-
expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
|
|
15
|
-
attrs: any;
|
|
16
|
-
slots: {};
|
|
17
|
-
emit: (e: "update:value", val: unknown, key: keyof P) => void;
|
|
18
|
-
}>) => import('vue').VNode & {
|
|
19
|
-
__ctx?: Awaited<typeof __VLS_setup>;
|
|
20
|
-
};
|
|
21
|
-
export default _default;
|
|
22
|
-
type __VLS_PrettifyLocal<T> = {
|
|
23
|
-
[K in keyof T]: T[K];
|
|
24
|
-
} & {};
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
import { GridProps } from 'naive-ui';
|
|
2
|
-
import { RObject } from '../remote-request/index';
|
|
3
|
-
import { DataTablePlusExposeActions, DataTablePlusExposeRefs, DataTablePlusFilterOptionItem } from './index';
|
|
4
|
-
declare const _default: <P extends RObject, D extends RObject, R extends RObject>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
|
|
5
|
-
props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
|
|
6
|
-
readonly "onUpdate:value"?: ((val: unknown, key: keyof P) => any) | undefined;
|
|
7
|
-
} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onUpdate:value"> & {
|
|
8
|
-
options?: DataTablePlusFilterOptionItem<P, D, R>[];
|
|
9
|
-
exposeRefs: DataTablePlusExposeRefs<P, D, R>;
|
|
10
|
-
exposeActions: DataTablePlusExposeActions<P, D>;
|
|
11
|
-
params: P[];
|
|
12
|
-
gridProps?: GridProps;
|
|
13
|
-
} & Partial<{}>> & import('vue').PublicProps;
|
|
14
|
-
expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
|
|
15
|
-
attrs: any;
|
|
16
|
-
slots: {};
|
|
17
|
-
emit: (e: "update:value", val: unknown, key: keyof P) => void;
|
|
18
|
-
}>) => import('vue').VNode & {
|
|
19
|
-
__ctx?: Awaited<typeof __VLS_setup>;
|
|
20
|
-
};
|
|
21
|
-
export default _default;
|
|
22
|
-
type __VLS_PrettifyLocal<T> = {
|
|
23
|
-
[K in keyof T]: T[K];
|
|
24
|
-
} & {};
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import { FormItemProps } from 'naive-ui';
|
|
2
|
-
import { VNode } from 'vue';
|
|
3
|
-
import { ClassStyle } from '../data-table-plus';
|
|
4
|
-
export declare function renderLabel(children: VNode | null, label?: string | boolean | (FormItemProps & ClassStyle), defaultProps?: FormItemProps): VNode<import('vue').RendererNode, import('vue').RendererElement, {
|
|
5
|
-
[key: string]: any;
|
|
6
|
-
}> | null;
|