zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'i18n' into deploy

This commit is contained in:
Pan 2019-06-05 09:38:00 +08:00
parent f1637ed780 a9e21c2ce2
commit b7b12acbd2
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/ImageCropper/index.vue
View File

@ -839,16 +839,20 @@ export default {
that.$emit('crop-upload-fail', err, field, ki)
}
})
},
closeHandler(e) {
if (this.value && (e.key == 'Escape' || e.keyCode == 27)) {
this.off()
}
}
},
created() {
// 绑定按键esc隐藏此插件事件
document.addEventListener('keyup', (e) => {
if (this.value && (e.key == 'Escape' || e.keyCode == 27)) {
this.off()
}
})
}
document.addEventListener('keyup', this.closeHandler)
},
destroyed() {
document.removeEventListener('keyup', this.closeHandler)
},
}
</script>

12
src/components/MDinput/index.vue
View File

@ -9,7 +9,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:required="required"
type="email"
class="material-input"
@ -24,7 +24,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:required="required"
type="url"
class="material-input"
@ -40,7 +40,7 @@
:step="step"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:max="max"
:min="min"
:minlength="minlength"
@ -59,7 +59,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:max="max"
:min="min"
:required="required"
@ -76,7 +76,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:required="required"
type="tel"
class="material-input"
@ -91,7 +91,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:minlength="minlength"
:maxlength="maxlength"
:required="required"

2
src/utils/request.js
View File

@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
// create an axios instance
const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
withCredentials: true, // send cookies when cross-domain requests
// withCredentials: true, // send cookies when cross-domain requests
timeout: 5000 // request timeout
})

4
src/views/example/components/ArticleDetail.vue
View File

@ -6,7 +6,7 @@
<PlatformDropdown v-model="postForm.platforms" />
<SourceUrlDropdown v-model="postForm.source_uri" />
<el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
Publush
Publish
</el-button>
<el-button v-loading="loading" type="warning" @click="draftForm">
Draft
@ -35,7 +35,7 @@
</el-col>
<el-col :span="10">
<el-form-item label-width="120px" label="Publush Time:" class="postInfo-container-item">
<el-form-item label-width="120px" label="Publish Time:" class="postInfo-container-item">
<el-date-picker v-model="displayTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="Select date and time" />
</el-form-item>
</el-col>

6
src/views/login/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="login-container">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on" label-position="left">
<div class="title-container">
<h3 class="title">
@ -20,7 +20,7 @@
name="username"
type="text"
tabindex="1"
auto-complete="on"
autocomplete="on"
/>
</el-form-item>
@ -37,7 +37,7 @@
:placeholder="$t('login.password')"
name="password"
tabindex="2"
auto-complete="on"
autocomplete="on"
@keyup.native="checkCapslock"
@blur="capsTooltip = false"
@keyup.enter.native="handleLogin"