Merge pull request #64 from hocgin/v4.0.37

V4.0.37
hocgin · Dec 20, 2021 · 7769466 · 7769466 · vercel · Dec 20, 2021
2 parents a2e2491 + 4a32a1b
commit 7769466
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hocgin/ui",
-  "version": "4.0.36",
+  "version": "4.0.37",
   "sideEffects": [
     ".less",
     ".css"

diff --git a/src/Promise/components/Schema/scheme.tsx b/src/Promise/components/Schema/scheme.tsx
@@ -130,12 +130,16 @@ export const SchemeColumns: Record<string, ProRenderFieldPropsType> = {
       let params: any = props?.params || {};
       let valueEnum = props?.valueEnum || {};
 
+      console.log('text', text);
+      console.log('text type', typeof text);
+
+
       let options: any = [];
       if (text) {
-        options = Object.keys(valueEnum).map((key) => ({
-          value: key,
+        options = Object.keys(valueEnum).map((value) => ({
+          value: typeof text === 'number' ? parseInt(value) : value,
           // title
-          key: valueEnum[key]?.text || valueEnum[key],
+          key: valueEnum[value]?.text ?? valueEnum[value],
         }));
       }
       return (

diff --git a/src/Promise/components/Search/index.tsx b/src/Promise/components/Search/index.tsx
@@ -71,7 +71,7 @@ const Index: React.FC<{
       {...rest}
     >
       {data.map(({ key, image, description, value }: SearchOption) => (
-        <Select.Option key={`${value}`} value={value} label={key}>
+        <Select.Option value={value} label={key}>
           <OptionView title={key} image={image} description={description} />
         </Select.Option>
       ))}

diff --git a/src/Promise/demos/scheme-archive-config.tsx b/src/Promise/demos/scheme-archive-config.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Dom } from '@hocgin/ui';
+import { Dom, Utils } from '@hocgin/ui';
 import treedata from './data-tree';
 
 export const config: any = {
@@ -49,12 +49,13 @@ export const config: any = {
             },
             params: {
               useAction: {
-                initialValues: async (params: Record<string, any>) => [
-                  {
-                    key: 'lab',
-                    value: 'vx',
-                  },
-                ],
+                initialValues: async (params: Record<string, any>) =>
+                  Utils.Lang.sleep(1000).then(() => [
+                    {
+                      key: '这是key字段',
+                      value: 'vx',
+                    },
+                  ]),
               },
             },
           },
@@ -70,24 +71,20 @@ export const config: any = {
         return [
           {
             key: '22',
-            title: 'search2',
+            title: 'search sleep',
             dataIndex: 'search2',
             valueType: Dom.columnPrefix('search'),
             hideInTable: true,
-            valueEnum: {
-              [search2]: search2Name,
-            },
+            valueEnum: { [search2]: search2Name },
             params: {
               useAction: {
-                initialValues: async (params: Record<string, any>) => {
-                  console.log('请求 search2', params);
-                  return [
+                initialValues: async (params: Record<string, any>) =>
+                  Utils.Lang.sleep(1000).then(() => [
                     {
-                      key: 'lab',
+                      key: '这是key字段',
                       value: 'vx',
                     },
-                  ];
-                },
+                  ]),
               },
             },
           },

diff --git a/src/Utils/types/rt-grass.ts b/src/Utils/types/rt-grass.ts
@@ -1,12 +1,12 @@
 // :: 网络数据类型协议
 
 export interface Option {
-  value: string;
+  value: any;
   key: string;
 }
 
 export interface SearchOption {
-  value: string;
+  value: any;
   key?: string;
   image?: string;
   description?: string;