@cqsjjb/jjb-react-admin-component 3.0.1 → 3.0.3

package/ControlWrapper/index.js

@@ -33,8 +33,7 @@ class Input extends React.Component {
       flex: 1
     }, /*#__PURE__*/React.createElement(OriginInput, {
       style: {
-        width: '100%',
-        borderLeft: 'none'
+        width: '100%'
       },
       value: this.props.value,
       maxLength: this.props.maxLength,
@@ -72,8 +71,7 @@ class Select extends React.Component {
     }, /*#__PURE__*/React.createElement(OriginSelect, {
       mode: this.props.mode,
       style: {
-        width: '100%',
-        borderLeft: 'none'
+        width: '100%'
       },
       value: this.props.value,
       allowClear: this.props.allowClear,
@@ -111,8 +109,7 @@ class Cascader extends React.Component {
       flex: 1
     }, /*#__PURE__*/React.createElement(OriginCascader, {
       style: {
-        width: '100%',
-        borderLeft: 'none'
+        width: '100%'
       },
       value: this.props.value,
       options: this.props.options,
@@ -160,8 +157,7 @@ class RangePicker extends React.Component {
       }
     }, /*#__PURE__*/React.createElement(OriginDatePicker.RangePicker, {
       style: {
-        width: '100%',
-        borderLeft: 'none'
+        width: '100%'
       },
       value: this.props.value,
       format: this.props.format,
@@ -198,8 +194,7 @@ class DatePicker extends React.Component {
       flex: 1
     }, /*#__PURE__*/React.createElement(OriginDatePicker, {
       style: {
-        width: '100%',
-        borderLeft: 'none'
+        width: '100%'
       },
       value: this.props.value,
       format: this.props.format,
@@ -238,8 +233,7 @@ class TreeSelect extends React.Component {
       showSearch: true,
       allowClear: true,
       style: {
-        width: '100%',
-        borderLeft: 'none'
+        width: '100%'
       },
       treeData: this.props.treeData,
       fieldNames: this.props.fieldNames,

package/ControlWrapper/index.less

@@ -7,7 +7,7 @@
     line-height: 30px;
     box-sizing: border-box;
     margin-right: -1px;
-    padding: 0 8px;
+    padding: 0 2px 0 8px;
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
     white-space: nowrap;
@@ -17,6 +17,10 @@
     .@{com-prefix-cls}-select-selector, .@{com-prefix-cls}-picker, .@{com-prefix-cls}-input, .@{com-prefix-cls}-input-affix-wrapper {
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
+      border-left-color: transparent !important;
+      &:hover, &:focus, &:focus-within{
+        border-left-color: @colorPrimary !important;
+      }
     }
   }
 

package/ControlWrapper/index.mjs

@@ -60,8 +60,7 @@ class Input extends React.Component {
           <Col flex={1}>
             <OriginInput
               style={{
-                width: '100%',
-                borderLeft: 'none'
+                width: '100%'
               }}
               value={this.props.value}
               maxLength={this.props.maxLength}
@@ -117,8 +116,7 @@ class Select extends React.Component {
             <OriginSelect
               mode={this.props.mode}
               style={{
-                width: '100%',
-                borderLeft: 'none'
+                width: '100%'
               }}
               value={this.props.value}
               allowClear={this.props.allowClear}
@@ -178,8 +176,7 @@ class Cascader extends React.Component {
           <Col flex={1}>
             <OriginCascader
               style={{
-                width: '100%',
-                borderLeft: 'none'
+                width: '100%'
               }}
               value={this.props.value}
               options={this.props.options}
@@ -244,8 +241,7 @@ class RangePicker extends React.Component {
           <Col style={{ flex: 1 }}>
             <OriginDatePicker.RangePicker
               style={{
-                width: '100%',
-                borderLeft: 'none'
+                width: '100%'
               }}
               value={this.props.value}
               format={this.props.format}
@@ -301,8 +297,7 @@ class DatePicker extends React.Component {
           <Col flex={1}>
             <OriginDatePicker
               style={{
-                width: '100%',
-                borderLeft: 'none'
+                width: '100%'
               }}
               value={this.props.value}
               format={this.props.format}
@@ -359,8 +354,7 @@ class TreeSelect extends React.Component {
               showSearch
               allowClear
               style={{
-                width: '100%',
-                borderLeft: 'none'
+                width: '100%'
               }}
               treeData={this.props.treeData}
               fieldNames={this.props.fieldNames}

package/SearchForm/index.d.ts

@@ -19,6 +19,14 @@ interface searchFormProps extends ComponentProps {
    * @description 表单内容列表 [<Form.Item>...</Form.Item>,...]
    */
   formLine: Array<React.ReactNode>;
+  /**
+   * @description 加载中
+   */
+  loading?: boolean;
+  /**
+   * @description 表单默认值，只有初始化以及重置时生效
+   */
+  initialValues?:object
   /**
    * @description 组件挂载完成 通过事件返回form实例
    */

package/SearchForm/index.js

@@ -13,14 +13,17 @@ class searchForm extends React.Component {
       expand,
       formLine,
       colSize,
+      loading,
       onReset
     } = this.props;
     return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
       type: "primary",
       icon: /*#__PURE__*/React.createElement(SearchOutlined, null),
-      htmlType: "submit"
+      htmlType: "submit",
+      loading: loading
     }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
       icon: /*#__PURE__*/React.createElement(UndoOutlined, null),
+      loading: loading,
       onClick: () => onReset()
     }, "\u91CD\u7F6E"), expand && formLine.length / colSize > 1 && /*#__PURE__*/React.createElement(Button, {
       icon: /*#__PURE__*/React.createElement(DoubleRightOutlined, {
@@ -46,14 +49,16 @@ class searchForm extends React.Component {
   }
   render() {
     const {
-      colSize,
       style,
+      colSize,
+      initialValues,
       onFinish
     } = this.props;
     const formItemList = this.groupsList();
     return /*#__PURE__*/React.createElement(Form, {
       ref: this.form,
       style: style,
+      initialValues: initialValues,
       onFinish: values => onFinish(values)
     }, /*#__PURE__*/React.createElement(Row, {
       gutter: [16, 16]
@@ -71,7 +76,9 @@ searchForm.defaultProps = {
   style: {},
   expand: false,
   colSize: 3,
+  loading: false,
   formLine: [],
+  initialValues: {},
   onRef: () => {},
   onReset: () => {},
   onFinish: () => {}
@@ -80,7 +87,9 @@ searchForm.propTypes = {
   style: PropTypes.object,
   expand: PropTypes.bool,
   colSize: PropTypes.number,
+  loading: PropTypes.bool,
   formLine: PropTypes.array,
+  initialValues: PropTypes.object,
   onRef: PropTypes.func,
   onReset: PropTypes.func,
   onFinish: PropTypes.func

package/SearchForm/index.mjs

@@ -15,6 +15,7 @@ class searchForm extends React.Component {
       expand,
       formLine,
       colSize,
+      loading,
       onReset
     } = this.props;
     return (
@@ -23,11 +24,13 @@ class searchForm extends React.Component {
           type="primary"
           icon={<SearchOutlined />}
           htmlType="submit"
+          loading={loading}
         >
           查询
         </Button>
         <Button
           icon={<UndoOutlined />}
+          loading={loading}
           onClick={() => onReset()}
         >
           重置
@@ -69,8 +72,9 @@ class searchForm extends React.Component {
 
   render () {
     const {
-      colSize,
       style,
+      colSize,
+      initialValues,
       onFinish
     } = this.props;
     const formItemList = this.groupsList();
@@ -78,6 +82,7 @@ class searchForm extends React.Component {
       <Form
         ref={this.form}
         style={style}
+        initialValues={initialValues}
         onFinish={values => onFinish(values)}
       >
         <Row gutter={[ 16, 16 ]}>
@@ -104,7 +109,9 @@ searchForm.defaultProps = {
   style: {},
   expand: false,
   colSize: 3,
+  loading: false,
   formLine: [],
+  initialValues: {},
   onRef: () => {},
   onReset: () => {},
   onFinish: () => {},
@@ -113,7 +120,9 @@ searchForm.propTypes = {
   style: PropTypes.object,
   expand: PropTypes.bool,
   colSize: PropTypes.number,
+  loading: PropTypes.bool,
   formLine: PropTypes.array,
+  initialValues: PropTypes.object,
   onRef: PropTypes.func,
   onReset: PropTypes.func,
   onFinish: PropTypes.func,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/jjb-react-admin-component",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "jjb-react-admin-组件库@new",
   "main": "index.js",
   "author": "jjb-front-team",