@vunk/form 2.16.9 → 2.16.10

package/components/api-tables-select/index.cjs

@@ -6,7 +6,7 @@ var vue = require('vue');
 var tablesSelect = require('@vunk/form/components/tables-select');
 var object = require('@vunk/shared/object');
 var form = require('@vunk/form');
-var core = require('@vunk/core');
+var composables = require('@vunk/core/composables');
 var isObject = require('../isObject.cjs');
 var _pluginVue_exportHelper = require('../_plugin-vue_export-helper.cjs');
 
@@ -42,10 +42,15 @@ const props = {
   queryItems: {
     type: Array,
     default: () => []
+  },
+  query: {
+    type: Object,
+    default: void 0
   }
 };
 const emits = {
-  ...tablesSelect._VkfTablesSelectCtx.emits
+  ...tablesSelect._VkfTablesSelectCtx.emits,
+  "setData:query": null
 };
 
 /** `Object#toString` result references. */
@@ -386,7 +391,10 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const debounceRead = debounce(read, 300);
     const coreProps = tablesSelect._VkfTablesSelectCtx.createBindProps(props, ["getRows"]);
     const coreEmits = tablesSelect._VkfTablesSelectCtx.createOnEmits(emit);
-    const queryData = vue.ref({});
+    const [queryData, setQueryData] = composables.useDataComputed({
+      default: {},
+      key: "query"
+    }, props, emit);
     const tableState = vue.reactive({
       data: [],
       total: 0
@@ -411,12 +419,10 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
       return rows;
     };
-    const __returned__ = { props, emit, debounceRead, coreProps, coreEmits, queryData, tableState, pagination, read, defaultGetRows, get VkfTablesSelect() {
+    const __returned__ = { props, emit, debounceRead, coreProps, coreEmits, queryData, setQueryData, tableState, pagination, read, defaultGetRows, get VkfTablesSelect() {
       return tablesSelect.VkfTablesSelect;
     }, get VkfForm() {
       return form.VkfForm;
-    }, get setData() {
-      return core.setData;
     } };
     Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
     return __returned__;
@@ -426,9 +432,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createBlock($setup["VkfTablesSelect"], vue.mergeProps({
     start: $setup.pagination.start,
-    "onUpdate:start": _cache[1] || (_cache[1] = ($event) => $setup.pagination.start = $event),
+    "onUpdate:start": _cache[0] || (_cache[0] = ($event) => $setup.pagination.start = $event),
     "page-size": $setup.pagination.pageSize,
-    "onUpdate:pageSize": _cache[2] || (_cache[2] = ($event) => $setup.pagination.pageSize = $event),
+    "onUpdate:pageSize": _cache[1] || (_cache[1] = ($event) => $setup.pagination.pageSize = $event),
     data: $setup.tableState.data,
     total: $setup.tableState.total,
     "get-rows": _ctx.getRows || $setup.defaultGetRows
@@ -438,8 +444,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         "form-items": _ctx.queryItems,
         inline: true,
         data: $setup.queryData,
-        onSetData: _cache[0] || (_cache[0] = ($event) => $setup.setData($setup.queryData, $event))
-      }, null, 8, ["form-items", "data"]),
+        onSetData: $setup.setQueryData
+      }, null, 8, ["form-items", "data", "onSetData"]),
       vue.renderSlot(_ctx.$slots, "dialog")
     ]),
     _: 3

package/components/api-tables-select/index.mjs

@@ -1,8 +1,8 @@
-import { defineComponent, ref, reactive, watch, openBlock, createBlock, mergeProps, toHandlers, withCtx, createVNode, renderSlot } from 'vue';
+import { defineComponent, reactive, ref, watch, openBlock, createBlock, mergeProps, toHandlers, withCtx, createVNode, renderSlot } from 'vue';
 import { _VkfTablesSelectCtx, VkfTablesSelect } from '@vunk/form/components/tables-select';
 import { pickObject } from '@vunk/shared/object';
 import { VkfForm } from '@vunk/form';
-import { setData } from '@vunk/core';
+import { useDataComputed } from '@vunk/core/composables';
 import { i as isObjectLike, b as baseGetTag, a as isObject, r as root } from '../isObject.mjs';
 import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
 
@@ -38,10 +38,15 @@ const props = {
   queryItems: {
     type: Array,
     default: () => []
+  },
+  query: {
+    type: Object,
+    default: void 0
   }
 };
 const emits = {
-  ..._VkfTablesSelectCtx.emits
+  ..._VkfTablesSelectCtx.emits,
+  "setData:query": null
 };
 
 /** `Object#toString` result references. */
@@ -382,7 +387,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const debounceRead = debounce(read, 300);
     const coreProps = _VkfTablesSelectCtx.createBindProps(props, ["getRows"]);
     const coreEmits = _VkfTablesSelectCtx.createOnEmits(emit);
-    const queryData = ref({});
+    const [queryData, setQueryData] = useDataComputed({
+      default: {},
+      key: "query"
+    }, props, emit);
     const tableState = reactive({
       data: [],
       total: 0
@@ -407,12 +415,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       });
       return rows;
     };
-    const __returned__ = { props, emit, debounceRead, coreProps, coreEmits, queryData, tableState, pagination, read, defaultGetRows, get VkfTablesSelect() {
+    const __returned__ = { props, emit, debounceRead, coreProps, coreEmits, queryData, setQueryData, tableState, pagination, read, defaultGetRows, get VkfTablesSelect() {
       return VkfTablesSelect;
     }, get VkfForm() {
       return VkfForm;
-    }, get setData() {
-      return setData;
     } };
     Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
     return __returned__;
@@ -422,9 +428,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock($setup["VkfTablesSelect"], mergeProps({
     start: $setup.pagination.start,
-    "onUpdate:start": _cache[1] || (_cache[1] = ($event) => $setup.pagination.start = $event),
+    "onUpdate:start": _cache[0] || (_cache[0] = ($event) => $setup.pagination.start = $event),
     "page-size": $setup.pagination.pageSize,
-    "onUpdate:pageSize": _cache[2] || (_cache[2] = ($event) => $setup.pagination.pageSize = $event),
+    "onUpdate:pageSize": _cache[1] || (_cache[1] = ($event) => $setup.pagination.pageSize = $event),
     data: $setup.tableState.data,
     total: $setup.tableState.total,
     "get-rows": _ctx.getRows || $setup.defaultGetRows
@@ -434,8 +440,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         "form-items": _ctx.queryItems,
         inline: true,
         data: $setup.queryData,
-        onSetData: _cache[0] || (_cache[0] = ($event) => $setup.setData($setup.queryData, $event))
-      }, null, 8, ["form-items", "data"]),
+        onSetData: $setup.setQueryData
+      }, null, 8, ["form-items", "data", "onSetData"]),
       renderSlot(_ctx.$slots, "dialog")
     ]),
     _: 3

package/components/api-tables-select/src/ctx.d.ts

@@ -27,6 +27,10 @@ export declare const props: {
         type: PropType<any[]>;
         default: () => any[];
     };
+    query: {
+        type: ObjectConstructor;
+        default: any;
+    };
     type: {
         type: StringConstructor;
         default: string;
@@ -345,6 +349,7 @@ export declare const props: {
     };
 };
 export declare const emits: {
+    'setData:query': any;
     'update:modelValue': any;
     'update:start': (val: number) => boolean;
     select: null;

package/components/api-tables-select/src/index.vue.d.ts

@@ -15,6 +15,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: import("vue").PropType<any[]>;
         default: () => any[];
     };
+    query: {
+        type: ObjectConstructor;
+        default: any;
+    };
     type: {
         type: StringConstructor;
         default: string;
@@ -348,6 +352,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             type: import("vue").PropType<any[]>;
             default: () => any[];
         };
+        query: {
+            type: ObjectConstructor;
+            default: any;
+        };
         type: {
             type: StringConstructor;
             default: string;
@@ -665,6 +673,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             validator: (val: ("ascending" | "descending" | null)[]) => boolean;
         };
     }>> & Readonly<{
+        "onSetData:query"?: (...args: any[] | unknown[]) => any;
         "onUpdate:modelValue"?: (...args: any[] | unknown[]) => any;
         "onUpdate:start"?: (val: number) => any;
         onSelect?: (...args: unknown[]) => any;
@@ -693,7 +702,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         "onPrev-click"?: (val: number) => any;
         "onNext-click"?: (val: number) => any;
     }> & {}>;
-    emit: ((event: "update:modelValue", ...args: unknown[]) => void) & ((event: "update:modelValue", ...args: any) => void) & ((event: "update:modelValue", ...args: any[]) => void) & ((event: "update:start", val: number) => void) & ((event: "select", ...args: unknown[]) => void) & ((event: "select-all", ...args: unknown[]) => void) & ((event: "selection-change", ...args: unknown[]) => void) & ((event: "cell-mouse-enter", ...args: unknown[]) => void) & ((event: "cell-mouse-leave", ...args: unknown[]) => void) & ((event: "cell-contextmenu", ...args: unknown[]) => void) & ((event: "cell-click", ...args: unknown[]) => void) & ((event: "cell-dblclick", ...args: unknown[]) => void) & ((event: "row-click", ...args: unknown[]) => void) & ((event: "row-contextmenu", ...args: unknown[]) => void) & ((event: "row-dblclick", ...args: unknown[]) => void) & ((event: "header-click", ...args: unknown[]) => void) & ((event: "header-contextmenu", ...args: unknown[]) => void) & ((event: "sort-change", ...args: unknown[]) => void) & ((event: "filter-change", ...args: unknown[]) => void) & ((event: "current-change", ...args: unknown[]) => void) & ((event: "header-dragend", ...args: unknown[]) => void) & ((event: "expand-change", ...args: unknown[]) => void) & ((event: "scroll", ...args: unknown[]) => void) & ((event: "update:current-page", val: number) => void) & ((event: "update:page-size", val: number) => void) & ((event: "size-change", val: number) => void) & ((event: "change", currentPage: number, pageSize: number) => void) & ((event: "prev-click", val: number) => void) & ((event: "next-click", val: number) => void);
+    emit: ((event: "setData:query", ...args: unknown[]) => void) & ((event: "setData:query", ...args: any) => void) & ((event: "setData:query", ...args: any[]) => void) & ((event: "update:modelValue", ...args: unknown[]) => void) & ((event: "update:modelValue", ...args: any) => void) & ((event: "update:modelValue", ...args: any[]) => void) & ((event: "update:start", val: number) => void) & ((event: "select", ...args: unknown[]) => void) & ((event: "select-all", ...args: unknown[]) => void) & ((event: "selection-change", ...args: unknown[]) => void) & ((event: "cell-mouse-enter", ...args: unknown[]) => void) & ((event: "cell-mouse-leave", ...args: unknown[]) => void) & ((event: "cell-contextmenu", ...args: unknown[]) => void) & ((event: "cell-click", ...args: unknown[]) => void) & ((event: "cell-dblclick", ...args: unknown[]) => void) & ((event: "row-click", ...args: unknown[]) => void) & ((event: "row-contextmenu", ...args: unknown[]) => void) & ((event: "row-dblclick", ...args: unknown[]) => void) & ((event: "header-click", ...args: unknown[]) => void) & ((event: "header-contextmenu", ...args: unknown[]) => void) & ((event: "sort-change", ...args: unknown[]) => void) & ((event: "filter-change", ...args: unknown[]) => void) & ((event: "current-change", ...args: unknown[]) => void) & ((event: "header-dragend", ...args: unknown[]) => void) & ((event: "expand-change", ...args: unknown[]) => void) & ((event: "scroll", ...args: unknown[]) => void) & ((event: "update:current-page", val: number) => void) & ((event: "update:page-size", val: number) => void) & ((event: "size-change", val: number) => void) & ((event: "change", currentPage: number, pageSize: number) => void) & ((event: "prev-click", val: number) => void) & ((event: "next-click", val: number) => void);
     debounceRead: import("lodash").DebouncedFunc<() => Promise<void>>;
     coreProps: import("vue").ComputedRef<{
         type: string;
@@ -833,7 +842,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         sortOrders: ("ascending" | "descending")[];
     }>;
     coreEmits: {};
-    queryData: import("vue").Ref<NormalObject, NormalObject>;
+    queryData: import("vue").ComputedRef<{}>;
+    setQueryData: (e: import("@vunk/core").SetDataEvent) => void;
     tableState: {
         data: NormalObject[];
         total: number;
@@ -872,8 +882,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     }, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & {
         install(app: import("vue").App): void;
     };
-    readonly setData: (obj: any, e: import("@vunk/core").SetDataEvent) => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    'setData:query': any;
     'update:modelValue': any;
     'update:start': (val: number) => boolean;
     select: null;
@@ -917,6 +927,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: import("vue").PropType<any[]>;
         default: () => any[];
     };
+    query: {
+        type: ObjectConstructor;
+        default: any;
+    };
     type: {
         type: StringConstructor;
         default: string;
@@ -1234,6 +1248,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         validator: (val: ("ascending" | "descending" | null)[]) => boolean;
     };
 }>> & Readonly<{
+    "onSetData:query"?: (...args: any[] | unknown[]) => any;
     "onUpdate:modelValue"?: (...args: any[] | unknown[]) => any;
     "onUpdate:start"?: (val: number) => any;
     onSelect?: (...args: unknown[]) => any;
@@ -1336,5 +1351,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     sortOrders: ("ascending" | "descending")[];
     readApi: import("./types").ReadApi;
     queryItems: any[];
+    query: Record<string, any>;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/components/form/src/ctx.d.ts

@@ -132,7 +132,7 @@ export declare const emits: {
     validate: any;
     submit: any;
 };
-export declare const createOnEmits: <T2 extends import("@vunk/core").AnyFunc, EX extends ("submit" | "setData" | "validate")[]>(emit: T2, excludes?: EX) => { [P in EX extends (infer KE)[] ? Exclude<"submit", KE> | Exclude<"setData", KE> | Exclude<"validate", KE> : "submit" | "setData" | "validate"]: {
+export declare const createOnEmits: <T2 extends import("@vunk/core").AnyFunc, EX extends ("submit" | "validate" | "setData")[]>(emit: T2, excludes?: EX) => { [P in EX extends (infer KE)[] ? Exclude<"submit", KE> | Exclude<"validate", KE> | Exclude<"setData", KE> : "submit" | "validate" | "setData"]: {
     setData: (...e: import("@vunk/core").RestParameters<T2>) => void;
     validate: (...e: import("@vunk/core").RestParameters<T2>) => void;
     submit: (...e: import("@vunk/core").RestParameters<T2>) => void;

package/components/form/src/index.vue.d.ts

@@ -244,8 +244,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     disabled: BooleanConstructor;
 }>> & Readonly<{
     onSubmit?: (...args: any[] | unknown[]) => any;
-    onSetData?: (e: import("@vunk/core").SetDataEvent) => any;
     onValidate?: (...args: any[] | unknown[]) => any;
+    onSetData?: (e: import("@vunk/core").SetDataEvent) => any;
 }>, {
     elRef: import("@vunk/shared").AnyFunc;
     inline: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/form",
-  "version": "2.16.9",
+  "version": "2.16.10",
   "description": "",
   "main": "index.esm.js",
   "scripts": {