Merge branch 'feat_enhanced_typeSystem' into 'dev'

improvement(type): improve easy select type

See merge request dt-insight-front/infrastructure/dt-react-component!43

Author: zhangtengjin

package-lock.json

@@ -102,7 +102,9 @@
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^5.16.0",
+    "eslint-config-prettier": "^6.11.0",
     "eslint-config-standard": "^12.0.0",
+    "eslint-formatter-pretty": "^4.0.0",
     "eslint-loader": "^1.7.1",
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-jest": "^22.14.0",
@@ -112,9 +114,8 @@
     "eslint-plugin-react": "^7.11.1",
     "eslint-plugin-sort-requires": "^2.1.0",
     "eslint-plugin-standard": "^4.0.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-formatter-pretty": "^4.0.0",
     "eslint-plugin-unicorn": "^21.0.0",
+    "fetch-jsonp": "^1.1.3",
     "file-loader": "^6.0.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
@@ -147,7 +148,6 @@
     "@handsontable/react": "^2.1.0",
     "antd": "3.26.13",
     "classnames": "^2.2.6",
-    "fetch-jsonp": "^1.1.3",
     "handsontable": "^6.2.2",
     "highlight.js": "^9.14.2",
     "lodash": "^4.17.15",
@@ -158,4 +158,4 @@
     "react-router": "3.0.4",
     "showdown": "^1.9.0"
   }
-}
+}

package.json

@@ -1,15 +1,29 @@
 import * as React from 'react';
 import { Select } from 'antd';
 import debounce from 'lodash/debounce';
-
+import { SelectProps } from 'antd/lib/select'
 const { Option } = Select;
-class EasySelect extends React.Component<any, any> {
+
+interface EasySelectProps {
+    autoValue?: string;
+    dataSource?: any[];
+    clearValueRequest?: boolean;
+    isLazy?: boolean;
+    filterLocal?: boolean;
+    servise?: (str: string) => Promise<any>;
+}
+
+const initStates = {
+    dataSource: [],
+    str: '',
+    scrollPage: 1,
+    allData: []
+}
+type EasySelectStates = typeof initStates
+class EasySelect extends React.Component<EasySelectProps & SelectProps, EasySelectStates> {
 
     state = {
-        dataSource: [],
-        str: '',
-        scrollPage: 1,
-        allData: []
+        ...initStates
     };
 
     static getDerivedStateFromProps({ dataSource }) {
@@ -26,7 +40,7 @@ class EasySelect extends React.Component<any, any> {
         }
     }
 
-    onSearch = (str: any) => {
+    onSearch = (str: string) => {
         const { clearValueRequest = false, autoValue } = this.props;
         if (!clearValueRequest && !str) {
             // 默认清空展示上次的数据
@@ -40,7 +54,7 @@ class EasySelect extends React.Component<any, any> {
         }
     };
 
-    lazyDataSource = (data: any) => {
+    lazyDataSource = (data: any[]) => {
         const { scrollPage = 1 } = this.state;
         const { isLazy = true } = this.props;
         if (data.length > (scrollPage * 100) && isLazy) {
@@ -55,7 +69,7 @@ class EasySelect extends React.Component<any, any> {
         }
     }
 
-    getDataSource = async (str: any) => {
+    getDataSource = async (str: string) => {
         const { servise } = this.props;
         if (servise) {
             await servise(str).then((res: any) => {