fix(Form): 增加TreeSelect & Picker

uiwjs · Apr 10, 2023 · 7c776a9 · 7c776a9
1 parent c9c492a
commit 7c776a9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/example/examples/src/routes/Form/index.tsx b/example/examples/src/routes/Form/index.tsx
@@ -85,8 +85,8 @@ const FormDemo = () => {
       attr: {
         showClear: true,
         labelInValue: true,
+        placeholder: '请选择',
       },
-      placeholder: '请输入',
     },
     {
       type: 'stepper',
@@ -153,6 +153,7 @@ const FormDemo = () => {
           {label: '4', value: '4'},
         ],
         showClear: true,
+        placeholder: '请选择',
       },
     },
     {

diff --git a/example/examples/src/routes/SearchBar/index.tsx b/example/examples/src/routes/SearchBar/index.tsx
@@ -40,7 +40,6 @@ const SearchBarDemo = (props: ComProps) => {
         labelInValue
         options={data}
         onChange={val => console.log('val', val)}
-        placeholderColor="#333"
         placeholder="请输入"
       />
     </SafeAreaView>

diff --git a/packages/core/src/Form/README.md b/packages/core/src/Form/README.md
@@ -326,7 +326,7 @@ export default FormDemo
 | 参数 | 说明 | 类型 | 默认值 |
 |------|------|-----|------|
 | `field` | 字段名 | string | - |
-| `type` | 字段类型(`input` \| `textArea`  \| `slider` \| `rate` \| `radio` \| `search`\| `switch`\| `checkBox`\| `stepper`\| `cardList`) | string | - |
+| `type` | 字段类型(`input` \| `textArea`  \| `slider` \| `rate` \| `radio` \| `search`\| `switch`\| `checkBox`\| `stepper`\| `picker`\| `treeSelect`\ | `cardList`) | string | - |
 | `name` | 标签名 | string | - |
 | `validate` | 验证规则 | RulesOption['validate'] | - |
 | `options` | 集合 | Array<{ label: string; value: KeyType }> | - |

diff --git a/packages/core/src/SearchBar/index.tsx b/packages/core/src/SearchBar/index.tsx
@@ -59,12 +59,10 @@ function SearchBar({
   ...searchInputBarProps
 }: SearchBarProps) {
   const theme = useTheme<Theme>();
-
   const styles = createStyles({
     maskBgColor: theme.colors.mask || '#F5F5F5',
     bgColor: theme.colors.background || '#F5F5F5',
     disabledColor: theme.colors.disabled || '#F5F5F5',
-    contentColor: theme.colors.background || '#000',
     iconColor: theme.colors.primary_text || '#fff',
     cancelColor: theme.colors.primary_text || '#7C7D7E',
   });
@@ -96,10 +94,14 @@ function SearchBar({
     setVisivble(true);
   };
 
+  const placeholderStyle = placeholderColor ? { color: placeholderColor } : {};
+
   return !visible ? (
     <Pressable onPress={showSearchBar}>
       <View style={[disabled ? styles.disabled : styles.content, contentStyle]}>
-        <Text style={[styles.contentTitle, { color: placeholderColor }]}>{textValue ? textValue : placeholder}</Text>
+        <Text color="text" style={{ fontSize: 16, ...placeholderStyle }}>
+          {textValue ? textValue : placeholder}
+        </Text>
         {React.isValidElement(extra) ? (
           extra
         ) : curValue && showClear ? (
@@ -178,22 +180,17 @@ export default memo(SearchBar);
 type CreStyle = {
   bgColor: string;
   maskBgColor: string;
-  contentColor: string;
   disabledColor: string;
   iconColor: string;
   cancelColor: string;
 };
 
-function createStyles({ maskBgColor, bgColor, contentColor, disabledColor, iconColor, cancelColor }: CreStyle) {
+function createStyles({ maskBgColor, bgColor, disabledColor, iconColor, cancelColor }: CreStyle) {
   return StyleSheet.create({
     container: {
       flex: 1,
       backgroundColor: bgColor,
     },
-    contentTitle: {
-      fontSize: 16,
-      color: contentColor,
-    },
     icon: {
       backgroundColor: iconColor,
       paddingLeft: 10,