Skip to content

Chatopera OpenSource / ferry_web

Go to a project
Commit 7139251c by YuleiLan
Options

Merge branch 'dev' of https://github.com/lanyulei/ferry_web into dev

parents ad533427 3ce77c8f
Inline Side-by-side
Showing with 14 additions and 9 deletions
src/components/VueFormMaking/components/GenerateFormItem.vue
...@@ -60,6 +60,9 @@ ...@@ -60,6 +60,9 @@
</span> </span>
</el-divider> </el-divider>
</template> </template>
<template v-if="widget.type === 'input' && widget.options.showPassword">
<input :value="dataModel" type="password" style="border: none; background-color: #ffffff; color: #303133" disabled="disabled">
</template>
<template v-else> <template v-else>
<div> <div>
{{ dataModel }} {{ dataModel }}
...@@ -75,6 +78,7 @@ ...@@ -75,6 +78,7 @@
:placeholder="widget.options.placeholder" :placeholder="widget.options.placeholder"
:style="{width: widget.options.width}" :style="{width: widget.options.width}"
:disabled="widget.options.disabled" :disabled="widget.options.disabled"
:show-password="widget.options.showPassword"
/> />
<el-input <el-input
v-else v-else
...@@ -83,6 +87,7 @@ ...@@ -83,6 +87,7 @@
:disabled="widget.options.disabled" :disabled="widget.options.disabled"
:placeholder="widget.options.placeholder" :placeholder="widget.options.placeholder"
:style="{width: widget.options.width}" :style="{width: widget.options.width}"
:show-password="widget.options.showPassword"
/> />
</template> </template>
......
src/components/VueFormMaking/components/WidgetConfig.vue
...@@ -390,6 +390,7 @@ ...@@ -390,6 +390,7 @@
<el-form-item :label="$t('fm.config.widget.attribute')"> <el-form-item :label="$t('fm.config.widget.attribute')">
<el-checkbox v-if="Object.keys(data.options).indexOf('readonly')>=0" v-model="data.options.readonly">{{ $t('fm.config.widget.readonly') }}</el-checkbox> <el-checkbox v-if="Object.keys(data.options).indexOf('readonly')>=0" v-model="data.options.readonly">{{ $t('fm.config.widget.readonly') }}</el-checkbox>
<el-checkbox v-if="Object.keys(data.options).indexOf('disabled')>=0" v-model="data.options.disabled">{{ $t('fm.config.widget.disabled') }} </el-checkbox> <el-checkbox v-if="Object.keys(data.options).indexOf('disabled')>=0" v-model="data.options.disabled">{{ $t('fm.config.widget.disabled') }} </el-checkbox>
<el-checkbox v-if="Object.keys(data.options).indexOf('showPassword')>=0" v-model="data.options.showPassword">{{ $t('fm.config.widget.showPassword') }} </el-checkbox>
<el-checkbox v-if="Object.keys(data.options).indexOf('editable')>=0" v-model="data.options.editable">{{ $t('fm.config.widget.editable') }}</el-checkbox> <el-checkbox v-if="Object.keys(data.options).indexOf('editable')>=0" v-model="data.options.editable">{{ $t('fm.config.widget.editable') }}</el-checkbox>
<el-checkbox v-if="Object.keys(data.options).indexOf('clearable')>=0" v-model="data.options.clearable">{{ $t('fm.config.widget.clearable') }} </el-checkbox> <el-checkbox v-if="Object.keys(data.options).indexOf('clearable')>=0" v-model="data.options.clearable">{{ $t('fm.config.widget.clearable') }} </el-checkbox>
<el-checkbox v-if="Object.keys(data.options).indexOf('arrowControl')>=0" v-model="data.options.arrowControl">{{ $t('fm.config.widget.arrowControl') }}</el-checkbox> <el-checkbox v-if="Object.keys(data.options).indexOf('arrowControl')>=0" v-model="data.options.arrowControl">{{ $t('fm.config.widget.arrowControl') }}</el-checkbox>
......
src/components/VueFormMaking/components/componentsConfig.js
...@@ -10,6 +10,7 @@ export const basicComponents = [ ...@@ -10,6 +10,7 @@ export const basicComponents = [
pattern: '', pattern: '',
placeholder: '', placeholder: '',
disabled: false, disabled: false,
showPassword: false,
labelWidth: 100, labelWidth: 100,
labelWidthDisabled: false, labelWidthDisabled: false,
labelWidthStatus: true labelWidthStatus: true
......
src/components/VueFormMaking/lang/zh-CN.js
...@@ -166,7 +166,7 @@ export default { ...@@ -166,7 +166,7 @@ export default {
arrowControl: '使用箭头进行时间选择', arrowControl: '使用箭头进行时间选择',
isDelete: '删除', isDelete: '删除',
isEdit: '编辑', isEdit: '编辑',
showPassword: '显示密码', showPassword: '密码',
validate: '校验', validate: '校验',
required: '必填', required: '必填',
patternPlaceholder: '填写正则表达式', patternPlaceholder: '填写正则表达式',
......
src/views/error-page/404.vue
...@@ -9,12 +9,9 @@ ...@@ -9,12 +9,9 @@
</div> </div>
<div class="bullshit"> <div class="bullshit">
<div class="bullshit__oops">OOPS!</div> <div class="bullshit__oops">OOPS!</div>
<div class="bullshit__info">All rights reserved
<a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
</div>
<div class="bullshit__headline">{{ message }}</div> <div class="bullshit__headline">{{ message }}</div>
<div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div> <div class="bullshit__info">请检查您访问的地址是否正确，通常在切换用户时，若您的用户没有上个用户退出时的页面权限，也会触发此报错，请知悉，或者点击一下按钮返回首页。</div>
<a href="" class="bullshit__return-home">Back to home</a> <a href="" class="bullshit__return-home">返回首页</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -26,7 +23,7 @@ export default { ...@@ -26,7 +23,7 @@ export default {
name: 'Page404', name: 'Page404',
computed: { computed: {
message() { message() {
return 'The webmaster said that you can not enter this page...' return '抱歉，您找的页面不存在。'
} }
} }
} }
......
src/views/login/index.vue
...@@ -227,7 +227,8 @@ export default { ...@@ -227,7 +227,8 @@ export default {
this.loading = true this.loading = true
this.$store.dispatch('user/login', this.loginForm) this.$store.dispatch('user/login', this.loginForm)
.then(() => { .then(() => {
this.$router.push({ path: this.redirect || '/', query: this.otherQuery }) // this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
this.$router.push({ path: '/' })
this.loading = false this.loading = false
}) })
.catch(() => { .catch(() => {
......
src/views/process/list/handle.vue
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<fm-generate-form <fm-generate-form
v-show="currentNode.hideTpls===undefined || v-show="currentNode.hideTpls===undefined ||
currentNode.hideTpls===null || currentNode.hideTpls===null ||
currentNode.hideTpls.indexOf(tplItem.id)===-1" currentNode.hideTpls.indexOf(tplItem.form_structure.id)===-1"
:key="tplIndex" :key="tplIndex"
:ref="'generateForm-'+tplItem.id" :ref="'generateForm-'+tplItem.id"
:preview="currentNode.writeTpls===undefined || :preview="currentNode.writeTpls===undefined ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment