@qin-ui/antd-vue-pro 1.0.32 → 1.0.34

package/LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2023-present pro-components
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/es/component-provider/index.js

@@ -1,6 +1,6 @@
 import { defineComponent, provide, renderSlot } from "vue";
 import "ant-design-vue";
-import { I as INJECT_COMPONENT_PROPS_KEYS } from "../form/index-a8c9e629.js";
+import { I as INJECT_COMPONENT_PROPS_KEYS } from "../form/index-e89e1742.js";
 import { PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS } from "../table/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",

package/es/form/{index-a8c9e629.js → index-e89e1742.js}

@@ -15958,16 +15958,17 @@ const useFields = (initFields) => {
       return void 0;
     return (_a = fieldMap.value[path]) == null ? void 0 : _a.fieldPath;
   };
-  const setField = (path, field) => {
+  const setField = (path, field, updateType = "merge") => {
     const fieldPath = getFieldPath(path);
     if (!fieldPath)
       return;
     let value = field;
+    const preField = getField(path);
     if (typeof field === "function") {
-      const preField = getField(path);
       value = field(preField);
     }
-    set$1(fields.value, fieldPath, value);
+    const newField = updateType === "rewrite" ? value : { ...preField, ...value };
+    set$1(fields.value, fieldPath, newField);
   };
   function findFieldIndex(path) {
     var _a;

package/es/form/index.js

@@ -1,4 +1,4 @@
-import { k, B, d, h, C, b, f, F, j, l, I, R, e, i, U, g, _, m, p, n, s, q, u, r, t } from "./index-a8c9e629.js";
+import { k, B, d, h, C, b, f, F, j, l, I, R, e, i, U, g, _, m, p, n, s, q, u, r, t } from "./index-e89e1742.js";
 import "vue";
 import "ant-design-vue";
 export {

package/es/index.d.ts

@@ -683,14 +683,14 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
     footer?: PanelRender<any> | undefined;
     tableLayout?: TableLayout | undefined;
     columns?: ColumnsType<any> | undefined;
-    sortDirections?: SortOrder[] | undefined;
-    showSorterTooltip?: boolean | undefined;
     scroll?: ({
         x?: string | number | true | undefined;
         y?: string | number | undefined;
     } & {
         scrollToFirstRowOnChange?: boolean | undefined;
     }) | undefined;
+    sortDirections?: SortOrder[] | undefined;
+    showSorterTooltip?: boolean | undefined;
     rowClassName?: string | RowClassName<any> | undefined;
     showHeader?: boolean | undefined;
     customRow?: GetComponentProps<any> | undefined;
@@ -718,6 +718,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
     controlContainer?: ContainerComponent | any;
     tableContainer?: ContainerComponent | any;
     paramCache?: ParamCache | undefined;
+    immediateSearch?: boolean | undefined;
     onResizeColumn?: ((w: number, col: ColumnType_2<any>) => void) | undefined;
     rowSelection?: TableRowSelection<any> | undefined;
 } & VNodeProps & AllowedComponentProps & ComponentCustomProps, __VLS_ctx?: {
@@ -1125,14 +1126,14 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
         footer?: PanelRender<any> | undefined;
         tableLayout?: TableLayout | undefined;
         columns?: ColumnsType<any> | undefined;
-        sortDirections?: SortOrder[] | undefined;
-        showSorterTooltip?: boolean | undefined;
         scroll?: ({
             x?: string | number | true | undefined;
             y?: string | number | undefined;
         } & {
             scrollToFirstRowOnChange?: boolean | undefined;
         }) | undefined;
+        sortDirections?: SortOrder[] | undefined;
+        showSorterTooltip?: boolean | undefined;
         rowClassName?: string | RowClassName<any> | undefined;
         showHeader?: boolean | undefined;
         customRow?: GetComponentProps<any> | undefined;
@@ -1160,6 +1161,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
         controlContainer?: ContainerComponent | any;
         tableContainer?: ContainerComponent | any;
         paramCache?: ParamCache | undefined;
+        immediateSearch?: boolean | undefined;
         onResizeColumn?: ((w: number, col: ColumnType_2<any>) => void) | undefined;
         rowSelection?: TableRowSelection<any> | undefined;
     } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
@@ -1571,14 +1573,14 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
             footer?: PanelRender<any> | undefined;
             tableLayout?: TableLayout | undefined;
             columns?: ColumnsType<any> | undefined;
-            sortDirections?: SortOrder[] | undefined;
-            showSorterTooltip?: boolean | undefined;
             scroll?: ({
                 x?: string | number | true | undefined;
                 y?: string | number | undefined;
             } & {
                 scrollToFirstRowOnChange?: boolean | undefined;
             }) | undefined;
+            sortDirections?: SortOrder[] | undefined;
+            showSorterTooltip?: boolean | undefined;
             rowClassName?: string | RowClassName<any> | undefined;
             showHeader?: boolean | undefined;
             customRow?: GetComponentProps<any> | undefined;
@@ -1606,6 +1608,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
             controlContainer?: ContainerComponent | any;
             tableContainer?: ContainerComponent | any;
             paramCache?: ParamCache | undefined;
+            immediateSearch?: boolean | undefined;
             onResizeColumn?: ((w: number, col: ColumnType_2<any>) => void) | undefined;
             rowSelection?: TableRowSelection<any> | undefined;
         } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
@@ -3288,14 +3291,14 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
     footer?: PanelRender<any> | undefined;
     tableLayout?: TableLayout | undefined;
     columns?: TableColumnsType<any> | undefined;
-    sortDirections?: SortOrder[] | undefined;
-    showSorterTooltip?: boolean | undefined;
     scroll?: ({
         x?: string | number | true | undefined;
         y?: string | number | undefined;
     } & {
         scrollToFirstRowOnChange?: boolean | undefined;
     }) | undefined;
+    sortDirections?: SortOrder[] | undefined;
+    showSorterTooltip?: boolean | undefined;
     rowClassName?: string | RowClassName<any> | undefined;
     showHeader?: boolean | undefined;
     customRow?: GetComponentProps<any> | undefined;
@@ -3323,6 +3326,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
     controlContainer?: any;
     tableContainer?: any;
     paramCache?: ParamCache | undefined;
+    immediateSearch?: boolean | undefined;
     onResizeColumn?: ((w: number, col: TableColumnType<any>) => void) | undefined;
     rowSelection?: TableRowSelection<any> | undefined;
 } & VNodeProps & AllowedComponentProps & ComponentCustomProps, __VLS_ctx?: {
@@ -3730,14 +3734,14 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
         footer?: PanelRender<any> | undefined;
         tableLayout?: TableLayout | undefined;
         columns?: TableColumnsType<any> | undefined;
-        sortDirections?: SortOrder[] | undefined;
-        showSorterTooltip?: boolean | undefined;
         scroll?: ({
             x?: string | number | true | undefined;
             y?: string | number | undefined;
         } & {
             scrollToFirstRowOnChange?: boolean | undefined;
         }) | undefined;
+        sortDirections?: SortOrder[] | undefined;
+        showSorterTooltip?: boolean | undefined;
         rowClassName?: string | RowClassName<any> | undefined;
         showHeader?: boolean | undefined;
         customRow?: GetComponentProps<any> | undefined;
@@ -3765,6 +3769,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
         controlContainer?: any;
         tableContainer?: any;
         paramCache?: ParamCache | undefined;
+        immediateSearch?: boolean | undefined;
         onResizeColumn?: ((w: number, col: TableColumnType<any>) => void) | undefined;
         rowSelection?: TableRowSelection<any> | undefined;
     } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
@@ -4176,14 +4181,14 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
             footer?: PanelRender<any> | undefined;
             tableLayout?: TableLayout | undefined;
             columns?: TableColumnsType<any> | undefined;
-            sortDirections?: SortOrder[] | undefined;
-            showSorterTooltip?: boolean | undefined;
             scroll?: ({
                 x?: string | number | true | undefined;
                 y?: string | number | undefined;
             } & {
                 scrollToFirstRowOnChange?: boolean | undefined;
             }) | undefined;
+            sortDirections?: SortOrder[] | undefined;
+            showSorterTooltip?: boolean | undefined;
             rowClassName?: string | RowClassName<any> | undefined;
             showHeader?: boolean | undefined;
             customRow?: GetComponentProps<any> | undefined;
@@ -4211,6 +4216,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
             controlContainer?: any;
             tableContainer?: any;
             paramCache?: ParamCache | undefined;
+            immediateSearch?: boolean | undefined;
             onResizeColumn?: ((w: number, col: TableColumnType<any>) => void) | undefined;
             rowSelection?: TableRowSelection<any> | undefined;
         } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
@@ -4365,7 +4371,7 @@ declare type SelectSlots = FieldSlot<keyof InstanceType<typeof Select>['$slots']
 
 export declare type SetActivePath = (path: string | undefined) => void;
 
-export declare type SetField = (path: string | undefined, field: Field | ((preField: ReturnType<GetField>) => Field)) => void;
+export declare type SetField = (path: string | undefined, field: Field | ((preField: ReturnType<GetField>) => Field), updateType?: 'rewrite' | 'merge') => void;
 
 export declare type SetFormData = (path: string | undefined, value: any | ((preValue: DeepReadonly<any>) => any)) => void;
 

package/es/index.js

@@ -1,6 +1,6 @@
 import "./style.css";
-import { _ as _sfc_main } from "./form/index-a8c9e629.js";
-import { k, B, d, h, C, b, f, F, j, l, I, R, e, i, U, g, m, p, n, s, q, u, r, t } from "./form/index-a8c9e629.js";
+import { _ as _sfc_main } from "./form/index-e89e1742.js";
+import { k, B, d, h, C, b, f, F, j, l, I, R, e, i, U, g, m, p, n, s, q, u, r, t } from "./form/index-e89e1742.js";
 import BaseTable from "./table/index.js";
 import { PRO_TABLE_INIT_COMPONENT_PROPS_MAP, PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS, useTable } from "./table/index.js";
 import _sfc_main$1 from "./component-provider/index.js";

package/es/style.css

@@ -41,11 +41,11 @@
   padding: 24px 24px 16px;
   background-color: #fff;
 }
-.pro-table[data-v-44c52bd8] {
+.pro-table[data-v-32da447f] {
   display: flex;
   flex-direction: column;
   min-width: 800px;
 }
-.pro-table[data-v-44c52bd8] .ant-pagination .ant-pagination-total-text {
+.pro-table[data-v-32da447f] .ant-pagination .ant-pagination-total-text {
   flex: 1;
 }

package/es/table/index.js

@@ -1,6 +1,6 @@
 import { createVNode, defineComponent, ref, onMounted, openBlock, createElementBlock, unref, normalizeStyle, createElementVNode, withCtx, createTextVNode, createBlock, toDisplayString, createCommentVNode, mergeModels, useModel, computed, watch, Fragment, renderList, withModifiers, renderSlot, inject, useAttrs, useSlots, mergeProps, createSlots, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { Button, Space, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
-import { A as AntdIcon, _ as _sfc_main$6, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-a8c9e629.js";
+import { A as AntdIcon, _ as _sfc_main$6, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-e89e1742.js";
 var ColumnHeightOutlined$2 = { "icon": { "tag": "svg", "attrs": { "viewBox": "64 64 896 896", "focusable": "false" }, "children": [{ "tag": "path", "attrs": { "d": "M840 836H184c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h656c4.4 0 8-3.6 8-8v-60c0-4.4-3.6-8-8-8zm0-724H184c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h656c4.4 0 8-3.6 8-8v-60c0-4.4-3.6-8-8-8zM610.8 378c6 0 9.4-7 5.7-11.7L515.7 238.7a7.14 7.14 0 00-11.3 0L403.6 366.3a7.23 7.23 0 005.7 11.7H476v268h-62.8c-6 0-9.4 7-5.7 11.7l100.8 127.5c2.9 3.7 8.5 3.7 11.3 0l100.8-127.5c3.7-4.7.4-11.7-5.7-11.7H548V378h62.8z" } }] }, "name": "column-height", "theme": "outlined" };
 const ColumnHeightOutlinedSvg = ColumnHeightOutlined$2;
 function _objectSpread$2(target) {
@@ -399,7 +399,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     searchContainer: { default: DefaultSearchContainer },
     controlContainer: { default: DefaultControlContainer },
     tableContainer: { default: DefaultTableContainer },
-    paramCache: { default: void 0 }
+    paramCache: { default: void 0 },
+    immediateSearch: { type: Boolean, default: false }
   },
   emits: ["search"],
   setup(__props, { emit: __emit }) {
@@ -519,6 +520,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return list;
     });
+    onMounted(() => {
+      if (props.immediateSearch) {
+        search();
+      }
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: "pro-table",
@@ -580,8 +586,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_44c52bd8_lang = "";
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-44c52bd8"]]);
+const Table_vue_vue_type_style_index_0_scoped_32da447f_lang = "";
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-32da447f"]]);
 const getDefaultPagination = () => ({ current: 1, pageSize: 10, total: 0 });
 const useTable = ({
   columns: initColumns = [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "二次封装antd vue组件",
   "type": "module",
   "main": "",
@@ -14,9 +14,6 @@
     "type": "git",
     "url": "git+https://github.com/dufan3715/pro-components.git"
   },
-  "scripts": {
-    "build": "vue-tsc && vite build"
-  },
   "keywords": [
     "vue",
     "ant-design-vue",
@@ -38,5 +35,8 @@
   },
   "dependencies": {
     "@ant-design/icons-vue": "^7.0.1"
+  },
+  "scripts": {
+    "build": "vue-tsc && vite build"
   }
-}
+}