@qin-ui/antd-vue-pro 2.0.4 → 2.0.6

package/es/antd-vue-pro.css

@@ -36,17 +36,17 @@
 .control-icon[data-v-88c80679] :hover {
   color: #1677ff;
 }
-.pro-table .pro-table-header[data-v-6701f35a] {
+.pro-table .pro-table-header[data-v-a9d8c25c] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table .pro-table-header[data-v-6701f35a]:empty {
+.pro-table .pro-table-header[data-v-a9d8c25c]:empty {
   display: none;
 }
-.pro-table .pro-table-header + .pro-table-content[data-v-6701f35a] {
+.pro-table .pro-table-header + .pro-table-content[data-v-a9d8c25c] {
   margin-top: 16px;
 }
-.pro-table[data-v-6701f35a] .ant-pagination .ant-pagination-total-text {
+.pro-table[data-v-a9d8c25c] .ant-pagination .ant-pagination-total-text {
   flex: 1;
 }

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

@@ -1,4 +1,4 @@
-import { defineComponent, provide, renderSlot } from "vue";
+import { camelize, defineComponent, provide, renderSlot } from "vue";
 import { i as isPlainObject } from "../vendor/utils/lodash-es-B2uQdS28.js";
 const getPopupContainer = (triggerNode) => triggerNode.closest(".ant-form");
 const INJECT_CONFIG = {
@@ -128,6 +128,11 @@ const INJECT_CONFIG = {
 function getObject(val) {
   return isPlainObject(val) ? val : {};
 }
+function camelizeProperties(obj) {
+  return Object.fromEntries(
+    Object.entries(obj).map(([key, value]) => [camelize(key), value])
+  );
+}
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -150,5 +155,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 export {
   INJECT_CONFIG as I,
   _sfc_main as _,
+  camelizeProperties as c,
   getObject as g
 };

package/es/component-provider/index.js

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

package/es/form/index.js

@@ -4,7 +4,7 @@ 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, g as getObject } from "../component-provider/index-BhdS_9jN.js";
+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";
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },
@@ -36,7 +36,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           return (_a = unref(setFormRef)) == null ? void 0 : _a(el);
         },
         model: unref(formData)
-      }, mergeProps(injectAttrs, _ctx.$attrs)), {
+      }, mergeProps(injectAttrs, unref(camelizeProperties)(_ctx.$attrs))), {
         default: withCtx(() => [
           createVNode(unref(_sfc_main$3), {
             fields: unref(fields),
@@ -513,9 +513,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const form = useForm(false);
     const { getFormData, setFormData } = form;
     const componentRef = ref();
-    const formItemContext = useInjectFormItemContext();
     const triggerFormItemChange = () => {
       if (COMPONENT_MAP.has(props.component)) return;
+      const formItemContext = useInjectFormItemContext();
       formItemContext.onFieldChange();
     };
     const attrs = useAttrs();

package/es/index.js

@@ -3,8 +3,8 @@ import _sfc_main from "./form/index.js";
 import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM, FORM_ITEM_SLOT_KEYS, PATH, SlotComponent, TeleportComponentNamePrefix, 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-BhdS_9jN.js";
-import { I } from "./component-provider/index-BhdS_9jN.js";
+import { _ as _sfc_main$1 } from "./component-provider/index-DXPHmG1H.js";
+import { I } from "./component-provider/index-DXPHmG1H.js";
 const withInstall = (comp) => {
   comp.install = (app) => {
     app.component(comp.name, comp);

package/es/table/index.js

@@ -1,5 +1,5 @@
 import { createElementBlock, openBlock, createElementVNode, defineComponent, ref, computed, watch, watchEffect, createBlock, unref, mergeProps, withCtx, createVNode, createCommentVNode, createTextVNode, toDisplayString, normalizeStyle, toValue, renderSlot, useAttrs, Fragment, renderList, withModifiers, inject, useSlots, onMounted, normalizeClass, isRef, createSlots, normalizeProps, guardReactiveProps, nextTick, reactive } from "vue";
-import { I as INJECT_CONFIG, g as getObject } from "../component-provider/index-BhdS_9jN.js";
+import { I as INJECT_CONFIG, g as getObject, c as camelizeProperties } from "../component-provider/index-DXPHmG1H.js";
 import _sfc_main$9, { ContainerFragment as _sfc_main$a, useForm } from "../form/index.js";
 import { Space, Button, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
 import { p as pick, c as cloneDeep } from "../vendor/utils/lodash-es-B2uQdS28.js";
@@ -448,10 +448,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const config = INJECT_CONFIG["pro-table"];
     const injectProps = inject(config.injectionKey, config.default);
-    const injectAttrs = pick(
-      injectProps,
-      Object.keys(tableProps())
-    );
+    const tableProperties = Object.keys(tableProps());
+    const injectAttrs = pick(injectProps, tableProperties);
     const computedSearchFormConfig = computed(() => {
       return {
         container: DefaultSearchFormContainer,
@@ -459,7 +457,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ...getObject(props.searchFormConfig)
       };
     });
-    const attrs = pick(useAttrs(), Object.keys(tableProps()));
+    const attrs = useAttrs();
+    const tableAttrs = computed(() => {
+      return pick(camelizeProperties(attrs), tableProperties);
+    });
     const { columns, dataSource, searchForm, pageParam, setPageParam } = props.table || {};
     const size = useModel(attrs, "size");
     const loading = useModel(attrs, "loading");
@@ -495,7 +496,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       _search();
     };
     const computedTableProps = computed(() => {
-      return { ...injectAttrs, ...attrs, onChange: void 0 };
+      return { ...injectAttrs, ...tableAttrs.value, onChange: void 0 };
     });
     const indexColumn = {
       title: "序号",
@@ -505,7 +506,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const computedColumns = computed(() => [
       ...props.addIndexColumn ?? injectProps.addIndexColumn ? [indexColumn] : [],
-      ...(attrs.columns ?? (columns == null ? void 0 : columns.value) ?? []).flatMap(
+      ...(tableAttrs.value.columns ?? (columns == null ? void 0 : columns.value) ?? []).flatMap(
         (item, index) => {
           if (item.key) return [{ ...item, key: item.key }];
           if (item.dataIndex) {
@@ -520,11 +521,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return computedColumns.value.filter((item) => !item.hidden);
     });
     const computedDataSource = computed(() => {
-      return attrs.dataSource ?? (dataSource == null ? void 0 : dataSource.value);
+      return tableAttrs.value.dataSource ?? (dataSource == null ? void 0 : dataSource.value);
     });
     const computedPagination = computed(() => {
-      if (attrs.pagination === false) return false;
-      return { ...injectAttrs.pagination, ...pageParam, ...attrs.pagination };
+      if (tableAttrs.value.pagination === false) return false;
+      return {
+        ...injectAttrs.pagination,
+        ...pageParam,
+        ...tableAttrs.value.pagination
+      };
     });
     const onTableChange = (...args) => {
       var _a;
@@ -617,7 +622,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6701f35a"]]);
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a9d8c25c"]]);
 const getDefaultPageParam = () => ({ current: 1, pageSize: 10, total: 0 });
 const pageParamProperty = ["current", "pageSize", "total"];
 const useTable = (params) => {

package/package.json

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