@qin-ui/antd-vue-pro 1.1.0 → 1.1.2

package/es/form/{index-f7d9290e.js → index-6f2704d5.js}

@@ -676,10 +676,10 @@ MapCache.prototype["delete"] = mapCacheDelete;
 MapCache.prototype.get = mapCacheGet;
 MapCache.prototype.has = mapCacheHas;
 MapCache.prototype.set = mapCacheSet;
-var FUNC_ERROR_TEXT$1 = "Expected a function";
+var FUNC_ERROR_TEXT$2 = "Expected a function";
 function memoize(func, resolver) {
   if (typeof func != "function" || resolver != null && typeof resolver != "function") {
-    throw new TypeError(FUNC_ERROR_TEXT$1);
+    throw new TypeError(FUNC_ERROR_TEXT$2);
   }
   var memoized = function() {
     var args = arguments, key = resolver ? resolver.apply(this, args) : args[0], cache = memoized.cache;
@@ -1477,12 +1477,12 @@ var now = function() {
   return root$1.Date.now();
 };
 const now$1 = now;
-var FUNC_ERROR_TEXT = "Expected a function";
+var FUNC_ERROR_TEXT$1 = "Expected a function";
 var nativeMax$1 = Math.max, nativeMin$1 = Math.min;
 function debounce(func, wait, options) {
   var lastArgs, lastThis, maxWait, result, timerId, lastCallTime, lastInvokeTime = 0, leading = false, maxing = false, trailing = true;
   if (typeof func != "function") {
-    throw new TypeError(FUNC_ERROR_TEXT);
+    throw new TypeError(FUNC_ERROR_TEXT$1);
   }
   wait = toNumber(wait) || 0;
   if (isObject$2(options)) {
@@ -1651,6 +1651,26 @@ function parent(object4, path) {
 function isEqual(value, other) {
   return baseIsEqual(value, other);
 }
+var FUNC_ERROR_TEXT = "Expected a function";
+function negate(predicate) {
+  if (typeof predicate != "function") {
+    throw new TypeError(FUNC_ERROR_TEXT);
+  }
+  return function() {
+    var args = arguments;
+    switch (args.length) {
+      case 0:
+        return !predicate.call(this);
+      case 1:
+        return !predicate.call(this, args[0]);
+      case 2:
+        return !predicate.call(this, args[0], args[1]);
+      case 3:
+        return !predicate.call(this, args[0], args[1], args[2]);
+    }
+    return !predicate.apply(this, args);
+  };
+}
 function baseUnset(object4, path) {
   path = castPath(path, object4);
   object4 = parent(object4, path);
@@ -1715,6 +1735,21 @@ function basePickBy(object4, paths, predicate) {
   }
   return result;
 }
+function pickBy(object4, predicate) {
+  if (object4 == null) {
+    return {};
+  }
+  var props = arrayMap(getAllKeysIn(object4), function(prop) {
+    return [prop];
+  });
+  predicate = baseIteratee(predicate);
+  return basePickBy(object4, props, function(value, path) {
+    return predicate(value, path[0]);
+  });
+}
+function omitBy(object4, predicate) {
+  return pickBy(object4, negate(baseIteratee(predicate)));
+}
 function basePick(object4, paths) {
   return basePickBy(object4, paths, function(value, path) {
     return hasIn(object4, path);
@@ -15745,13 +15780,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     useProviderDisabled(ref(props.disabled));
     const updateRefs = inject(UPDATE_REFS);
     const getPath = (fieldKey) => {
-      if (props.path) {
-        if (fieldKey) {
-          return `${props.path}.${fieldKey}`;
-        }
-        return props.path;
-      }
-      return fieldKey || "";
+      return [props.path, fieldKey].filter(Boolean).join(".");
     };
     const setFormItemRef = (el, field) => {
       if (!el)
@@ -15767,53 +15796,44 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       ];
     });
     const withDefault = (field) => {
-      const baseFormItemProps = pick$1(field, [
-        ...formItemPropKeys,
-        ...customItemPropsKeys
-      ]);
-      delete baseFormItemProps.className;
+      const baseFormItemProps = pickBy(
+        field,
+        (v2, k2) => formItemPropKeys.includes(k2) || k2.startsWith("data-form-item")
+      );
       const defaultProps = {
-        validateFirst: true
+        validateFirst: true,
+        showFeedback: !field.fields
       };
-      if (field.fields) {
-        Object.assign(defaultProps, {
-          showFeedback: false
-        });
-      }
       return {
         ...defaultProps,
-        ...baseFormItemProps,
-        container: void 0
+        ...baseFormItemProps
       };
     };
     const omitFormItemProps = memoize((field) => {
-      return omit$1(field, proFormPropKeys.value);
+      return omitBy(
+        field,
+        (v2, k2) => proFormPropKeys.value.includes(k2) || k2.startsWith("data-form-item")
+      );
     });
-    const defaultGrid = {
-      gutter: 24
-    };
     const withDefaultGrid = computed(() => {
       if (props.grid) {
-        if (typeof props.grid === "boolean") {
-          return defaultGrid;
-        }
-        return { ...defaultGrid, ...props.grid };
+        const defaultGrid = { gutter: 24 };
+        return props.grid === true ? defaultGrid : { ...defaultGrid, ...props.grid };
       }
-      return void 0;
+      return props.grid;
     });
     const withDefaultGridItem = memoize((field) => {
-      const defaultSpan = field.fields ? 24 : 8;
       const fieldGridItemProps = pick$1(field, gridItemPropKeys);
       return {
-        ...fieldGridItemProps,
-        span: field.span ?? defaultSpan
+        span: field.fields ? 24 : 8,
+        ...fieldGridItemProps
       };
     });
     return (_ctx, _cache) => {
       const _component_BaseFormItem = resolveComponent("BaseFormItem");
       return openBlock(), createBlock(unref(_sfc_main$2), mergeProps({
         component: _ctx.grid ? unref(Row$1) : void 0
-      }, _ctx.grid ? withDefaultGrid.value : void 0), {
+      }, withDefaultGrid.value), {
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.fields, (field, index2) => {
             return openBlock(), createElementBlock(Fragment, {
@@ -15987,20 +16007,26 @@ const useFormData = (initFormData) => {
       return void 0;
     return get$1(formData.value, path);
   };
-  const setFormData = (path, value) => {
-    let newValue = value;
+  const setFormData = (...args) => {
+    let path;
+    let value;
+    if (args.length === 2) {
+      [path, value] = args;
+    } else {
+      [value] = args;
+    }
     if (path) {
       if (typeof value === "function") {
         const preValue = getFormData(path);
-        newValue = value(preValue);
+        value = value(preValue);
       }
-      set$1(formData.value, path, newValue);
+      set$1(formData.value, path, value);
     } else {
       if (typeof value === "function") {
         const preValue = formData.value;
-        newValue = value(preValue);
+        value = value(preValue);
       }
-      formData.value = newValue;
+      formData.value = value;
     }
   };
   return { formData, getFormData, setFormData, activePath, setActivePath };
@@ -16402,7 +16428,8 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         ...attrs,
         ...methods,
         onFocus: void 0,
-        disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled
+        disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled,
+        slots: void 0
       };
     });
     const is = computed(() => {
@@ -16457,7 +16484,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const index_vue_vue_type_style_index_0_scoped_ae4b888f_lang = "";
+const index_vue_vue_type_style_index_0_scoped_b22e2d2e_lang = "";
 const _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;
   for (const [key, val] of props) {
@@ -16465,7 +16492,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const BaseField = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-ae4b888f"]]);
+const BaseField = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-b22e2d2e"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   ...{
     name: "ContainerFragment",

package/es/form/index.js

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

package/es/index.d.ts

@@ -304,6 +304,10 @@ export declare interface Common<D extends FormData_2 = FormData_2> {
      * @example (val) => val?.trim()
      */
     valueFormatter?: (val: any) => any;
+    /** 以data-form-item-开头的属性将会被渲染至formItem的dom节点 */
+    [key: `data-form-item-${string}`]: string;
+    /** 以data-component-开头的属性将会被渲染至component的dom节点 */
+    [key: `data-component-${string}`]: string;
 }
 
 export declare const COMPONENT_MAP: Map<BaseComponentStringName, Component>;
@@ -6011,7 +6015,10 @@ export declare type SetActivePath = (path: string | undefined) => 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;
+export declare type SetFormData = {
+    (path: string, value: any | ((preValue: DeepReadonly<any>) => any)): void;
+    (value: any | ((preValue: DeepReadonly<any>) => any)): void;
+};
 
 declare type SFCWithInstall<T> = T & Plugin_2;
 

package/es/index.js

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

package/es/style.css

@@ -1,4 +1,4 @@
-.field-component[data-v-ae4b888f] {
+.field-component[data-v-b22e2d2e] {
   width: 100%;
   min-width: 120px;
 }
@@ -41,11 +41,11 @@
   padding: 24px 24px 16px;
   background-color: #fff;
 }
-.pro-table[data-v-892661df] {
+.pro-table[data-v-7e684411] {
   display: flex;
   flex-direction: column;
   min-width: 800px;
 }
-.pro-table[data-v-892661df] .ant-pagination .ant-pagination-total-text {
+.pro-table[data-v-7e684411] .ant-pagination .ant-pagination-total-text {
   flex: 1;
 }

package/es/table/index.js

@@ -1,7 +1,7 @@
 import { createVNode, defineComponent, ref, onMounted, openBlock, createElementBlock, unref, normalizeStyle, createElementVNode, withCtx, createTextVNode, createBlock, toDisplayString, createCommentVNode, mergeModels, useModel, computed, watch, Fragment, renderList, withModifiers, renderSlot, useAttrs, useSlots, mergeProps, createSlots, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { Button, Space, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
 import { useInjectProps, INJECT_KEYS } from "../component-provider/index.js";
-import { A as AntdIcon, _ as _sfc_main$6, g as get, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-f7d9290e.js";
+import { A as AntdIcon, _ as _sfc_main$6, g as get, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-6f2704d5.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) {
@@ -474,7 +474,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ...unref(pagination),
         ...unref(((_e = cache.get()) == null ? void 0 : _e.pagination) ?? {})
       });
-      setSearchParam(void 0, {
+      setSearchParam({
         ...unref(searchParam),
         ...unref(((_f = cache.get()) == null ? void 0 : _f.searchParam) ?? {})
       });
@@ -604,8 +604,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_892661df_lang = "";
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-892661df"]]);
+const Table_vue_vue_type_style_index_0_scoped_7e684411_lang = "";
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7e684411"]]);
 const getDefaultPagination = () => ({ current: 1, pageSize: 10, total: 0 });
 const useTable = ({
   columns: initColumns = [],
@@ -651,7 +651,7 @@ const useTable = ({
   const setSearchField = setField;
   const resetQueryParams = () => {
     setPagination(getDefaultPagination());
-    setSearchParam(void 0, cloneDeep(_initSearchParam));
+    setSearchParam(cloneDeep(_initSearchParam));
   };
   return {
     columns,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "二次封装antd vue组件",
   "type": "module",
   "main": "",