Merge branch 'feat-1.3.0' of https://github.com/vueComponent/ant-design-vue into feat-1.3.0

components/_util/BaseMixin.js

@@ -1,21 +1,21 @@
 
 export default {
-  directives: {
-    ref: {
-      bind: function (el, binding, vnode) {
-        binding.value(vnode.componentInstance ? vnode.componentInstance : vnode.elm)
-      },
-      update: function (el, binding, vnode) {
-        binding.value(vnode.componentInstance ? vnode.componentInstance : vnode.elm)
-      },
-      unbind: function (el, binding, vnode) {
-        binding.value(null)
-      },
-    },
-  },
+  // directives: {
+  //   ref: {
+  //     bind: function (el, binding, vnode) {
+  //       binding.value(vnode.componentInstance ? vnode.componentInstance : vnode.elm)
+  //     },
+  //     update: function (el, binding, vnode) {
+  //       binding.value(vnode.componentInstance ? vnode.componentInstance : vnode.elm)
+  //     },
+  //     unbind: function (el, binding, vnode) {
+  //       binding.value(null)
+  //     },
+  //   },
+  // },
   methods: {
     setState (state, callback) {
-      const newState = typeof state === 'function' ? state(this.$data) : state
+      const newState = typeof state === 'function' ? state(this.$data, this.$props) : state
       // if (this.getDerivedStateFromProps) {
       //   Object.assign(newState, this.getDerivedStateFromProps(getOptionProps(this), { ...this.$data, ...newState }, true) || {})
       // }

components/vc-calendar/demo/antd-calendar.vue

@@ -183,6 +183,39 @@ const Demo = {
   },
 }
 
+const multiFormats = ['DD/MM/YYYY', 'DD/MM/YY', 'DDMMYY', 'D/M/YY']
+
+const DemoMultiFormat = {
+  data: () => ({
+    value: now,
+  }),
+  methods: {
+    onChange (value) {
+      console.log('Calendar change: ', (value && value.format(format)))
+      this.value = value
+    },
+  },
+
+  render () {
+    const state = this.$data
+    return (<div style={{ width: '400px', margin: '20px' }}>
+      <div style={{ marginBottom: '10px' }}>
+        Accepts multiple input formats
+        <br/>
+        <small>{multiFormats.join(', ')}</small>
+      </div>
+      <Calendar
+        locale={cn ? zhCN : enUS}
+        style={{ zIndex: 1000 }}
+        dateInputPlaceholder='please input'
+        format={multiFormats}
+        value={state.value}
+        onChange={this.onChange}
+      />
+    </div>)
+  },
+}
+
 function onStandaloneSelect (value) {
   console.log('onStandaloneSelect')
   console.log(value && value.format(format))
@@ -212,7 +245,7 @@ export default {
               defaultValue={now}
               disabledTime={disabledTime}
               showToday
-              formatter={getFormat(true)}
+              format={getFormat(true)}
               showOk={false}
               timePicker={timePickerElement(h)}
               onChange={onStandaloneChange}
@@ -228,6 +261,9 @@ export default {
             <Demo defaultCalendarValue={defaultCalendarValue} />
           </div>
           <div style={{ clear: 'both' }}></div>
+          <div>
+            <DemoMultiFormat />
+          </div>
         </div>
       </div>
     )

components/vc-calendar/index.js

@@ -1,3 +1,3 @@
-// based on rc-calendar 9.7.9
+// based on rc-calendar 9.8.2
 import Calendar from './src/'
 export default Calendar

components/vc-calendar/src/Calendar.jsx

@@ -26,7 +26,7 @@ const MomentType = PropTypes.custom(isMoment)
 const Calendar = {
   props: {
     locale: PropTypes.object.def(enUs),
-    format: PropTypes.string,
+    format: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
     visible: PropTypes.bool.def(true),
     prefixCls: PropTypes.string.def('rc-calendar'),
     // prefixCls: PropTypes.string,
@@ -295,7 +295,9 @@ const Calendar = {
             selectedValue={sSelectedValue}
             value={sValue}
             disabledDate={disabledDate}
-            okDisabled={!this.isAllowedDate(sSelectedValue)}
+            okDisabled={
+              props.showOk !== false && (!sSelectedValue || !this.isAllowedDate(sSelectedValue))
+            }
             onOk={this.onOk}
             onSelect={this.onSelect}
             onToday={this.onToday}

components/vc-calendar/src/date/DateInput.jsx

@@ -3,6 +3,7 @@ import PropTypes from '../../../_util/vue-types'
 import BaseMixin from '../../../_util/BaseMixin'
 import { getComponentFromProp } from '../../../_util/props-util'
 import moment from 'moment'
+import { formatDate } from '../util'
 
 const DateInput = {
   mixins: [BaseMixin],
@@ -11,7 +12,7 @@ const DateInput = {
     timePicker: PropTypes.object,
     value: PropTypes.object,
     disabledTime: PropTypes.any,
-    format: PropTypes.string,
+    format: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
     locale: PropTypes.object,
     disabledDate: PropTypes.func,
     // onChange: PropTypes.func,
@@ -25,8 +26,9 @@ const DateInput = {
   data () {
     const selectedValue = this.selectedValue
     return {
-      str: selectedValue && selectedValue.format(this.format) || '',
+      str: formatDate(selectedValue, this.format),
       invalid: false,
+      hasFocus: false,
     }
   },
   watch: {
@@ -40,7 +42,7 @@ const DateInput = {
 
   updated () {
     this.$nextTick(() => {
-      if (!this.invalid &&
+      if (this.$data.hasFocus && !this.invalid &&
         !(this.cachedSelectionStart === 0 && this.cachedSelectionEnd === 0)) {
         this.$refs.dateInputInstance.setSelectionRange(this.cachedSelectionStart, this.cachedSelectionEnd)
       }
@@ -52,56 +54,60 @@ const DateInput = {
       this.cachedSelectionEnd = this.$refs.dateInputInstance.selectionEnd
       // when popup show, click body will call this, bug!
       const selectedValue = this.selectedValue
-      this.setState({
-        str: selectedValue && selectedValue.format(this.format) || '',
-        invalid: false,
-      })
+      if (!this.$data.hasFocus) {
+        this.setState({
+          str: formatDate(selectedValue, this.format),
+          invalid: false,
+        })
+      }
     },
     onInputChange (event) {
       const str = event.target.value
-      this.setState({
-        str,
-      })
-      let value
-      const { disabledDate, format } = this
-      if (str) {
-        const parsed = moment(str, format, true)
-        if (!parsed.isValid()) {
-          this.setState({
-            invalid: true,
-          })
-          return
-        }
-        value = this.value.clone()
-        value
-          .year(parsed.year())
-          .month(parsed.month())
-          .date(parsed.date())
-          .hour(parsed.hour())
-          .minute(parsed.minute())
-          .second(parsed.second())
+      const { disabledDate, format, selectedValue } = this.$props
 
-        if (value && (!disabledDate || !disabledDate(value))) {
-          const originalValue = this.selectedValue
-          if (originalValue && value) {
-            if (!originalValue.isSame(value)) {
-              this.__emit('change', value)
-            }
-          } else if (originalValue !== value) {
-            this.__emit('change', value)
-          }
-        } else {
-          this.setState({
-            invalid: true,
-          })
-          return
-        }
-      } else {
+      // 没有内容，合法并直接退出
+      if (!str) {
         this.__emit('change', null)
+        this.setState({
+          invalid: false,
+          str,
+        })
+        return
+      }
+
+      const parsed = moment(str, format, true)
+      if (!parsed.isValid()) {
+        this.setState({
+          invalid: true,
+          str,
+        })
+        return
+      }
+      const value = this.value.clone()
+      value
+        .year(parsed.year())
+        .month(parsed.month())
+        .date(parsed.date())
+        .hour(parsed.hour())
+        .minute(parsed.minute())
+        .second(parsed.second())
+
+      if (!value || (disabledDate && disabledDate(value))) {
+        this.setState({
+          invalid: true,
+          str,
+        })
+        return
+      }
+
+      if (selectedValue !== value || (
+        selectedValue && value && !selectedValue.isSame(value)
+      )) {
+        this.setState({
+          str,
+        })
+        this.__emit('change', value)
       }
-      this.setState({
-        invalid: false,
-      })
     },
 
     onClear () {
@@ -120,6 +126,16 @@ const DateInput = {
         this.$refs.dateInputInstance.focus()
       }
     },
+    onFocus () {
+      this.setState({ hasFocus: true })
+    },
+
+    onBlur () {
+      this.setState((prevState, prevProps) => ({
+        hasFocus: false,
+        str: formatDate(prevProps.value, prevProps.format),
+      }))
+    },
   },
 
   render () {
@@ -135,6 +151,8 @@ const DateInput = {
           disabled={disabled}
           placeholder={placeholder}
           onInput={this.onInputChange}
+          onFocus={this.onFocus}
+          onBlur={this.onBlur}
         />
       </div>
       {showClear ? <a

components/vc-calendar/src/locale/it_IT.js

@@ -1,16 +1,16 @@
 export default {
   today: 'Oggi',
-  now: 'adesso',
+  now: 'Adesso',
   backToToday: 'Torna ad oggi',
   ok: 'Ok',
-  clear: 'Chiaro',
+  clear: 'Cancella',
   month: 'Mese',
   year: 'Anno',
-  timeSelect: 'Seleziona il tempo',
-  dateSelect: 'Select date',
-  monthSelect: 'Seleziona la data',
-  yearSelect: 'Scegli un anno',
-  decadeSelect: 'Scegli un decennio',
+  timeSelect: 'Seleziona l\'ora',
+  dateSelect: 'Seleziona la data',
+  monthSelect: 'Seleziona il mese',
+  yearSelect: 'Seleziona l\'anno',
+  decadeSelect: 'Seleziona il decennio',
   yearFormat: 'YYYY',
   dateFormat: 'D/M/YYYY',
   dayFormat: 'D',

components/vc-calendar/src/util/index.js

@@ -89,3 +89,15 @@ export function isAllowedDate (value, disabledDate, disabledTime) {
   }
   return true
 }
+
+export function formatDate (value, format) {
+  if (!value) {
+    return ''
+  }
+
+  if (Array.isArray(format)) {
+    format = format[0]
+  }
+
+  return value.format(format)
+}

scripts/deploy-to-gh-pages.sh

@@ -2,7 +2,10 @@
 
 set -e # exit with nonzero exit code if anything fails
 
-if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]]; then
+BUMP="bump "
+SITE="update site"
+
+if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]] && [[ $TRAVIS_COMMIT_MESSAGE == *$BUMP* || $TRAVIS_COMMIT_MESSAGE == $SITE ]]; then
 
 echo "Starting to update gh-pages\n"