cosey 0.7.7 → 0.7.9

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.
Files changed (11) hide show
  1. package/components/form/form.api.d.ts +1 -1
  2. package/components/form/useFormTemplate.d.ts +1 -1
  3. package/components/form/useFormTemplate.js +2 -1
  4. package/components/table/index.d.ts +9 -9
  5. package/components/table/table-query/table-query.api.d.ts +3 -2
  6. package/components/table/table-query/table-query.api.js +2 -1
  7. package/components/table/table-query/table-query.js +18 -7
  8. package/components/table/table.vue.d.ts +3 -3
  9. package/components/table/table.vue.js +2 -2
  10. package/package.json +1 -1
  11. package/utils/vue.js +2 -1
package/components/form/form.api.d.ts CHANGED
@@ -143,7 +143,7 @@ export declare const formEmits: {
143
143
  };
144
144
  export type FormEmits = typeof formEmits;
145
145
  export interface FormExpose {
146
- reset: () => void;
146
+ reset: (callback?: () => void) => void;
147
147
  submit: () => Promise<any>;
148
148
  validate: (callback?: FormValidateCallback) => FormValidationResult;
149
149
  validateField: (props?: Arrayable<FormItemProp>, callback?: FormValidateCallback) => FormValidationResult;
package/components/form/useFormTemplate.d.ts CHANGED
@@ -5,7 +5,7 @@ export interface UseFormTemplateOptions<T> {
5
5
  export declare function useFormTemplate<T extends FormProps, U extends FormExpose = FormExpose>(props: T, options?: UseFormTemplateOptions<T>): {
6
6
  elFormProps: import("@vueuse/core").ReactiveOmitReturn<T, keyof T>;
7
7
  expose: U;
8
- reset: () => void;
8
+ reset: (callback?: () => void) => void;
9
9
  resetFields: () => void;
10
10
  clearValidate: () => void;
11
11
  submit: (throwError?: boolean) => Promise<void>;
package/components/form/useFormTemplate.js CHANGED
@@ -31,8 +31,9 @@ function useFormTemplate(props, options = {}) {
31
31
  reset2();
32
32
  });
33
33
  };
34
- const reset = () => {
34
+ const reset = (callback) => {
35
35
  resetFields();
36
+ callback?.();
36
37
  props.reset?.();
37
38
  };
38
39
  const clearValidate = () => {
package/components/table/index.d.ts CHANGED
@@ -296,17 +296,17 @@ declare const _Table: {
296
296
  page: number;
297
297
  pageSize: number;
298
298
  };
299
- reset: () => void;
300
299
  submit: () => Promise<any>;
301
300
  validate: (callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
301
+ clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
302
302
  validateField: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>, callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
303
303
  resetFields: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
304
- clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
305
304
  scrollToField: (prop: import("element-plus").FormItemProp) => void;
306
305
  fields: import("element-plus").FormItemContext[];
307
306
  getFieldsValue: () => Record<string, any>;
308
- setFieldsValue: (value: Record<string, any>) => void;
307
+ setFieldsValue: (values: Record<PropertyKey, any>) => void;
309
308
  getFormModel: () => Record<string, any>;
309
+ reset: (values?: Record<PropertyKey, any>) => void;
310
310
  clearSelection: () => void;
311
311
  getSelectionRows: () => any[];
312
312
  toggleRowSelection: (row: any, selected?: boolean, emitChange?: boolean, ignoreSelectable?: boolean) => void;
@@ -648,17 +648,17 @@ declare const _Table: {
648
648
  page: number;
649
649
  pageSize: number;
650
650
  };
651
- reset: () => void;
652
651
  submit: () => Promise<any>;
653
652
  validate: (callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
653
+ clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
654
654
  validateField: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>, callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
655
655
  resetFields: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
656
- clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
657
656
  scrollToField: (prop: import("element-plus").FormItemProp) => void;
658
657
  fields: import("element-plus").FormItemContext[];
659
658
  getFieldsValue: () => Record<string, any>;
660
- setFieldsValue: (value: Record<string, any>) => void;
659
+ setFieldsValue: (values: Record<PropertyKey, any>) => void;
661
660
  getFormModel: () => Record<string, any>;
661
+ reset: (values?: Record<PropertyKey, any>) => void;
662
662
  clearSelection: () => void;
663
663
  getSelectionRows: () => any[];
664
664
  toggleRowSelection: (row: any, selected?: boolean, emitChange?: boolean, ignoreSelectable?: boolean) => void;
@@ -855,17 +855,17 @@ declare const _Table: {
855
855
  page: number;
856
856
  pageSize: number;
857
857
  };
858
- reset: () => void;
859
858
  submit: () => Promise<any>;
860
859
  validate: (callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
860
+ clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
861
861
  validateField: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>, callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
862
862
  resetFields: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
863
- clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
864
863
  scrollToField: (prop: import("element-plus").FormItemProp) => void;
865
864
  fields: import("element-plus").FormItemContext[];
866
865
  getFieldsValue: () => Record<string, any>;
867
- setFieldsValue: (value: Record<string, any>) => void;
866
+ setFieldsValue: (values: Record<PropertyKey, any>) => void;
868
867
  getFormModel: () => Record<string, any>;
868
+ reset: (values?: Record<PropertyKey, any>) => void;
869
869
  clearSelection: () => void;
870
870
  getSelectionRows: () => any[];
871
871
  toggleRowSelection: (row: any, selected?: boolean, emitChange?: boolean, ignoreSelectable?: boolean) => void;
package/components/table/table-query/table-query.api.d.ts CHANGED
@@ -163,10 +163,11 @@ export declare const tableQueryEmits: {
163
163
  export type TableQueryEmits = typeof tableQueryEmits;
164
164
  export interface TableQueryCustomExpose {
165
165
  getFieldsValue: () => Record<string, any>;
166
- setFieldsValue: (value: Record<string, any>) => void;
166
+ setFieldsValue: (values: Record<PropertyKey, any>) => void;
167
167
  getFormModel: () => Record<string, any>;
168
+ reset: (values?: Record<PropertyKey, any>) => void;
168
169
  }
169
- export interface TableQueryExpose extends FormQueryExpose, TableQueryCustomExpose {
170
+ export interface TableQueryExpose extends Omit<FormQueryExpose, 'reset'>, TableQueryCustomExpose {
170
171
  }
171
172
  export declare const tableQueryExposeKeys: string[];
172
173
  export declare function createScheme<T extends FieldType>(props: FormItemProps<T>): FormItemProps<T>;
package/components/table/table-query/table-query.api.js CHANGED
@@ -22,7 +22,8 @@ const tableQueryExposeKeys = [
22
22
  ...formExposeKeys,
23
23
  "getFieldsValue",
24
24
  "setFieldsValue",
25
- "getFormModel"
25
+ "getFormModel",
26
+ "reset"
26
27
  ];
27
28
  function createScheme(props) {
28
29
  return props;
package/components/table/table-query/table-query.js CHANGED
@@ -21,23 +21,34 @@ var stdin_default = defineComponent({
21
21
  return props.model || defaultModel;
22
22
  });
23
23
  onBeforeMount(() => {
24
- props.schemes.forEach(item => {
25
- unref(formModel)[item.prop] = item.modelValue;
26
- });
24
+ if (!props.model) {
25
+ props.schemes.forEach(item => {
26
+ unref(formModel)[item.prop] = item.modelValue;
27
+ });
28
+ }
27
29
  });
28
30
  const onEnter = () => {
29
31
  formQueryRef.value?.submit();
30
32
  };
33
+ const setFieldsValue = values => {
34
+ Object.assign(unref(formModel), values);
35
+ };
36
+ const reset = values => {
37
+ formQueryRef.value?.reset(() => {
38
+ if (values) {
39
+ setFieldsValue(values);
40
+ }
41
+ });
42
+ };
31
43
  const customExpose = {
32
44
  getFieldsValue() {
33
45
  return cloneDeep(unref(formModel));
34
46
  },
35
- setFieldsValue(value) {
36
- Object.assign(unref(formModel), value);
37
- },
47
+ setFieldsValue,
38
48
  getFormModel() {
39
49
  return unref(formModel);
40
- }
50
+ },
51
+ reset
41
52
  };
42
53
  expose(createMergedExpose(tableQueryExposeKeys, () => formQueryRef.value, customExpose));
43
54
  return () => {
package/components/table/table.vue.d.ts CHANGED
@@ -152,17 +152,17 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
152
152
  page: number;
153
153
  pageSize: number;
154
154
  };
155
- reset: () => void;
156
155
  submit: () => Promise<any>;
157
156
  validate: (callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
157
+ clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
158
158
  validateField: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>, callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
159
159
  resetFields: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
160
- clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
161
160
  scrollToField: (prop: import("element-plus").FormItemProp) => void;
162
161
  fields: import("element-plus").FormItemContext[];
163
162
  getFieldsValue: () => Record<string, any>;
164
- setFieldsValue: (value: Record<string, any>) => void;
163
+ setFieldsValue: (values: Record<PropertyKey, any>) => void;
165
164
  getFormModel: () => Record<string, any>;
165
+ reset: (values?: Record<PropertyKey, any>) => void;
166
166
  clearSelection: () => void;
167
167
  getSelectionRows: () => any[];
168
168
  toggleRowSelection: (row: any, selected?: boolean, emitChange?: boolean, ignoreSelectable?: boolean) => void;
package/components/table/table.vue.js CHANGED
@@ -350,9 +350,9 @@ var stdin_default = /* @__PURE__ */defineComponent({
350
350
  return onSubmit();
351
351
  }
352
352
  };
353
- const reset = async () => {
353
+ const reset = async values => {
354
354
  if (props.formProps) {
355
- return tableQueryRef.value?.reset();
355
+ return tableQueryRef.value?.reset(values);
356
356
  } else {
357
357
  return onReset();
358
358
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cosey",
3
- "version": "0.7.7",
3
+ "version": "0.7.9",
4
4
  "description": "基于 Vue3 + vite 的后台管理系统框架",
5
5
  "type": "module",
6
6
  "main": "index.js",
package/utils/vue.js CHANGED
@@ -19,7 +19,8 @@ function createMergedExpose(keys, ...exposeList) {
19
19
  const result = {};
20
20
  for (const key of keys) {
21
21
  result[key] = (...args) => {
22
- for (const expose of exposeList) {
22
+ for (let i = exposeList.length - 1; i >= 0; i--) {
23
+ const expose = exposeList[i];
23
24
  const obj = typeof expose === "function" ? expose() : expose;
24
25
  if (obj && key in obj) {
25
26
  const value = obj[key];