Skip to content

Commit

Permalink
add logo and update vc-XXX
Browse files Browse the repository at this point in the history
  • Loading branch information
tangjinzhou committed Mar 22, 2018
1 parent af93808 commit 3a51f27
Show file tree
Hide file tree
Showing 21 changed files with 274 additions and 191 deletions.
4 changes: 2 additions & 2 deletions README-zh_CN.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://vuecomponent.github.io/ant-design/">
<img width="230" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg">
<img width="230" src="https://raw.githubusercontent.com/vueComponent/ant-design/master/logo.png">
</a>
</p>

Expand All @@ -20,7 +20,7 @@ Ant Design 3.X 的 Vue 实现,开发和服务于企业级后台产品。

- 提炼自企业级中后台产品的交互语言和视觉风格。
- 开箱即用的高质量 Vue 组件。
- 全链路开发和设计工具体系。
- 全链路开发和设计工具体系。

## 安装

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://vuecomponent.github.io/ant-design/">
<img width="230" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg">
<img width="230" src="https://raw.githubusercontent.com/vueComponent/ant-design/master/logo.png">
</a>
</p>

Expand Down
2 changes: 1 addition & 1 deletion components/_util/props-util.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import isPlainObject from 'lodash.isplainobject'
import isPlainObject from 'lodash/isPlainObject'

const camelizeRE = /-(\w)/g
const camelize = (str) => {
Expand Down
2 changes: 1 addition & 1 deletion components/_util/vue-types/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import isPlainObject from 'lodash.isplainobject'
import isPlainObject from 'lodash/isPlainObject'
import { toType, getType, isFunction, validateType, isInteger, isArray, warn } from './utils'

const VuePropTypes = {
Expand Down
2 changes: 1 addition & 1 deletion components/_util/vue-types/utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import isPlainObject from 'lodash.isplainobject'
import isPlainObject from 'lodash/isPlainObject'

const ObjProto = Object.prototype
const toString = ObjProto.toString
Expand Down
2 changes: 1 addition & 1 deletion components/align/Align.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import align from 'dom-align'
import addEventListener from '../_util/Dom/addEventListener'
import { cloneElement } from '../_util/vnode.js'
import isWindow from './isWindow'
import clonedeep from 'lodash.clonedeep'
import clonedeep from 'lodash/cloneDeep'
import shallowequal from 'shallowequal'
function noop () {
}
Expand Down
2 changes: 1 addition & 1 deletion components/modal/ConfirmDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { getConfirmLocale } from './locale'
export default {
functional: true,
render (h, context) {
const { data: props } = context
const { props } = context
const { onCancel, onOk, close, zIndex, afterClose, visible } = props
const iconType = props.iconType || 'question-circle'
const okType = props.okType || 'primary'
Expand Down
5 changes: 4 additions & 1 deletion components/modal/confirm.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ export default function confirm (config) {
}

function render (props) {
const confirmDialogProps = {
props,
}
return new Vue({
el: el,
render () {
return <ConfirmDialog {...props} />
return <ConfirmDialog {...confirmDialogProps} />
},
})
}
Expand Down
2 changes: 1 addition & 1 deletion components/select/demo/select-users.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ A complete multiple select sample with remote search, debounce fetch, ajax callb
<script>
import jsonp from 'fetch-jsonp';
import querystring from 'querystring';
import debounce from 'lodash.debounce';
import debounce from 'lodash/debounce';
export default {
data() {
Expand Down
2 changes: 1 addition & 1 deletion components/tabs/src/ScrollableTabBarMixin.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { setTransform, isTransformSupported } from './utils'
import addDOMEventListener from 'add-dom-event-listener'
import debounce from 'lodash.debounce'
import debounce from 'lodash/debounce'
function noop () {
}
export default {
Expand Down
5 changes: 5 additions & 0 deletions components/vc-calendar/src/date/DateTBody.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const DateTBody = {
const disabledClass = `${prefixCls}-disabled-cell`
const firstDisableClass = `${prefixCls}-disabled-cell-first-of-row`
const lastDisableClass = `${prefixCls}-disabled-cell-last-of-row`
const lastDayOfMonthClass = `${prefixCls}-last-day-of-month`
const month1 = value.clone()
month1.date(1)
const day = month1.day()
Expand Down Expand Up @@ -169,6 +170,10 @@ const DateTBody = {
cls += ` ${nextMonthDayClass}`
}

if (current.clone().endOf('month').date() === current.date()) {
cls += ` ${lastDayOfMonthClass}`
}

if (disabledDate) {
if (disabledDate(current, value)) {
disabled = true
Expand Down
27 changes: 27 additions & 0 deletions components/vc-calendar/src/locale/sl_SI.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
export default {
today: 'Danes',
now: 'Trenutno',
backToToday: 'Nazaj na danes',
ok: 'V redu',
clear: 'Počisti',
month: 'Mesec',
year: 'Leto',
timeSelect: 'Izberite čas',
dateSelect: 'Izberite datum',
monthSelect: 'Izberite mesec',
yearSelect: 'Izberite leto',
decadeSelect: 'Izberite desetletje',
yearFormat: 'YYYY',
dateFormat: 'DD.MM.YYYY',
dayFormat: 'D',
dateTimeFormat: 'DD.MM.YYYY HH:mm:ss',
monthBeforeYear: true,
previousMonth: 'Prejšnji mesec (PageUp)',
nextMonth: 'Naslednji mesec (PageDown)',
previousYear: 'Prejšnje leto (Control + left)',
nextYear: 'Naslednje leto (Control + right)',
previousDecade: 'Prejšnje desetletje',
nextDecade: 'Naslednje desetletje',
previousCentury: 'Prejšnje stoletje',
nextCentury: 'Naslednje stoletje',
}
62 changes: 33 additions & 29 deletions components/vc-pagination/Pagination.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export default {
showLessItems: PropTypes.bool.def(false),
// showSizeChange: PropTypes.func.def(noop),
selectComponentClass: PropTypes.any,
showPrevNextJumpers: PropTypes.bool.def(true),
showQuickJumper: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]).def(false),
showTitle: PropTypes.bool.def(true),
pageSizeOptions: PropTypes.arrayOf(PropTypes.string),
Expand Down Expand Up @@ -310,7 +311,7 @@ export default {
<li
title={this.showTitle ? locale.next_page : null}
onClick={this.next}
tabIndex='0'
tabIndex={this.hasNext ? 0 : null}
onKeypress={this.runIfEnterNext}
class={`${hasNext ? '' : `${prefixCls}-disabled`} ${prefixCls}-next`}
aria-disabled={!this.hasNext()}
Expand Down Expand Up @@ -341,34 +342,37 @@ export default {
} else {
const prevItemTitle = this.showLessItems ? locale.prev_3 : locale.prev_5
const nextItemTitle = this.showLessItems ? locale.next_3 : locale.next_5
jumpPrev = (
<li
title={this.showTitle ? prevItemTitle : null}
key='prev'
onClick={this.jumpPrev}
tabIndex='0'
onKeypress={this.runIfEnterJumpPrev}
class={`${prefixCls}-jump-prev`}
>
{this.itemRender(
this.getJumpPrevPage(), 'jump-prev', <a class={`${prefixCls}-item-link`} />
)}
</li>
)
jumpNext = (
<li
title={this.showTitle ? nextItemTitle : null}
key='next'
tabIndex='0'
onClick={this.jumpNext}
onKeypress={this.runIfEnterJumpNext}
class={`${prefixCls}-jump-next`}
>
{this.itemRender(
this.getJumpNextPage(), 'jump-next', <a class={`${prefixCls}-item-link`} />
)}
</li>
)
if (this.showPrevNextJumpers) {
jumpPrev = (
<li
title={this.showTitle ? prevItemTitle : null}
key='prev'
onClick={this.jumpPrev}
tabIndex='0'
onKeypress={this.runIfEnterJumpPrev}
class={`${prefixCls}-jump-prev`}
>
{this.itemRender(
this.getJumpPrevPage(), 'jump-prev', <a class={`${prefixCls}-item-link`} />
)}
</li>
)
jumpNext = (
<li
title={this.showTitle ? nextItemTitle : null}
key='next'
tabIndex='0'
onClick={this.jumpNext}
onKeypress={this.runIfEnterJumpNext}
class={`${prefixCls}-jump-next`}
>
{this.itemRender(
this.getJumpNextPage(), 'jump-next', <a class={`${prefixCls}-item-link`} />
)}
</li>
)
}

lastPager = (
<Pager
locale={locale}
Expand Down
15 changes: 15 additions & 0 deletions components/vc-pagination/locale/id_ID.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export default {
// Options.jsx
items_per_page: '/ halaman',
jump_to: 'Menuju',
jump_to_confirm: 'konfirmasi',
page: '',

// Pagination.jsx
prev_page: 'Halaman Sebelumnya',
next_page: 'Halaman Berikutnya',
prev_5: '5 Halaman Sebelumnya',
next_5: '5 Halaman Berikutnya',
prev_3: '3 Halaman Sebelumnya',
next_3: '3 Halaman Berikutnya',
};
15 changes: 15 additions & 0 deletions components/vc-pagination/locale/sl_SI.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export default {
// Options.jsx
items_per_page: '/ strani',
jump_to: 'Pojdi na',
jump_to_confirm: 'potrdi',
page: '',

// Pagination.jsx
prev_page: 'Prejšnja stran',
next_page: 'Naslednja stran',
prev_5: 'Prejšnjih 5 strani',
next_5: 'Naslednjih 5 strani',
prev_3: 'Prejšnje 3 strani',
next_3: 'Naslednje 3 strani',
};
15 changes: 15 additions & 0 deletions components/vc-pagination/locale/tr_TR.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export default {
// Options.jsx
items_per_page: '/ sayfa',
jump_to: 'Git',
jump_to_confirm: 'onayla',
page: '',

// Pagination.jsx
prev_page: 'Önceki Sayfa',
next_page: 'Sonraki Sayfa',
prev_5: 'Önceki 5 Sayfa',
next_5: 'Sonraki 5 Sayfa',
prev_3: 'Önceki 3 Sayfa',
next_3: 'Sonraki 3 Sayfa',
};
1 change: 1 addition & 0 deletions components/vc-steps/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// base rc-steps 3.3.1
import Steps from './Steps'
import Step from './Step'

Expand Down
2 changes: 1 addition & 1 deletion examples/components/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default {
<a-row>
<a-col xxl={4} xl={5} lg={5} md={6} sm={24} xs={24}>
<router-link to={{ path: `/${lang}` }} id='logo'>
LOGO
<img alt='logo' src='https://raw.githubusercontent.com/vueComponent/ant-design/master/logo.png' />
<span> VUE-ANTD</span>
</router-link>
</a-col>
Expand Down
3 changes: 2 additions & 1 deletion examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" type="image/x-icon" href="https://raw.githubusercontent.com/vueComponent/ant-design/master/logo.png">
</head>

<body>
Expand All @@ -13,4 +14,4 @@
</div>
</body>

</html>
</html>
Binary file added logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3a51f27

Please sign in to comment.