Merge pull request #49 from uxcore/width-style-fix

refs: #48
uxcore · Jan 8, 2019 · 6993844 · 6993844
2 parents 6c69bea + 53e1d7d
commit 6993844
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/demo/CalendarDemo.jsx b/demo/CalendarDemo.jsx
@@ -115,7 +115,35 @@ class Demo extends React.Component {
           <Calendar
             showToday
             showTime={false}
-            allowClear={false}
+            allowClear
+            showSecond={false}
+            locale="en-us"
+            yearSelectOffset={100}
+            yearSelectTotal={200}
+            size="middle"
+            disabledTime={() => (
+              {
+                disabledMinutes: () => disabledMinutes,
+              }
+            )}
+            value={value}
+            onSelect={this.onSelect}
+            showDateInput
+          />
+        </div>
+        <div
+          className="kuma-form-field"
+          style={{
+            width: '50px',
+          }}
+        >
+          <p>
+            显示空间不够
+          </p>
+          <Calendar
+            showToday
+            showTime={false}
+            allowClear
             showSecond={false}
             locale="en-us"
             yearSelectOffset={100}

diff --git a/src/YearCalendar.jsx b/src/YearCalendar.jsx
@@ -184,7 +184,7 @@ YearCalendar.propTypes = {
   hasTrigger: PropTypes.bool,
   showDateInput: PropTypes.bool,
   align: PropTypes.object,
-  transitionName: PropTypes.bool,
+  transitionName: PropTypes.string,
 };
 
 export default YearCalendar;
diff --git a/src/style/common/Calendar.less b/src/style/common/Calendar.less
@@ -207,6 +207,14 @@
   position: relative;
   display: inline-block;
   width: 100%;
+  min-width: 80px;
+
+  .kuma-input{
+    padding-right: 28px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
   .kuma-input[readonly] {
     background-color: white;
     border-color: @border-color;