Browse Source

Merge remote-tracking branch 'origin/master'

master
x_ying 3 years ago
parent
commit
a175f78e66
  1. BIN
      public/favicon.ico
  2. 32
      public/favicon.svg
  3. 2
      public/index.html
  4. 2
      src/views/category/fileNoFormat/index.vue
  5. 6
      src/views/category/listBrowsing/index.vue
  6. 6
      src/views/category/orderingRule/index.vue
  7. 3
      src/views/components/category/SettingForm.vue

BIN
public/favicon.ico

32
public/favicon.svg

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
<style type="text/css">
.st0{fill:#33D0FF;}
.st1{fill:url(#SVGID_1_);}
.st2{fill:url(#SVGID_2_);}
.st3{fill:#0088FD;}
</style>
<g>
<g>
<path class="st0" d="M436.9,430L0,160.6L572.6,23.2l371.3,193.9c40.4,21.1,33.1,81.1-11.2,91.9L436.9,430z"/>
</g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.8121" y1="475.9145" x2="437.1103" y2="475.9145" gradientTransform="matrix(1 -9.410683e-03 9.410683e-03 1 -4.9896 -1.4021)">
<stop offset="0" style="stop-color:#1437BF"/>
<stop offset="1" style="stop-color:#0076EF"/>
</linearGradient>
<polygon class="st1" points="436.8,498.4 0.2,229 0,446.4 436.7,715.9 "/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="2.284958e-02" y1="758.0685" x2="436.8583" y2="758.0685">
<stop offset="0" style="stop-color:#1437BF"/>
<stop offset="1" style="stop-color:#0076EF"/>
</linearGradient>
<polygon class="st2" points="0,514.9 0,732 436.9,1001.2 436.9,784.1 "/>
<path class="st3" d="M436.9,1001.2L943.5,876c47.2-11.5,80.5-53.8,80.5-102.5v0c0-68.4-64-118.7-130.5-102.5l-456.7,113V1001.2z
M908.5,738.7c18.6,0,33.7,17.9,33.7,40c0,22.1-15.1,40-33.7,40c-18.6,0-33.7-17.9-33.7-40C874.8,756.6,889.9,738.7,908.5,738.7z"
/>
<path class="st3" d="M436.9,498.3v217.4l506.6-125.2C990.7,579,1024,536.7,1024,488v0c0-68.5-64.1-118.8-130.7-102.6L436.9,498.3z
M908.5,534.2c-18.6,0-33.7-17.9-33.7-40s15.1-40,33.7-40c18.6,0,33.7,17.9,33.7,40S927.2,534.2,908.5,534.2z"/>
</g>
</svg>

2
public/index.html

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="icon" href="<%= BASE_URL %>favicon.svg" type="image/svg+xml">
<title><%= webpackConfig.name %></title>
</head>
<body>

2
src/views/category/fileNoFormat/index.vue

@ -159,7 +159,7 @@ export default {
})
},
toSort() {
this.$refs.sort.sortTableData = this.table.right.data
this.$refs.sort.sortTableData = JSON.parse(JSON.stringify(this.table.right.data))
this.$refs.sort.sortVisible = true
}
}

6
src/views/category/listBrowsing/index.vue

@ -61,7 +61,7 @@
</el-dialog>
</div>
<!-- @selection-change="selectionChangeHandler" -->
<el-table ref="table" v-loading="table.bottom.loading" :data="table.bottom.data" style="min-width: 100%;" height="300" class="nowrap-tab">
<el-table ref="table" :key="tableKey" v-loading="table.bottom.loading" :data="table.bottom.data" style="min-width: 100%;" height="300" class="nowrap-tab">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column v-for="field in table.right.data" :key="field.id" :label="field.fieldCnName" :align="field.displayformatType" :width="field.displayLength" show-overflow-tooltip>
@ -101,6 +101,7 @@ export default {
deleteVisible: false,
sortLoading: false,
delAllLoading: false,
tableKey: false, // :key
table: {
left: {
data: [],
@ -146,6 +147,7 @@ export default {
}
}
})
this.tableKey = !this.tableKey
})
},
getBottomTableData() {
@ -203,7 +205,7 @@ export default {
})
},
toSort() {
this.$refs.sort.sortTableData = this.table.right.data
this.$refs.sort.sortTableData = JSON.parse(JSON.stringify(this.table.right.data))
this.$refs.sort.sortVisible = true
}
}

6
src/views/category/orderingRule/index.vue

@ -10,7 +10,7 @@
<el-table ref="leftTable" v-loading="table.left.loading" :data="table.left.data" style="width: 400px;" height="calc(100vh - 302px)" @selection-change="(val)=>selectionChangeHandler(val,'left')" @row-click="(row,column,e)=>clickRowHandler(row,column,e,'leftTable')">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="fieldCnName" label="隐藏字段" align="center" />
<el-table-column prop="fieldCnName" label="字段名称" align="center" />
</el-table>
<!--表单渲染-->
<eForm />
@ -31,7 +31,7 @@
<el-table ref="rightTable" v-loading="table.right.loading" :data="table.right.data" style="min-width: 100%;" height="calc(100vh - 302px)" @selection-change="(val)=>selectionChangeHandler(val,'right')" @row-click="(row,column,e)=>clickRowHandler(row,column,e,'rightTable')">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="fieldCnName" label="显示字段" align="center" />
<el-table-column prop="fieldCnName" label="字段名称" align="center" />
<el-table-column label="排序方式" align="center">
<template slot-scope="scope">
<span v-if="scope.row.displayOrderBy === 'asc'">升序</span>
@ -174,7 +174,7 @@ export default {
})
},
toSort() {
this.$refs.sort.sortTableData = this.table.right.data
this.$refs.sort.sortTableData = JSON.parse(JSON.stringify(this.table.right.data))
this.$refs.sort.sortVisible = true
}
}

3
src/views/components/category/SettingForm.vue

@ -294,6 +294,9 @@ export default {
// input.value>200,
changEditLength(e) {
const value = e.target.value
if (value < 46) {
this.$message.error('显示长度最小46')
}
if (value > 200) {
this.form.isLine = true
}

Loading…
Cancel
Save