Merge remote-tracking branch 'origin/dev' into dev

qianming 3 years ago
commit 911efb15f5

@ -54,6 +54,18 @@
<div class="content unicode" style="display: block;">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe621;</span>
<div class="name">堆叠图</div>
<div class="code-name">&amp;#xe621;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe61f;</span>
<div class="name">堆叠图</div>
<div class="code-name">&amp;#xe61f;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe645;</span>
<div class="name">文件</div>
@ -750,9 +762,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1628064452460') format('woff2'),
url('iconfont.woff?t=1628064452460') format('woff'),
url('iconfont.ttf?t=1628064452460') format('truetype');
src: url('iconfont.woff2?t=1629425895962') format('woff2'),
url('iconfont.woff?t=1629425895962') format('woff'),
url('iconfont.ttf?t=1629425895962') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@ -778,6 +790,24 @@
<div class="content font-class">
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont iconbianzu23"></span>
<div class="name">
堆叠图
</div>
<div class="code-name">.iconbianzu23
</div>
</li>
<li class="dib">
<span class="icon iconfont iconduidietu"></span>
<div class="name">
堆叠图
</div>
<div class="code-name">.iconduidietu
</div>
</li>
<li class="dib">
<span class="icon iconfont iconfill_folder"></span>
<div class="name">
@ -1822,6 +1852,22 @@
<div class="content symbol">
<ul class="icon_lists dib-box">
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconbianzu23"></use>
</svg>
<div class="name">堆叠图</div>
<div class="code-name">#iconbianzu23</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconduidietu"></use>
</svg>
<div class="name">堆叠图</div>
<div class="code-name">#iconduidietu</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconfill_folder"></use>

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 1513211 */
src: url('iconfont.woff2?t=1628064452460') format('woff2'),
url('iconfont.woff?t=1628064452460') format('woff'),
url('iconfont.ttf?t=1628064452460') format('truetype');
src: url('iconfont.woff2?t=1629425895962') format('woff2'),
url('iconfont.woff?t=1629425895962') format('woff'),
url('iconfont.ttf?t=1629425895962') format('truetype');
}
.iconfont {
@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale;
}
.iconbianzu23:before {
content: "\e621";
}
.iconduidietu:before {
content: "\e61f";
}
.iconfill_folder:before {
content: "\e645";
}

File diff suppressed because one or more lines are too long

@ -5,6 +5,20 @@
"css_prefix_text": "icon",
"description": "",
"glyphs": [
{
"icon_id": "18888301",
"name": "堆叠图",
"font_class": "bianzu23",
"unicode": "e621",
"unicode_decimal": 58913
},
{
"icon_id": "23457042",
"name": "堆叠图",
"font_class": "duidietu",
"unicode": "e61f",
"unicode_decimal": 58911
},
{
"icon_id": "5472881",
"name": "文件",

@ -1,8 +1,22 @@
<template>
<anji-crud ref="listPage" :option="crudOption">
<template v-slot:buttonLeftOnTable>
<el-upload class="el-upload" :action="uploadUrl" :headers="headers" :on-success="handleUpload" :on-error="handleUpload" :show-file-list="false" :limit="1">
<el-button type="primary" icon="el-icon" v-permission="'fileManage:upload'"></el-button>
<el-upload
ref="upload"
class="el-upload"
:action="uploadUrl"
:headers="headers"
:on-success="handleUpload"
:on-error="handleUpload"
:show-file-list="false"
:limit="1"
>
<el-button
type="primary"
icon="el-icon"
v-permission="'fileManage:upload'"
>文件上传</el-button
>
</el-upload>
</template>
@ -12,173 +26,203 @@
</anji-crud>
</template>
<script>
import { fileList, fileAdd, fileDel, fileUpdate, fileDetail } from '@/api/file'
import { getToken } from '@/utils/auth'
import { fileList, fileAdd, fileDel, fileUpdate, fileDetail } from "@/api/file";
import { getToken } from "@/utils/auth";
export default {
name: 'File',
name: "File",
components: {
anjiCrud: require('@/components/AnjiPlus/anji-crud/anji-crud').default,
anjiCrud: require("@/components/AnjiPlus/anji-crud/anji-crud").default
},
data() {
return {
selectedList: [],
uploadUrl: process.env.BASE_API + '/file/upload',
uploadUrl: process.env.BASE_API + "/file/upload",
crudOption: {
// 使
title: '文件管理',
title: "文件管理",
//
labelWidth: '120px',
labelWidth: "120px",
//
queryFormFields: [
{
inputType: 'input',
label: '文件路径',
field: 'filePath',
},
inputType: "input",
label: "文件路径",
field: "filePath"
}
],
//
buttons: {
query: {
api: fileList,
permission: 'fileManage:query',
sort: 'create_time',
order: 'DESC',
permission: "fileManage:query",
sort: "create_time",
order: "DESC"
},
queryByPrimarykey: {
api: fileDetail,
permission: 'fileManage:query',
permission: "fileManage:query"
},
add: {
api: fileAdd,
permission: 'fileManage:upload',
isShow: false,
permission: "fileManage:upload",
isShow: false
},
delete: {
api: fileDel,
permission: 'fileManage:delete',
permission: "fileManage:delete"
},
edit: {
api: fileUpdate,
permission: 'fileManage:update',
isShow: false,
permission: "fileManage:update",
isShow: false
},
//
customButton: {
operationWidth: 100, // row
},
operationWidth: 100 // row
}
},
//
columns: [
{
label: '',
field: 'id',
label: "",
field: "id",
primaryKey: true, // ,
tableHide: true, //
editHide: true, //
editHide: true //
},
{
//
label: '图片缩略图', //
field: 'urlPath', //
columnType: 'imgPreview', // text
label: "图片缩略图", //
field: "urlPath", //
columnType: "imgPreview", // text
editHide: true, //
//
// inputType: 'input', // input anji-select
placeholder: '',
disabled: false,
placeholder: "",
disabled: false
},
{
label: '文件标识', //
placeholder: '',
field: 'fileId',
editField: 'fileId',
label: "文件标识", //
placeholder: "",
field: "fileId",
editField: "fileId",
tableHide: true, //
inputType: 'input',
rules: [{ min: 1, max: 64, message: '不超过64个字符', trigger: 'blur' }],
disabled: false,
inputType: "input",
rules: [
{ min: 1, max: 64, message: "不超过64个字符", trigger: "blur" }
],
disabled: false
},
{
label: '文件类型', //
placeholder: '',
field: 'fileType',
editField: 'fileType',
inputType: 'input',
rules: [{ min: 1, max: 1024, message: '不超过1024个字符', trigger: 'blur' }],
disabled: false,
label: "文件类型", //
placeholder: "",
field: "fileType",
editField: "fileType",
inputType: "input",
rules: [
{
min: 1,
max: 1024,
message: "不超过1024个字符",
trigger: "blur"
}
],
disabled: false
},
{
label: '文件路径', //
placeholder: '',
field: 'filePath',
editField: 'filePath',
inputType: 'input',
rules: [{ min: 1, max: 1024, message: '不超过1024个字符', trigger: 'blur' }],
disabled: false,
label: "文件路径", //
placeholder: "",
field: "filePath",
editField: "filePath",
inputType: "input",
rules: [
{
min: 1,
max: 1024,
message: "不超过1024个字符",
trigger: "blur"
}
],
disabled: false
},
{
label: 'url路径', // url
placeholder: '',
field: 'urlPath',
editField: 'urlPath',
inputType: 'input',
rules: [{ min: 1, max: 1024, message: '不超过1024个字符', trigger: 'blur' }],
disabled: false,
label: "url路径", // url
placeholder: "",
field: "urlPath",
editField: "urlPath",
inputType: "input",
rules: [
{
min: 1,
max: 1024,
message: "不超过1024个字符",
trigger: "blur"
}
],
disabled: false
},
{
label: '内容说明', //
placeholder: '',
field: 'fileInstruction',
editField: 'fileInstruction',
inputType: 'input',
rules: [{ min: 1, max: 1024, message: '不超过1024个字符', trigger: 'blur' }],
disabled: false,
label: "内容说明", //
placeholder: "",
field: "fileInstruction",
editField: "fileInstruction",
inputType: "input",
rules: [
{
min: 1,
max: 1024,
message: "不超过1024个字符",
trigger: "blur"
}
],
disabled: false
},
{
label: '创建人',
field: 'createByView',
columnType: 'expand', //
label: "创建人",
field: "createByView",
columnType: "expand", //
inputType: 'input', // input
disabled: true, //
inputType: "input", // input
disabled: true //
},
{
label: '创建时间',
field: 'createTime',
columnType: 'expand',
label: "创建时间",
field: "createTime",
columnType: "expand",
inputType: 'input',
disabled: true,
},
],
},
}
inputType: "input",
disabled: true
}
]
}
};
},
computed: {
headers() {
return {
Authorization: getToken(), // token
}
},
Authorization: getToken() // token
};
}
},
created() {},
methods: {
//
handleUpload(response) {
console.log(this)
this.$refs.upload.clearFiles();
//
this.$refs.listPage.handleQueryForm()
this.$refs.listPage.handleQueryForm();
},
handleError() {},
async downloadFile(row) {
window.open(row.urlPath)
window.open(row.urlPath);
},
customButtom(val) {
this.downloadFile(val.msg)
},
},
}
this.downloadFile(val.msg);
}
}
};
</script>
<style scoped lang="scss">
.el-upload {

@ -5689,7 +5689,7 @@ const widgetTools = [
code: 'widgetBarStackChart',
type: 'chart',
label: '柱状堆叠图',
icon: 'iconzhuzhuangtu',
icon: 'iconbianzu23',
options: {
// 配置
setup: [

Loading…
Cancel
Save