Merge pull request #97 from wenccro/main

fix:selectSetter的options支持方法stringSetter支持预览和去除边框

Author: hzd822

src/setter/select-setter/index.tsx

@@ -6,20 +6,23 @@ interface SelectSetterProps {
   value?: any;
   mode?: 'single' | 'multiple' | 'tag';
   defaultValue?: any;
-  options: any[];
+  options: any[] | Function;
   /**
    * 展开后是否能搜索
    */
   showSearch?: boolean;
   // 是否可以清除
-  hasClear?:boolean
+  hasClear?: boolean
 }
 
 interface SelectSetterState {
   setterValue: string | null;
 }
 
-const formateOptions = (options: any[]) => {
+const formateOptions = (options: any[] | Function) => {
+  if (typeof options === 'function') {
+    return options();
+  }
   return options.map((item: any) => {
     if (item.children) {
       const children = item.children.map((child: any) => {

src/setter/string-setter/index.tsx

@@ -3,6 +3,8 @@ import { Input } from '@alifd/next';
 import './index.less';
 
 interface StringSetterProps {
+  isPreview?: boolean;
+  hasBorder?: boolean;
   value: string;
   defaultValue: string;
   placeholder: string;
@@ -13,9 +15,11 @@ export default class StringSetter extends React.PureComponent<StringSetterProps,
   static displayName = 'StringSetter';
 
   render() {
-    const { onChange, placeholder, value } = this.props;
+    const { onChange, placeholder, value, isPreview = false, hasBorder = true } = this.props;
     return (
       <Input
+        isPreview={isPreview}
+        hasBorder={hasBorder}
         size="small"
         value={value}
         placeholder={placeholder || ''}