【fix ESLint】components/jero、components/layouts、components/tools、utils、views/account/center、views/demo、views/system
This commit is contained in:
@@ -46,7 +46,7 @@
|
||||
@blur="handleTagInputConfirm"
|
||||
@keyup.enter="handleTagInputConfirm"
|
||||
/>
|
||||
<a-tag v-else @click="showTagInput" style="background: #fff; borderStyle: dashed;">
|
||||
<a-tag v-else @click="showTagInput" style="background: #fff; border-style: dashed;">
|
||||
<a-icon type="plus" />
|
||||
New Tag
|
||||
</a-tag>
|
||||
@@ -188,10 +188,9 @@ export default {
|
||||
margin-bottom: 24px;
|
||||
|
||||
& > .avatar {
|
||||
margin: 0 auto;
|
||||
width: 104px;
|
||||
height: 104px;
|
||||
margin-bottom: 20px;
|
||||
margin: 0 auto 20px;
|
||||
border-radius: 50%;
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
@@ -432,6 +432,8 @@ export default {
|
||||
this.changeImg()
|
||||
const list = [].slice.call(document.querySelectorAll('pre code'))
|
||||
list.forEach((val) => {
|
||||
// 这个变量全局搜不到,就选择了单行不校验
|
||||
// eslint-disable-next-line no-undef
|
||||
hljs.highlightBlock(val)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -10,10 +10,11 @@
|
||||
</template>
|
||||
<a-button @click="sureChange" type="primary" style="margin-top: 115px">确定</a-button>
|
||||
</draggable>
|
||||
<br/>
|
||||
<br />
|
||||
<a-row>
|
||||
<a-col :span="12">
|
||||
<p>拖拽前json数据:</p>
|
||||
<!-- 这个改成v-modal后无法按照展开的json样式进行展示-->
|
||||
<textarea rows="25" style="width: 780px">{{ oldDateSource }}</textarea>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
import moment from 'moment'
|
||||
import { pushIfNotExist, randomNumber, randomUUID } from '@/utils/util'
|
||||
import { JVXETypes } from '@/components/jero/JVxeTable'
|
||||
|
||||
/* eslint-disable no-template-curly-in-string */
|
||||
export default {
|
||||
name: 'JVxeDemo1',
|
||||
data () {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
<script>
|
||||
import { JVXETypes } from '@/components/jero/JVxeTable'
|
||||
|
||||
/* eslint-disable no-template-curly-in-string */
|
||||
export default {
|
||||
name: 'JVxeDemo3',
|
||||
data () {
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
@cancel="handleCancel">
|
||||
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :model="model" >
|
||||
<a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :model="model">
|
||||
<!-- 主表单区域 -->
|
||||
<a-row class="form-row" :gutter="0">
|
||||
<a-col :lg="8">
|
||||
<a-form-model-item label="订单号" prop="orderCode" :rules="[{ required: true, message: '请输入订单号!' }]">
|
||||
<a-input placeholder="请输入订单号" v-model="model.orderCode"/>
|
||||
<a-form-model-item label="订单号" prop="orderCode" :rules="[{ required: true, message: '请输入订单号!' }]">
|
||||
<a-input placeholder="请输入订单号" v-model="model.orderCode" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :lg="8">
|
||||
<a-form-model-item label="订单类型">
|
||||
<a-form-model-item label="订单类型">
|
||||
<a-select placeholder="请选择订单类型" v-model="model.ctype">
|
||||
<a-select-option value="1">国内订单</a-select-option>
|
||||
<a-select-option value="2">国际订单</a-select-option>
|
||||
@@ -27,20 +27,20 @@
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :lg="8">
|
||||
<a-form-model-item label="订单日期">
|
||||
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%" v-model="model.orderDate"/>
|
||||
<a-form-model-item label="订单日期">
|
||||
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%" v-model="model.orderDate" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row class="form-row" :gutter="0">
|
||||
<a-col :lg="8">
|
||||
<a-form-model-item label="订单金额">
|
||||
<a-input-number placeholder="请输入订单金额" style="width: 100%" v-model="model.orderMoney"/>
|
||||
<a-form-model-item label="订单金额">
|
||||
<a-input-number placeholder="请输入订单金额" style="width: 100%" v-model="model.orderMoney" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :lg="8">
|
||||
<a-form-model-item label="订单备注">
|
||||
<a-input placeholder="请输入订单备注" v-model="model.content"/>
|
||||
<a-form-model-item label="订单备注">
|
||||
<a-input placeholder="请输入订单备注" v-model="model.content" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
@@ -59,7 +59,7 @@
|
||||
:loading="table1.loading"
|
||||
:dataSource="table1.dataSource"
|
||||
:columns="table1.columns"
|
||||
style="margin-top: 8px;"/>
|
||||
style="margin-top: 8px;" />
|
||||
|
||||
</a-tab-pane>
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
:loading="table2.loading"
|
||||
:dataSource="table2.dataSource"
|
||||
:columns="table2.columns"
|
||||
style="margin-top: 8px;"/>
|
||||
style="margin-top: 8px;" />
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
import { VALIDATE_FAILED, getRefPromise, validateFormModelAndTables } from '@/components/jero/JVxeTable/utils/vxeUtils'
|
||||
import { httpAction, getAction } from '@/api/manage'
|
||||
import { JVXETypes } from '@/components/jero/JVxeTable'
|
||||
|
||||
/* eslint-disable no-template-curly-in-string */
|
||||
export default {
|
||||
name: 'jeroOrderModalForJvexTable',
|
||||
data () {
|
||||
@@ -279,7 +279,8 @@ export default {
|
||||
},
|
||||
/** 发起新增或修改的请求 */
|
||||
requestAddOrEdit (formData) {
|
||||
let url = this.url.add; let method = 'post'
|
||||
let url = this.url.add
|
||||
let method = 'post'
|
||||
if (this.model.id) {
|
||||
url = this.url.edit
|
||||
method = 'put'
|
||||
|
||||
@@ -595,7 +595,7 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
nameList: function () {
|
||||
let names = []
|
||||
const names = []
|
||||
for (let a = 0; a < this.selectList.length; a++) {
|
||||
names.push(this.selectList[a].name)
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@ export default {
|
||||
newArr.point = point
|
||||
arrs[i].push(newArr)
|
||||
}
|
||||
let newDataSource = []
|
||||
const newDataSource = []
|
||||
for (let i = 0; i < arrs.length; i++) {
|
||||
const arr = arrs[i]
|
||||
for (const j in arr) {
|
||||
|
||||
@@ -106,7 +106,7 @@ export default {
|
||||
validate (rule, value, callback) {
|
||||
const regex = /^user-(.*)$/
|
||||
if (!regex.test(value)) {
|
||||
callback('需要以 user- 开头')
|
||||
callback(new Error('需要以 user- 开头'))
|
||||
}
|
||||
callback()
|
||||
}
|
||||
|
||||
@@ -38,6 +38,7 @@ import { FormTypes } from '@/utils/JEditableTableUtil'
|
||||
import { randomUUID, randomNumber } from '@/utils/util'
|
||||
import JEditableTable from '@/components/jero/JEditableTable'
|
||||
|
||||
/* eslint-disable no-template-curly-in-string */
|
||||
export default {
|
||||
name: 'DefaultTable',
|
||||
components: { JEditableTable },
|
||||
@@ -234,6 +235,7 @@ export default {
|
||||
/** 获取值,忽略表单验证 */
|
||||
handleTableGet () {
|
||||
this.$refs.editableTable.getValues((error, values) => {
|
||||
console.log('error:', error)
|
||||
console.log('values:', values)
|
||||
}, false)
|
||||
console.log('deleteIds:', this.$refs.editableTable.getDeleteIds())
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
import { VALIDATE_FAILED, getRefPromise, validateFormModelAndTables } from '@/components/jero/JVxeTable/utils/vxeUtils'
|
||||
import { httpAction, getAction } from '@/api/manage'
|
||||
import { JVXETypes } from '@/components/jero/JVxeTable'
|
||||
|
||||
/* eslint-disable no-template-curly-in-string */
|
||||
export default {
|
||||
name: 'JeroOrderModalForJvexTable',
|
||||
data () {
|
||||
|
||||
@@ -26,6 +26,7 @@ export default {
|
||||
type: FormTypes.select,
|
||||
width: '240px',
|
||||
options: [],
|
||||
// eslint-disable-next-line no-template-curly-in-string
|
||||
placeholder: '请选择${title}'
|
||||
},
|
||||
{
|
||||
@@ -34,6 +35,7 @@ export default {
|
||||
type: FormTypes.select,
|
||||
width: '240px',
|
||||
options: [],
|
||||
// eslint-disable-next-line no-template-curly-in-string
|
||||
placeholder: '请选择${title}'
|
||||
},
|
||||
{
|
||||
@@ -42,6 +44,7 @@ export default {
|
||||
type: FormTypes.select,
|
||||
width: '240px',
|
||||
options: [],
|
||||
// eslint-disable-next-line no-template-curly-in-string
|
||||
placeholder: '请选择${title}'
|
||||
}
|
||||
],
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
</a-col>
|
||||
<a-col :span="2">
|
||||
<a-form-model-item>
|
||||
<a-icon type="minus-circle" @click="delRowCustom(index)" style="fontSize :20px"/>
|
||||
<a-icon type="minus-circle" @click="delRowCustom(index)" style="font-size :20px"/>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
@@ -121,7 +121,7 @@
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
<a-form-model-item>
|
||||
<a-icon type="minus-circle" @click="delRowTicket(index)" style="fontSize :20px"/>
|
||||
<a-icon type="minus-circle" @click="delRowTicket(index)" style="font-size :20px"/>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
|
||||
@@ -86,6 +86,7 @@ import JEditableTable from '@/components/jero/JEditableTable'
|
||||
import { FormTypes, VALIDATE_NO_PASSED, getRefPromise, validateFormModelAndTables } from '@/utils/JEditableTableUtil'
|
||||
import { httpAction, getAction } from '@/api/manage'
|
||||
|
||||
/* eslint-disable no-template-curly-in-string */
|
||||
export default {
|
||||
name: 'JeroOrderModalForJEditableTable',
|
||||
components: {
|
||||
|
||||
@@ -202,7 +202,7 @@ import DashChartDemo from '@/components/chart/DashChartDemo'
|
||||
import BarMultid from '@/components/chart/BarMultid'
|
||||
import Bar from '@/components/chart/Bar'
|
||||
import { getAction } from '@/api/manage'
|
||||
import { filterObj } from '@/utils/util'
|
||||
import { filterObj, evil } from '@/utils/util'
|
||||
import moment from 'dayjs'
|
||||
|
||||
const rankList = []
|
||||
@@ -448,7 +448,7 @@ export default {
|
||||
return filterObj(param)
|
||||
},
|
||||
formatRespectiveHoldCert (value) {
|
||||
return (value + '' === '1' || eval(value)) ? '是' : '否'
|
||||
return (value + '' === '1' || evil(value)) ? '是' : '否'
|
||||
},
|
||||
formatCertFormat (value) {
|
||||
if (value + '' === '1') {
|
||||
|
||||
@@ -184,7 +184,7 @@ export default {
|
||||
method = 'put'
|
||||
}
|
||||
const formData = Object.assign({}, this.model)
|
||||
if (this.fileList != '') {
|
||||
if (this.fileList && this.fileList.length > 0) {
|
||||
formData.idcardPic = this.fileList
|
||||
} else {
|
||||
formData.idcardPic = ''
|
||||
|
||||
@@ -194,8 +194,7 @@ export default {
|
||||
UserRoleModal,
|
||||
SelectUserModal,
|
||||
RoleModal,
|
||||
UserModal,
|
||||
moment
|
||||
UserModal
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
|
||||
@@ -162,6 +162,7 @@ export default {
|
||||
width: '20%',
|
||||
type: FormTypes.input,
|
||||
validateRules: [
|
||||
// eslint-disable-next-line no-template-curly-in-string
|
||||
{ required: true, message: '${title}不能为空' }
|
||||
]
|
||||
},
|
||||
@@ -184,6 +185,7 @@ export default {
|
||||
width: '15%',
|
||||
type: FormTypes.inputNumber,
|
||||
validateRules: [
|
||||
// eslint-disable-next-line no-template-curly-in-string
|
||||
{ required: true, message: '${title}不能为空' },
|
||||
{ pattern: /^[1-9]\d*$/, message: '请输入零以上的正整数' }
|
||||
]
|
||||
@@ -204,6 +206,7 @@ export default {
|
||||
width: '20%',
|
||||
type: FormTypes.input,
|
||||
validateRules: [
|
||||
// eslint-disable-next-line no-template-curly-in-string
|
||||
{ required: true, message: '${title}不能为空' }
|
||||
]
|
||||
},
|
||||
|
||||
@@ -47,14 +47,12 @@ import { httpAction, getAction } from '@/api/manage'
|
||||
// import { validateDuplicateValue } from '@/utils/util'
|
||||
import JFormContainer from '@/components/jero/JFormContainer'
|
||||
import JDate from '@/components/jero/JDate'
|
||||
import JDictSelectTag from '@/components/dict/JDictSelectTag'
|
||||
|
||||
export default {
|
||||
name: 'TenantForm',
|
||||
components: {
|
||||
JFormContainer,
|
||||
JDate,
|
||||
JDictSelectTag
|
||||
JDate
|
||||
},
|
||||
props: {
|
||||
formData: {
|
||||
|
||||
Reference in New Issue
Block a user