@qin-ui/antd-vue-pro 2.0.13 → 2.0.15

package/es/component-provider/{index-DXPHmG1H.js → index-D8NF18a1.js}

@@ -1,5 +1,5 @@
 import { camelize, defineComponent, provide, renderSlot } from "vue";
-import { i as isPlainObject } from "../vendor/utils/lodash-es-B2uQdS28.js";
+import { i as isPlainObject } from "../vendor/utils/lodash-es-p6jau26B.js";
 const getPopupContainer = (triggerNode) => triggerNode.closest(".ant-form");
 const INJECT_CONFIG = {
   "pro-table": {
@@ -134,6 +134,9 @@ function camelizeProperties(obj) {
   );
 }
 const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    inheritAttrs: false
+  },
   __name: "index",
   props: {
     componentVars: {}

package/es/component-provider/index.js

@@ -1,4 +1,4 @@
-import { I, _ } from "./index-DXPHmG1H.js";
+import { I, _ } from "./index-D8NF18a1.js";
 export {
   I as INJECT_CONFIG,
   _ as default

package/es/form/index.js

@@ -5,8 +5,8 @@ import { useProviderDisabled, useInjectDisabled } from "ant-design-vue/es/config
 import { colProps } from "ant-design-vue/es/grid/Col";
 import { formItemProps, useInjectFormItemContext } from "ant-design-vue/es/form";
 import { defineComponent, provide, inject, useSlots, watchEffect, createBlock, openBlock, unref, mergeProps, withCtx, createVNode, renderSlot, computed, toValue, normalizeProps, guardReactiveProps, resolveComponent, createElementBlock, Fragment, renderList, createSlots, ref, reactive, useAttrs, createCommentVNode, resolveDynamicComponent, isVNode, createTextVNode, toDisplayString } from "vue";
-import { I as INJECT_CONFIG, c as camelizeProperties, g as getObject } from "../component-provider/index-DXPHmG1H.js";
-import { i as isPlainObject, t as toPath, g as get, s as set, o as omit, c as cloneDeep } from "../vendor/utils/lodash-es-B2uQdS28.js";
+import { I as INJECT_CONFIG, c as camelizeProperties, g as getObject } from "../component-provider/index-D8NF18a1.js";
+import { i as isPlainObject, t as toPath, g as get, s as set, o as omit, c as cloneDeep } from "../vendor/utils/lodash-es-p6jau26B.js";
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },
   __name: "index",
@@ -41,7 +41,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(unref(_sfc_main$3), {
             fields: unref(fields),
-            grid: _ctx.grid
+            grid: __props.grid
           }, null, 8, ["fields", "grid"]),
           renderSlot(_ctx.$slots, "default")
         ]),
@@ -234,7 +234,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
                               default: withCtx(() => [
                                 field.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
                                   key: 0,
-                                  grid: field.grid ?? _ctx.grid,
+                                  grid: field.grid ?? __props.grid,
                                   fields: field.fields,
                                   disabled: field.disabled
                                 }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(unref(_sfc_main$2), mergeProps({
@@ -527,13 +527,13 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       formItemContext.onFieldChange();
     };
     const attrs = useAttrs();
-    const { valueFormatter } = attrs;
     function getOldValue() {
       return cloneDeep(getFormData == null ? void 0 : getFormData(props.path));
     }
     const value = computed({
       get() {
         let val = getFormData == null ? void 0 : getFormData(props.path);
+        const { valueFormatter } = groupedAttrs.value;
         if (typeof valueFormatter === "object" && typeof valueFormatter.get === "function") {
           val = valueFormatter.get(val);
         }
@@ -541,6 +541,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       },
       set(val) {
         let newVal = val;
+        const { valueFormatter } = groupedAttrs.value;
         if (valueFormatter) {
           if (typeof valueFormatter === "function") {
             newVal = valueFormatter(val, getOldValue());
@@ -566,9 +567,15 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         { disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled },
         { modelName: attrs.modelName ?? initProps.modelName ?? "value" }
       );
-      const { valueFormatter: valueFormatter2, modelName, slots, componentClassName, componentStyle, componentContainer, ...rest } = mergedProps;
+      const { valueFormatter, modelName, slots, componentClassName, componentStyle, componentContainer, ...rest } = mergedProps;
       const bindAttrs = omit(rest, [modelName, `onUpdate:${modelName}`]);
-      return { attrs: bindAttrs, slots, componentContainer, modelName };
+      return {
+        attrs: bindAttrs,
+        slots,
+        componentContainer,
+        modelName,
+        valueFormatter
+      };
     });
     const teleportComponent = inject(
       `${TeleportComponentNamePrefix}${props.path}`,
@@ -584,7 +591,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$1), {
         component: groupedAttrs.value.componentContainer,
-        path: _ctx.path
+        path: __props.path
       }, {
         default: withCtx(() => [
           is.value ? (openBlock(), createBlock(resolveDynamicComponent(is.value), mergeProps({ key: 0 }, groupedAttrs.value.attrs, {
@@ -592,13 +599,13 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             ref: componentRef,
             [`${groupedAttrs.value.modelName}`]: value.value,
             [`onUpdate:${groupedAttrs.value.modelName}`]: _cache[0] || (_cache[0] = ($event) => value.value = $event),
-            path: _ctx.path
+            path: __props.path
           }), createSlots({ _: 2 }, [
             renderList(groupedAttrs.value.slots, (slot, name) => {
               return {
                 name,
                 fn: withCtx((scoped) => [
-                  createVNode(unref(_sfc_main), mergeProps({ path: _ctx.path }, scoped, { component: slot }), null, 16, ["path", "component"])
+                  createVNode(unref(_sfc_main), mergeProps({ path: __props.path }, scoped, { component: slot }), null, 16, ["path", "component"])
                 ])
               };
             })
@@ -613,11 +620,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   ...{ name: "ContainerFragment", inheritAttrs: false },
   __name: "index",
   props: {
-    component: {}
+    component: { type: [Object, Function] }
   },
   setup(__props) {
     return (_ctx, _cache) => {
-      return _ctx.component ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), {
+      return __props.component ? (openBlock(), createBlock(resolveDynamicComponent(__props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), {
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "default")
         ]),
@@ -630,12 +637,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "SlotComponent", inheritAttrs: false },
   __name: "index",
   props: {
-    component: { type: [Object, String, Number, Boolean, null, Function] }
+    component: { type: [Object, Function, String, Number, Boolean, null] }
   },
   setup(__props) {
     return (_ctx, _cache) => {
-      return isVNode(_ctx.component) || typeof _ctx.component === "function" ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-        createTextVNode(toDisplayString(_ctx.component), 1)
+      return isVNode(__props.component) || typeof __props.component === "function" ? (openBlock(), createBlock(resolveDynamicComponent(__props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+        createTextVNode(toDisplayString(__props.component), 1)
       ], 64));
     };
   }

package/es/index.js

@@ -3,8 +3,8 @@ import _sfc_main from "./form/index.js";
 import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM_ITEM_SLOT_KEYS, InjectionFormKey, InjectionPathKey, SlotComponent, TeleportComponentNamePrefix, getInitProps, useFields, useForm, useFormData } from "./form/index.js";
 import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
-import { _ as _sfc_main$1 } from "./component-provider/index-DXPHmG1H.js";
-import { I } from "./component-provider/index-DXPHmG1H.js";
+import { _ as _sfc_main$1 } from "./component-provider/index-D8NF18a1.js";
+import { I } from "./component-provider/index-D8NF18a1.js";
 const withInstall = (comp) => {
   comp.install = (app) => {
     app.component(comp.name, comp);

package/es/table/index.js

@@ -1,8 +1,8 @@
 import { createElementBlock, openBlock, createElementVNode, defineComponent, ref, computed, watch, watchEffect, createBlock, unref, mergeProps, withCtx, createVNode, renderSlot, resolveDynamicComponent, createTextVNode, createCommentVNode, Fragment, toDisplayString, normalizeStyle, toValue, useAttrs, renderList, withModifiers, inject, useSlots, onMounted, normalizeClass, isRef, createSlots, normalizeProps, guardReactiveProps, nextTick, reactive } from "vue";
-import { I as INJECT_CONFIG, g as getObject, c as camelizeProperties } from "../component-provider/index-DXPHmG1H.js";
+import { I as INJECT_CONFIG, g as getObject, c as camelizeProperties } from "../component-provider/index-D8NF18a1.js";
 import _sfc_main$9, { ContainerFragment as _sfc_main$a, useForm } from "../form/index.js";
 import { Space, Button, theme, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
-import { p as pick, c as cloneDeep } from "../vendor/utils/lodash-es-B2uQdS28.js";
+import { p as pick, c as cloneDeep } from "../vendor/utils/lodash-es-p6jau26B.js";
 import { useConfigContextInject } from "ant-design-vue/es/config-provider/context";
 import { tableProps } from "ant-design-vue/es/table";
 const _export_sfc = (sfc, props) => {
@@ -23,9 +23,9 @@ const _hoisted_1$3 = {
   viewBox: "64 64 896 896"
 };
 function _sfc_render$2(_ctx, _cache) {
-  return openBlock(), createElementBlock("svg", _hoisted_1$3, _cache[0] || (_cache[0] = [
+  return openBlock(), createElementBlock("svg", _hoisted_1$3, [..._cache[0] || (_cache[0] = [
     createElementVNode("path", { d: "M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z" }, null, -1)
-  ]));
+  ])]);
 }
 const DownOutlined = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$2]]);
 const _sfc_main$7 = /* @__PURE__ */ defineComponent({
@@ -35,9 +35,9 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     form: {},
     layout: { default: "grid" },
     expand: { type: [Boolean, Object], default: true },
-    searchButton: { default: void 0 },
-    resetButton: { default: void 0 },
-    expandButton: { default: void 0 },
+    searchButton: { type: [Object, Function], default: void 0 },
+    resetButton: { type: [Object, Function], default: void 0 },
+    expandButton: { type: [Object, Function], default: void 0 },
     class: {},
     style: {}
   },
@@ -150,7 +150,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$9), mergeProps(layoutProps.value, {
-        form: _ctx.form,
+        form: __props.form,
         class: "pro-table_search-form transition"
       }), {
         default: withCtx(() => [
@@ -160,7 +160,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           }, {
             default: withCtx(() => [
               renderSlot(_ctx.$slots, "reset-button", { onClick: onReset }, () => [
-                _ctx.resetButton ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.resetButton), {
+                __props.resetButton ? (openBlock(), createBlock(resolveDynamicComponent(__props.resetButton), {
                   key: 0,
                   onClick: onReset
                 })) : (openBlock(), createBlock(unref(Button), {
@@ -168,15 +168,14 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
                   class: "pro-table_search-form_reset-button",
                   onClick: onReset
                 }, {
-                  default: withCtx(() => _cache[0] || (_cache[0] = [
+                  default: withCtx(() => [..._cache[0] || (_cache[0] = [
                     createTextVNode("重置", -1)
-                  ])),
-                  _: 1,
-                  __: [0]
+                  ])]),
+                  _: 1
                 }))
               ], true),
               renderSlot(_ctx.$slots, "search-button", { onClick: onSearch }, () => [
-                _ctx.searchButton ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.searchButton), {
+                __props.searchButton ? (openBlock(), createBlock(resolveDynamicComponent(__props.searchButton), {
                   key: 0,
                   onClick: onSearch
                 })) : (openBlock(), createBlock(unref(Button), {
@@ -186,16 +185,15 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
                   "html-type": "submit",
                   onClick: onSearch
                 }, {
-                  default: withCtx(() => _cache[1] || (_cache[1] = [
+                  default: withCtx(() => [..._cache[1] || (_cache[1] = [
                     createTextVNode(" 查询 ", -1)
-                  ])),
-                  _: 1,
-                  __: [1]
+                  ])]),
+                  _: 1
                 }))
               ], true),
               renderSlot(_ctx.$slots, "expand-button", { onClick: changeExpandStatus }, () => [
                 showExpandToggle.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                  _ctx.expandButton ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.expandButton), {
+                  __props.expandButton ? (openBlock(), createBlock(resolveDynamicComponent(__props.expandButton), {
                     key: 0,
                     "expand-status": expandStatus.value,
                     onClick: changeExpandStatus
@@ -280,9 +278,9 @@ const _hoisted_1$2 = {
   viewBox: "64 64 896 896"
 };
 function _sfc_render$1(_ctx, _cache) {
-  return openBlock(), createElementBlock("svg", _hoisted_1$2, _cache[0] || (_cache[0] = [
+  return openBlock(), createElementBlock("svg", _hoisted_1$2, [..._cache[0] || (_cache[0] = [
     createElementVNode("path", { 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" }, null, -1)
-  ]));
+  ])]);
 }
 const ColumnHeightOutlined = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$1]]);
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
@@ -343,9 +341,9 @@ const _hoisted_1$1 = {
   viewBox: "64 64 896 896"
 };
 function _sfc_render(_ctx, _cache) {
-  return openBlock(), createElementBlock("svg", _hoisted_1$1, _cache[0] || (_cache[0] = [
+  return openBlock(), createElementBlock("svg", _hoisted_1$1, [..._cache[0] || (_cache[0] = [
     createElementVNode("path", { d: "M880.1 154H143.9c-24.5 0-39.8 26.7-27.5 48L349 597.4V838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3 31.8-32V597.4L907.7 202c12.2-21.3-3.1-48-27.6-48zM603.4 798H420.6V642h182.9v156zm9.6-236.6l-9.5 16.6h-183l-9.5-16.6L212.7 226h598.6L613 561.4z" }, null, -1)
-  ]));
+  ])]);
 }
 const FilterOutlined = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render]]);
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
@@ -426,11 +424,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       indeterminate: indeterminate.value,
                       onChange: onCheckAllChange
                     }, {
-                      default: withCtx(() => _cache[2] || (_cache[2] = [
+                      default: withCtx(() => [..._cache[2] || (_cache[2] = [
                         createTextVNode(" 全选 ", -1)
-                      ])),
-                      _: 1,
-                      __: [2]
+                      ])]),
+                      _: 1
                     }, 8, ["checked", "indeterminate"])
                   ])
                 ]),
@@ -506,7 +503,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     immediateSearch: { type: Boolean, default: void 0 },
     control: { type: [Boolean, Object], default: void 0 },
     searchFormConfig: { default: void 0 },
-    tableContainer: { type: Boolean, default: void 0 }
+    tableContainer: { type: [Object, Function, Boolean], default: void 0 }
   },
   setup(__props) {
     const props = __props;

package/es/vendor/utils/{lodash-es-B2uQdS28.js → lodash-es-p6jau26B.js}

@@ -81,10 +81,10 @@ function isFunction(value) {
   return tag == funcTag$2 || tag == genTag$1 || tag == asyncTag || tag == proxyTag;
 }
 var coreJsData = root["__core-js_shared__"];
-var maskSrcKey = function() {
+var maskSrcKey = (function() {
   var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || "");
   return uid ? "Symbol(src)_1." + uid : "";
-}();
+})();
 function isMasked(func) {
   return !!maskSrcKey && maskSrcKey in func;
 }
@@ -127,7 +127,7 @@ function getNative(object, key) {
 }
 var WeakMap = getNative(root, "WeakMap");
 var objectCreate = Object.create;
-var baseCreate = /* @__PURE__ */ function() {
+var baseCreate = /* @__PURE__ */ (function() {
   function object() {
   }
   return function(proto) {
@@ -142,7 +142,7 @@ var baseCreate = /* @__PURE__ */ function() {
     object.prototype = void 0;
     return result;
   };
-}();
+})();
 function apply(func, thisArg, args) {
   switch (args.length) {
     case 0:
@@ -186,14 +186,14 @@ function constant(value) {
     return value;
   };
 }
-var defineProperty = function() {
+var defineProperty = (function() {
   try {
     var func = getNative(Object, "defineProperty");
     func({}, "", {});
     return func;
   } catch (e) {
   }
-}();
+})();
 var baseSetToString = !defineProperty ? identity : function(func, string) {
   return defineProperty(func, "toString", {
     "configurable": true,
@@ -303,9 +303,9 @@ function baseIsArguments(value) {
 var objectProto$8 = Object.prototype;
 var hasOwnProperty$7 = objectProto$8.hasOwnProperty;
 var propertyIsEnumerable$1 = objectProto$8.propertyIsEnumerable;
-var isArguments = baseIsArguments(/* @__PURE__ */ function() {
+var isArguments = baseIsArguments(/* @__PURE__ */ (function() {
   return arguments;
-}()) ? baseIsArguments : function(value) {
+})()) ? baseIsArguments : function(value) {
   return isObjectLike(value) && hasOwnProperty$7.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
 };
 function stubFalse() {
@@ -334,7 +334,7 @@ var freeExports$1 = typeof exports == "object" && exports && !exports.nodeType &
 var freeModule$1 = freeExports$1 && typeof module == "object" && module && !module.nodeType && module;
 var moduleExports$1 = freeModule$1 && freeModule$1.exports === freeExports$1;
 var freeProcess = moduleExports$1 && freeGlobal.process;
-var nodeUtil = function() {
+var nodeUtil = (function() {
   try {
     var types = freeModule$1 && freeModule$1.require && freeModule$1.require("util").types;
     if (types) {
@@ -343,7 +343,7 @@ var nodeUtil = function() {
     return freeProcess && freeProcess.binding && freeProcess.binding("util");
   } catch (e) {
   }
-}();
+})();
 var nodeIsTypedArray = nodeUtil && nodeUtil.isTypedArray;
 var isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray;
 var objectProto$7 = Object.prototype;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "二次封装antd vue组件",
   "type": "module",
   "module": "es/index.js",