fix: 修复ci报错

antdpro · Jun 10, 2023 · ff2a4be · ff2a4be
1 parent e94e18f
commit ff2a4be
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 129 deletions.
diff --git a/examples/antdp-base/package.json b/examples/antdp-base/package.json
@@ -22,17 +22,17 @@
     "@antdp/hooks": "2.0.18",
     "@antdp/request": "2.0.18",
     "ahooks": "~3.7.2",
-    "antd": "5.4.7",
+    "antd": "5.6.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "overrides": {
     "dva": "^2.6.0-beta.20",
-    "antd": "5.4.7"
+    "antd": "5.6.1"
   },
   "resolutions": {
     "dva": "^2.6.0-beta.20",
-    "antd": "5.4.7"
+    "antd": "5.6.1"
   },
   "devDependencies": {
     "@antdp/config": "2.0.18",

diff --git a/examples/antdp-base/src/pages/Components/ProDescriptions/index.jsx b/examples/antdp-base/src/pages/Components/ProDescriptions/index.jsx
@@ -13,19 +13,15 @@ const Page = () => {
       <Card>
         <ProDescriptions
           title="用户信息"
-          request={async () => {
-            return Promise.resolve({
-              success: true,
-              data: {
-                id: '这是一段文本columns',
-                date: '20200809',
-                money: '1212100',
-                money2: -12345.33,
-                state: 'all',
-                switch: true,
-                state2: 'open',
-              },
-            });
+          dataSource={{
+            id: '这是一段文本columns',
+            date: '20200809',
+            money: '1212100',
+            money3: '1212100',
+            money2: -12345.33,
+            state: 'all',
+            switch: true,
+            state2: 'open',
           }}
           columns={[
             {
@@ -58,13 +54,13 @@ const Page = () => {
             {
               title: '时间',
               key: 'date',
-              dataIndex: 'date',
+              dataIndex: 'date2',
               valueType: 'date',
             },
             {
               title: '时间',
-              key: 'date',
-              dataIndex: 'date',
+              key: 'date2',
+              dataIndex: 'date2',
               valueType: 'date',
               fieldProps: {
                 format: 'DD.MM.YYYY',
@@ -87,8 +83,8 @@ const Page = () => {
             },
             {
               title: 'money无符号',
-              key: 'money',
-              dataIndex: 'money',
+              key: 'money3',
+              dataIndex: 'mone3',
               valueType: 'money',
               fieldProps: {
                 moneySymbol: false,
@@ -110,19 +106,15 @@ const Page = () => {
       <Card>
         <ProDescriptions
           title="客户信息"
-          request={async () => {
-            return Promise.resolve({
-              success: true,
-              data: {
-                id: '这是一段文本columns',
-                date: '20200809',
-                money: '1212100',
-                money2: -12345.33,
-                state: 'all',
-                switch: true,
-                state2: 'open',
-              },
-            });
+          dataSource={{
+            id: '这是一段文本columns',
+            date: '20200809',
+            money: '1212100',
+            money3: '1212100',
+            money2: -12345.33,
+            state: 'all',
+            switch: true,
+            state2: 'open',
           }}
           columns={[
             {
@@ -160,8 +152,8 @@ const Page = () => {
             },
             {
               title: '时间',
-              key: 'date',
-              dataIndex: 'date',
+              key: 'date2',
+              dataIndex: 'date2',
               valueType: 'date',
               fieldProps: {
                 format: 'DD.MM.YYYY',
@@ -184,8 +176,8 @@ const Page = () => {
             },
             {
               title: 'money无符号',
-              key: 'money',
-              dataIndex: 'money',
+              key: 'money3',
+              dataIndex: 'money3',
               valueType: 'money',
               fieldProps: {
                 moneySymbol: false,

diff --git a/examples/antdp-base/src/pages/Components/ProDescriptions/item.js b/examples/antdp-base/src/pages/Components/ProDescriptions/item.js
diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -13,17 +13,17 @@
     "@antdp/basic-layouts": "2.0.18",
     "@antdp/hooks": "2.0.18",
     "@antdp/user-login": "2.0.18",
-    "antd": "5.4.7",
+    "antd": "5.6.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "overrides": {
     "dva": "^2.6.0-beta.20",
-    "antd": "5.4.7"
+    "antd": "5.6.1"
   },
   "resolutions": {
     "dva": "^2.6.0-beta.20",
-    "antd": "5.4.7"
+    "antd": "5.6.1"
   },
   "devDependencies": {
     "@antdp/config": "2.0.18",

diff --git a/examples/website/package.json b/examples/website/package.json
@@ -41,7 +41,7 @@
     "@uiw/react-markdown-preview": "4.1.10",
     "@uiw/reset.css": "1.0.5",
     "@wcj/dark-mode": "^1.0.15",
-    "antd": "5.4.7",
+    "antd": "5.6.1",
     "markdown-react-code-preview-loader": "2.1.5",
     "react-code-preview-layout": "3.0.0",
     "react-test-renderer": "17.0.2",

diff --git a/packages/antdp-ui/src/QuickForm/Hide/store.ts b/packages/antdp-ui/src/QuickForm/Hide/store.ts
@@ -1,7 +1,6 @@
 import React from 'react';
 import {
   setValue,
-  setValues,
   getValue,
 } from 'rc-field-form/lib/utils/valueUtil';
 import {
@@ -85,7 +84,7 @@ class Store {
 
   private setInitialValues = (initialValues: {}, init: boolean) => {
     if (init) {
-      this.store = setValues({}, initialValues, this.store);
+      this.store = Object.assign({}, this.store, initialValues);
     }
   };
 

diff --git a/packages/antdp-ui/src/QuickForm/README.md b/packages/antdp-ui/src/QuickForm/README.md
@@ -19,7 +19,8 @@ const QuickFormDemo = (props) => {
           {
             label: "备注",
             name: "remark",
-            type: "input"
+            type: "input",
+            initialValue:"1234"
           },
           {
             label: "水果",
@@ -195,7 +196,7 @@ export default QuickFormDemo
 <!--rehype:bgWhite=true&codeSandbox=true&codePen=true-->
 ```jsx  mdx:preview
 import React, { useRef } from 'react';
-import { QuickForm,CardPro,getChildFormItemFun } from '@antdp/antdp-ui'
+import { QuickForm,CardPro } from '@antdp/antdp-ui'
 
 const QuickFormDemo = (props) => {
   const baseRef = useRef();