fix(description): ensure that props respond

README.md

@@ -148,7 +148,7 @@ Support modern browsers, not IE
 
 ## Maintainer
 
-[@Vben](https://github.com/anncwb)。
+[@Vben](https://github.com/anncwb)
 
 ## Donate
 
@@ -156,7 +156,7 @@ If you think this project is helpful to you, you can help the author buy a cup o
 
 ![donate](https://anncwb.github.io/anncwb/images/sponsor.png)
 
-[Paypal Me](https://www.paypal.com/paypalme/cvvben)
+<a style="display: block;width: 100px;height: 50px;line-height: 50px; color: #fff;text-align: center; background: #408aed;border-radius: 4px;" href="https://www.paypal.com/paypalme/cvvben">Paypal Me</a>
 
 ## Discord
 

README.zh-CN.md

@@ -156,7 +156,7 @@ yarn build
 
 ![donate](https://anncwb.github.io/anncwb/images/sponsor.png)
 
-[Paypal Me](https://www.paypal.com/paypalme/cvvben)
+<a style="display: block;width: 100px;height: 50px;line-height: 50px; color: #fff;text-align: center; background: #408aed;border-radius: 4px;" href="https://www.paypal.com/paypalme/cvvben">Paypal Me</a>
 
 ## 交流
 

src/components/Description/index.ts

 // import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
 // export const Description = createAsyncComponent(() => import('./src/index'));
 
-import Description from './src/index';
+import Description from './src/index.vue';
 
 export { Description };
 export * from './src/types';

src/components/Description/src/index.tsx → src/components/Description/src/index.vue

-import type { DescOptions, DescInstance, DescItem } from './types';
+<script lang="tsx">
+  import type { DescOptions, DescInstance, DescItem } from './types';
+  import type { DescriptionsProps } from 'ant-design-vue/es/descriptions/index';
+  import type { CSSProperties } from 'vue';
+  import type { CollapseContainerOptions } from '/@/components/Container/index';
 
-import { defineComponent, computed, ref, unref, CSSProperties } from 'vue';
-import { get } from 'lodash-es';
-import { Descriptions } from 'ant-design-vue';
-import { DescriptionsProps } from 'ant-design-vue/es/descriptions/index';
-import { CollapseContainer, CollapseContainerOptions } from '/@/components/Container/index';
+  import { defineComponent, computed, ref, unref } from 'vue';
+  import { get } from 'lodash-es';
+  import { Descriptions } from 'ant-design-vue';
+  import { CollapseContainer } from '/@/components/Container/index';
 
-import descProps from './props';
+  import { useDesign } from '/@/hooks/web/useDesign';
 
-import { isFunction } from '/@/utils/is';
-import { getSlot } from '/@/utils/helper/tsxHelper';
-import { cloneDeep } from 'lodash-es';
-import { deepMerge } from '/@/utils';
+  import { isFunction } from '/@/utils/is';
+  import { getSlot } from '/@/utils/helper/tsxHelper';
+  import { cloneDeep } from 'lodash-es';
+  import { deepMerge } from '/@/utils';
 
-const prefixCls = 'description';
-export default defineComponent({
+  import descProps from './props';
+  import { useAttrs } from '/@/hooks/core/useAttrs';
+
+  export default defineComponent({
     name: 'Description',
     props: descProps,
     emits: ['register'],
-  setup(props, { attrs, slots, emit }) {
+    setup(props, { slots, emit }) {
       const propsRef = ref<Partial<DescOptions> | null>(null);
 
+      const { prefixCls } = useDesign('description');
+      const attrs = useAttrs();
+
       // Custom title component: get title
       const getMergeProps = computed(() => {
         return {
@@ -56,7 +64,7 @@ export default defineComponent({
       );
 
       const getDescriptionsProps = computed(() => {
-      return { ...attrs, ...unref(getProps) } as DescriptionsProps;
+        return { ...unref(attrs), ...unref(getProps) } as DescriptionsProps;
       });
 
       /**
@@ -64,8 +72,7 @@ export default defineComponent({
        */
       function setDescProps(descProps: Partial<DescOptions>): void {
         // Keep the last setDrawerProps
-      const mergeProps = deepMerge(unref(propsRef) || {}, descProps);
-      propsRef.value = cloneDeep(mergeProps);
+        propsRef.value = { ...(unref(propsRef) as Recordable), ...descProps } as Recordable;
       }
 
       // Prevent line breaks
@@ -93,7 +100,8 @@ export default defineComponent({
             }
 
             const getContent = () => {
-            const _data = unref(data);
+              const _data = unref(getProps)?.data;
+              if (!_data) return null;
               const getField = get(_data, field);
               return isFunction(render) ? render(getField, _data) : getField ?? '';
             };
@@ -152,4 +160,5 @@ export default defineComponent({
       emit('register', methods);
       return () => (unref(useWrapper) ? renderContainer() : renderDesc());
     },
-});
+  });
+</script>

src/components/Description/src/props.ts

 import type { PropType } from 'vue';
 import type { CollapseContainerOptions } from '/@/components/Container';
 import type { DescItem } from './types';
-
 import { propTypes } from '/@/utils/propTypes';
 export default {
   useCollapse: propTypes.bool.def(true),
-
   title: propTypes.string.def(''),
-
   size: propTypes.oneOf(['small', 'default', 'middle', undefined]).def('small'),
-
   bordered: propTypes.bool.def(true),
-
   column: {
     type: [Number, Object] as PropType<number | Recordable>,
     default: () => {
       return { xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 };
     },
   },
-
   collapseOptions: {
     type: Object as PropType<CollapseContainerOptions>,
     default: null,

src/components/Page/src/PageFooter.vue

@@ -17,6 +17,7 @@
 
   export default defineComponent({
     name: 'PageFooter',
+    inheritAttrs: false,
     setup() {
       const { prefixCls } = useDesign('page-footer');
       const { getCalcContentWidth } = useMenuSetting();

src/components/Page/src/PageWrapper.vue

@@ -37,6 +37,7 @@
   import { PageHeader } from 'ant-design-vue';
   export default defineComponent({
     name: 'PageWrapper',
+    inheritAttrs: false,
     components: { PageFooter, PageHeader },
     props: {
       dense: propTypes.bool,

src/views/demo/comp/desc/index.vue

@@ -72,12 +72,13 @@
         schema: schema,
       });
 
-      const [register1] = useDescription({
+      const [register1, { setDescProps }] = useDescription({
         title: '无边框',
         bordered: false,
         data: mockData,
         schema: schema,
       });
+
       return { mockData, schema, register, register1 };
     },
   });