🆙 更新上游依赖,同步element-plus2

This commit is contained in:
sc 2022-02-10 14:01:02 +08:00
parent 9e13cd58c3
commit 808e9a983a
37 changed files with 141 additions and 136 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "scui", "name": "scui",
"version": "1.4.2", "version": "1.5.0",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
@ -10,29 +10,29 @@
"dependencies": { "dependencies": {
"@element-plus/icons": "0.0.11", "@element-plus/icons": "0.0.11",
"@tinymce/tinymce-vue": "4.0.5", "@tinymce/tinymce-vue": "4.0.5",
"axios": "0.24.0", "axios": "0.25.0",
"core-js": "3.19.2", "core-js": "3.21.0",
"cropperjs": "1.5.12", "cropperjs": "1.5.12",
"crypto-js": "4.1.1", "crypto-js": "4.1.1",
"echarts": "5.2.2", "echarts": "5.3.0",
"element-plus": "1.2.0-beta.6", "element-plus": "2.0.1",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"qrcodejs2": "0.0.2", "qrcodejs2": "0.0.2",
"sortablejs": "1.14.0", "sortablejs": "1.14.0",
"tinymce": "5.10.2", "tinymce": "5.10.2",
"vue": "3.2.23", "vue": "3.2.30",
"vue-i18n": "9.1.9", "vue-i18n": "9.1.9",
"vue-router": "4.0.12", "vue-router": "4.0.12",
"vuedraggable": "4.0.3", "vuedraggable": "4.0.3",
"vuex": "4.0.2", "vuex": "4.0.2",
"xgplayer": "2.31.4", "xgplayer": "2.31.4",
"xgplayer-hls": "2.4.32-3" "xgplayer-hls": "2.5.1"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "4.5.15", "@vue/cli-plugin-babel": "4.5.15",
"@vue/cli-plugin-eslint": "4.5.15", "@vue/cli-plugin-eslint": "4.5.15",
"@vue/cli-service": "4.5.15", "@vue/cli-service": "4.5.15",
"@vue/compiler-sfc": "3.2.23", "@vue/compiler-sfc": "3.2.30",
"babel-eslint": "10.1.0", "babel-eslint": "10.1.0",
"eslint": "6.8.0", "eslint": "6.8.0",
"eslint-plugin-vue": "7.19.1", "eslint-plugin-vue": "7.19.1",

View File

@ -1,17 +1,17 @@
<!-- <!--
* @Descripttion: scContextmenuItem组件 * @Descripttion: scContextmenuItem组件
* @version: 1.1 * @version: 1.2
* @Author: sakuya * @Author: sakuya
* @Date: 2021年7月23日16:29:36 * @Date: 2021年7月23日16:29:36
* @LastEditors: sakuya * @LastEditors: sakuya
* @LastEditTime: 2021年11月26日23:13:57 * @LastEditTime: 2022年2月8日15:51:07
--> -->
<template> <template>
<hr v-if="divided"> <hr v-if="divided">
<li :class="disabled?'disabled':''" @click.stop="liClick" @mouseenter="openSubmenu($event)" @mouseleave="closeSubmenu($event)"> <li :class="disabled?'disabled':''" @click.stop="liClick" @mouseenter="openSubmenu($event)" @mouseleave="closeSubmenu($event)">
<span class="title"> <span class="title">
<el-icon class="sc-contextmenu__icon"><component :is="icon" /></el-icon> <el-icon class="sc-contextmenu__icon"><component v-if="icon" :is="icon" /></el-icon>
{{title}} {{title}}
</span> </span>
<span class="sc-contextmenu__suffix"> <span class="sc-contextmenu__suffix">

View File

@ -1,17 +1,17 @@
<!-- <!--
* @Descripttion: 过滤器V2 * @Descripttion: 过滤器V2
* @version: 2.3 * @version: 2.4
* @Author: sakuya * @Author: sakuya
* @Date: 2021年7月30日14:48:41 * @Date: 2021年7月30日14:48:41
* @LastEditors: sakuya * @LastEditors: sakuya
* @LastEditTime: 20221月13日13:47:20 * @LastEditTime: 20222月8日15:28:24
--> -->
<template> <template>
<div class="sc-filterBar"> <div class="sc-filterBar">
<slot :filterLength="filterObjLength" :openFilter="openFilter"> <slot :filterLength="filterObjLength" :openFilter="openFilter">
<el-badge :value="filterObjLength" type="danger" :hidden="filterObjLength<=0"> <el-badge :value="filterObjLength" type="danger" :hidden="filterObjLength<=0">
<el-button size="small" icon="el-icon-filter" @click="openFilter"></el-button> <el-button icon="el-icon-filter" @click="openFilter"></el-button>
</el-badge> </el-badge>
</slot> </slot>
@ -39,7 +39,7 @@
</colgroup> </colgroup>
<tr v-for="(item,index) in filter" :key="index"> <tr v-for="(item,index) in filter" :key="index">
<td> <td>
<el-tag size="medium">{{index+1}}</el-tag> <el-tag>{{index+1}}</el-tag>
</td> </td>
<td> <td>
<py-select v-model="item.field" :options="fields" placeholder="过滤字段" filterable @change="fieldChange(item)"> <py-select v-model="item.field" :options="fields" placeholder="过滤字段" filterable @change="fieldChange(item)">

View File

@ -3,16 +3,16 @@
<el-table :data="data" ref="table" :key="toggleIndex" border stripe> <el-table :data="data" ref="table" :key="toggleIndex" border stripe>
<el-table-column type="index" width="50" fixed="left"> <el-table-column type="index" width="50" fixed="left">
<template #header> <template #header>
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="rowAdd"></el-button> <el-button type="primary" icon="el-icon-plus" size="small" circle @click="rowAdd"></el-button>
</template> </template>
<template #default="scope"> <template #default="scope">
<div class="sc-form-table-handle"> <div class="sc-form-table-handle">
<span>{{scope.$index + 1}}</span> <span>{{scope.$index + 1}}</span>
<el-button type="danger" icon="el-icon-delete" size="mini" plain circle @click="rowDel(scope.row, scope.$index)"></el-button> <el-button type="danger" icon="el-icon-delete" size="small" plain circle @click="rowDel(scope.row, scope.$index)"></el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="" width="51" v-if="dragSort"> <el-table-column label="" width="58" v-if="dragSort">
<template #default> <template #default>
<el-tag class="move" style="cursor: move;"><el-icon-d-caret style="width: 1em; height: 1em;"/></el-tag> <el-tag class="move" style="cursor: move;"><el-icon-d-caret style="width: 1em; height: 1em;"/></el-tag>
</template> </template>

View File

@ -1,10 +1,10 @@
<!-- <!--
* @Descripttion: 图标选择器组件 * @Descripttion: 图标选择器组件
* @version: 1.2 * @version: 1.3
* @Author: sakuya * @Author: sakuya
* @Date: 2021年7月27日10:02:46 * @Date: 2021年7月27日10:02:46
* @LastEditors: sakuya * @LastEditors: sakuya
* @LastEditTime: 2021年11月16日09:35:34 * @LastEditTime: 2022年2月8日15:47:13
--> -->
<template> <template>
@ -16,7 +16,7 @@
<el-tabs style="margin-top: -30px;"> <el-tabs style="margin-top: -30px;">
<el-tab-pane v-for="item in data" :key="item.name" lazy> <el-tab-pane v-for="item in data" :key="item.name" lazy>
<template #label> <template #label>
{{item.name}} <el-tag size="mini" type="info">{{item.icons.length}}</el-tag> {{item.name}} <el-tag size="small" type="info">{{item.icons.length}}</el-tag>
</template> </template>
<div class="sc-icon-select__list"> <div class="sc-icon-select__list">
<el-scrollbar> <el-scrollbar>

View File

@ -19,7 +19,7 @@
</span> </span>
<span class="name_b" :title="item.prop">{{ item.label }}</span> <span class="name_b" :title="item.prop">{{ item.label }}</span>
<span class="width_b"> <span class="width_b">
<el-input v-model="item.width" placeholder="auto" size="mini"></el-input> <el-input v-model="item.width" placeholder="auto" size="small"></el-input>
</span> </span>
<span class="sortable_b"> <span class="sortable_b">
<el-switch v-model="item.sortable"></el-switch> <el-switch v-model="item.sortable"></el-switch>

View File

@ -1,10 +1,10 @@
<!-- <!--
* @Descripttion: 数据表格组件 * @Descripttion: 数据表格组件
* @version: 1.6 * @version: 1.7
* @Author: sakuya * @Author: sakuya
* @Date: 2021年11月29日21:51:15 * @Date: 2021年11月29日21:51:15
* @LastEditors: sakuya * @LastEditors: sakuya
* @LastEditTime: 2021年12月12日12:49:50 * @LastEditTime: 2022年2月9日09:59:37
--> -->
<template> <template>
@ -45,11 +45,10 @@
</template> </template>
<el-form label-width="80px" label-position="left"> <el-form label-width="80px" label-position="left">
<el-form-item label="表格尺寸"> <el-form-item label="表格尺寸">
<el-radio-group v-model="config.size" size="mini" @change="configSizeChange"> <el-radio-group v-model="config.size" size="small" @change="configSizeChange">
<el-radio-button label="large"></el-radio-button> <el-radio-button label="large"></el-radio-button>
<el-radio-button label="medium"></el-radio-button> <el-radio-button label="default">正常</el-radio-button>
<el-radio-button label="small">正常</el-radio-button> <el-radio-button label="small"></el-radio-button>
<el-radio-button label="mini"></el-radio-button>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="样式"> <el-form-item label="样式">
@ -78,7 +77,7 @@
params: { type: Object, default: () => ({}) }, params: { type: Object, default: () => ({}) },
data: { type: Object, default: () => {} }, data: { type: Object, default: () => {} },
height: { type: [String,Number], default: "100%" }, height: { type: [String,Number], default: "100%" },
size: { type: String, default: "small" }, size: { type: String, default: "default" },
border: { type: Boolean, default: false }, border: { type: Boolean, default: false },
stripe: { type: Boolean, default: false }, stripe: { type: Boolean, default: false },
pageSize: { type: Number, default: config.pageSize }, pageSize: { type: Number, default: config.pageSize },

View File

@ -1,10 +1,10 @@
<!-- <!--
* @Descripttion: 仿钉钉流程设计器 * @Descripttion: 仿钉钉流程设计器
* @version: 1.1 * @version: 1.2
* @Author: sakuya * @Author: sakuya
* @Date: 2021年9月14日08:38:35 * @Date: 2021年9月14日08:38:35
* @LastEditors: sakuya * @LastEditors: sakuya
* @LastEditTime: 2021年10月28日23:07:06 * @LastEditTime: 2022年2月9日16:48:49
--> -->
<template> <template>
@ -127,7 +127,7 @@
.node-wrap-box:hover:after {border: 1px solid #3296fa;box-shadow: 0 0 6px 0 rgba(50,150,250,.3);} .node-wrap-box:hover:after {border: 1px solid #3296fa;box-shadow: 0 0 6px 0 rgba(50,150,250,.3);}
} }
.tags-list {margin-top: 15px;} .tags-list {margin-top: 15px;width: 100%;}
.add-node-popover-body {} .add-node-popover-body {}
.add-node-popover-body li {display: inline-block;width: 80px;text-align: center;padding:10px 0;} .add-node-popover-body li {display: inline-block;width: 80px;text-align: center;padding:10px 0;}
.add-node-popover-body li i {border: 1px solid var(--el-border-color-light);width:40px;height:40px;border-radius: 50%;text-align: center;line-height: 38px;font-size: 18px;cursor: pointer;} .add-node-popover-body li i {border: 1px solid var(--el-border-color-light);width:40px;height:40px;border-radius: 50%;text-align: center;line-height: 38px;font-size: 18px;cursor: pointer;}

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="add-node-btn-box"> <div class="add-node-btn-box">
<div class="add-node-btn"> <div class="add-node-btn">
<el-popover placement="right-start" :width="270" v-model:visible="visible" :hide-after="0" :show-after="0"> <el-popover placement="right-start" :width="270" trigger="click" :hide-after="0" :show-after="0">
<template #reference> <template #reference>
<el-button type="primary" icon="el-icon-plus" circle></el-button> <el-button type="primary" icon="el-icon-plus" circle></el-button>
</template> </template>
@ -33,7 +33,7 @@
}, },
data() { data() {
return { return {
visible: false
} }
}, },
mounted() { mounted() {
@ -93,7 +93,6 @@
} }
this.$emit("update:modelValue", node) this.$emit("update:modelValue", node)
this.visible = false
} }
} }
} }

View File

@ -42,7 +42,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.setType==2" label="指定主管"> <el-form-item v-if="form.setType==2" label="指定主管">
发起人的第 <el-input-number v-model="form.examineLevel" :min="1" size="mini"/> 级主管 发起人的第 <el-input-number v-model="form.examineLevel" :min="1"/> 级主管
</el-form-item> </el-form-item>
<el-form-item v-if="form.setType==3" label="选择角色"> <el-form-item v-if="form.setType==3" label="选择角色">
@ -64,7 +64,7 @@
<el-radio :label="0">直到最上层主管</el-radio> <el-radio :label="0">直到最上层主管</el-radio>
<el-radio :label="1">自定义审批终点</el-radio> <el-radio :label="1">自定义审批终点</el-radio>
</el-radio-group> </el-radio-group>
<p v-if="form.directorMode==1">直到发起人的第 <el-input-number v-model="form.directorLevel" :min="1" size="mini"/> 级主管</p> <p v-if="form.directorMode==1">直到发起人的第 <el-input-number v-model="form.directorLevel" :min="1"/> 级主管</p>
</el-form-item> </el-form-item>
<el-divider></el-divider> <el-divider></el-divider>
@ -73,7 +73,7 @@
</el-form-item> </el-form-item>
<template v-if="form.termAuto"> <template v-if="form.termAuto">
<el-form-item label="审批期限(为 0 则不生效)"> <el-form-item label="审批期限(为 0 则不生效)">
<el-input-number v-model="form.term" :min="0" size="mini"/> 小时 <el-input-number v-model="form.term" :min="0"/> 小时
</el-form-item> </el-form-item>
<el-form-item label="审批期限超时后执行"> <el-form-item label="审批期限超时后执行">
<el-radio-group v-model="form.termMode"> <el-radio-group v-model="form.termMode">
@ -85,9 +85,9 @@
<el-divider></el-divider> <el-divider></el-divider>
<el-form-item label="多人审批时审批方式"> <el-form-item label="多人审批时审批方式">
<el-radio-group v-model="form.examineMode"> <el-radio-group v-model="form.examineMode">
<p><el-radio :label="1">按顺序依次审批</el-radio></p> <p style="width: 100%;"><el-radio :label="1">按顺序依次审批</el-radio></p>
<p><el-radio :label="2">会签 (可同时审批每个人必须审批通过)</el-radio></p> <p style="width: 100%;"><el-radio :label="2">会签 (可同时审批每个人必须审批通过)</el-radio></p>
<p><el-radio :label="3">或签 (有一人审批通过即可)</el-radio></p> <p style="width: 100%;"><el-radio :label="3">或签 (有一人审批通过即可)</el-radio></p>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>

View File

@ -83,9 +83,9 @@
<el-input v-model="scope.row.value" placeholder="值"></el-input> <el-input v-model="scope.row.value" placeholder="值"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="value" label="移除" width="50"> <el-table-column prop="value" label="移除" width="55">
<template #default="scope"> <template #default="scope">
<el-button size="mini" type="text" @click="deleteConditionList(scope.$index)">移除</el-button> <el-button size="small" type="text" @click="deleteConditionList(scope.$index)">移除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

View File

@ -40,7 +40,7 @@
<label>{{item.name}}</label> <label>{{item.name}}</label>
</span> </span>
<span class="delete"> <span class="delete">
<el-button type="text" icon="el-icon-delete" circle size="mini" @click="deleteSelected(index)"></el-button> <el-button type="text" icon="el-icon-delete" circle size="small" @click="deleteSelected(index)"></el-button>
</span> </span>
</li> </li>
</el-scrollbar> </el-scrollbar>

View File

@ -6,10 +6,10 @@ const DEFAULT_CONFIG = {
DASHBOARD_URL: "/dashboard", DASHBOARD_URL: "/dashboard",
//版本号 //版本号
APP_VER: "1.4.2", APP_VER: "1.5.0",
//内核版本号 //内核版本号
CORE_VER: "1.4.2", CORE_VER: "1.5.0",
//接口地址 //接口地址
API_URL: "/api", API_URL: "/api",

View File

@ -33,8 +33,8 @@
</el-scrollbar> </el-scrollbar>
</el-main> </el-main>
<el-footer> <el-footer>
<el-button type="primary" size="small">消息中心</el-button> <el-button type="primary">消息中心</el-button>
<el-button size="small" @click="markRead">全部设为已读</el-button> <el-button @click="markRead">全部设为已读</el-button>
</el-footer> </el-footer>
</el-container> </el-container>
</el-drawer> </el-drawer>

View File

@ -12,7 +12,7 @@ const app = createApp(App);
app.use(store); app.use(store);
app.use(router); app.use(router);
app.use(ElementPlus, {size: 'small'}); app.use(ElementPlus, {size: 'default'});
app.use(i18n); app.use(i18n);
app.use(scui); app.use(scui);

View File

@ -1,7 +1,7 @@
/* 覆盖element-plus样式 */ /* 覆盖element-plus样式 */
.el-menu {border: none!important;} .el-menu {border: none!important;}
.el-menu .el-menu-item a {color: inherit;text-decoration: none;display: block;width:100%;height:100%;position: absolute;top:0px;left:0px;} .el-menu .el-menu-item a {color: inherit;text-decoration: none;display: block;width:100%;height:100%;position: absolute;top:0px;left:0px;}
.el-form-item-msg {font-size: 12px;color: #999;clear: both;} .el-form-item-msg {font-size: 12px;color: #999;clear: both;width: 100%;}
.el-container {height: 100%;} .el-container {height: 100%;}
.el-aside {border-right: 1px solid #e6e6e6;background: #fff;} .el-aside {border-right: 1px solid #e6e6e6;background: #fff;}
.el-header {background: #fff;border-bottom: 1px solid #e6e6e6;padding:13px 15px;display: flex;justify-content: space-between;align-items: center;} .el-header {background: #fff;border-bottom: 1px solid #e6e6e6;padding:13px 15px;display: flex;justify-content: space-between;align-items: center;}
@ -33,7 +33,14 @@
.el-table .el-table__body-wrapper {background: #f6f8f9;} .el-table .el-table__body-wrapper {background: #f6f8f9;}
.el-col .el-card {margin-bottom: 15px;} .el-col .el-card {margin-bottom: 15px;}
.el-main {flex-basis: 100%;} .el-main {flex-basis: 100%;}
.el-main > .scTable .el-table--border {border: 0;} .el-main > .scTable .el-table--border::before {display: none;}
.el-main > .scTable .el-table--border::after {display: none;}
.el-main > .scTable .el-table--border .el-table__inner-wrapper::after {display: none;}
.el-main > .scTable .el-table__border-left-patch {display: none;}
.el-main > .scTable .el-table--border .el-table__inner-wrapper tr:first-child td:first-child {border-left: 0;}
.el-main > .scTable .el-table--border .el-table__inner-wrapper tr:first-child th:first-child {border-left: 0;}
.el-table.el-table--large {font-size: 14px;}
.el-table {font-size: 12px;}
/* 动态值 */ /* 动态值 */
.el-button--default:active, .el-button--default.is-plain:active {border-color: var(--el-color-primary-darken-1, #0d84ff);color: var(--el-color-primary-darken-1, #0d84ff);} .el-button--default:active, .el-button--default.is-plain:active {border-color: var(--el-color-primary-darken-1, #0d84ff);color: var(--el-color-primary-darken-1, #0d84ff);}

View File

@ -154,6 +154,11 @@
.el-table tr {background: #2e2e2e;} .el-table tr {background: #2e2e2e;}
.el-table--striped .el-table__body tr.el-table__row--striped td {background: #2b2b2b;} .el-table--striped .el-table__body tr.el-table__row--striped td {background: #2b2b2b;}
.el-table .el-table__body-wrapper {background: $--background;} .el-table .el-table__body-wrapper {background: $--background;}
.el-table__header-wrapper tr th.el-table-fixed-column--right {background: var(--el-table-header-bg-color);}
.el-table__body-wrapper tr td.el-table-fixed-column--right {background: #2e2e2e;}
.el-table__header-wrapper tr th.el-table-fixed-column--left {background: var(--el-table-header-bg-color);}
.el-table__body-wrapper tr td.el-table-fixed-column--left {background: #2e2e2e;}
.el-table__body tr.hover-row>td.el-table__cell {background-color: var(--el-table-row-hover-bg-color);}
.el-menu {background: $--card-background;} .el-menu {background: $--card-background;}
.el-menu-item {color: $--text-color;} .el-menu-item {color: $--text-color;}
@ -218,7 +223,7 @@
.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {background: #383838;} .el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {background: #383838;}
.el-pagination.is-background .el-pager li:not(.disabled).active {color: #fff;} .el-pagination.is-background .el-pager li:not(.disabled).active {color: #fff;}
.el-descriptions__body {background: none;} .el-descriptions__body {background: none;}
.el-alert--info.is-light {background: #383838;} .el-alert--info.is-light {background: #383838;}

View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
<div class="actions"> <div class="actions">
<el-button type="primary" icon="el-icon-check" size="medium" @click="godoc">文档</el-button> <el-button type="primary" icon="el-icon-check" size="large" @click="godoc">文档</el-button>
</div> </div>
</div> </div>
</el-card> </el-card>

View File

@ -82,7 +82,7 @@
</div> </div>
</el-main> </el-main>
<el-footer style="height:51px;"> <el-footer style="height:51px;">
<el-button size="mini" @click="backDefaul()">恢复默认</el-button> <el-button size="small" @click="backDefaul()">恢复默认</el-button>
</el-footer> </el-footer>
</el-container> </el-container>
</div> </div>

View File

@ -19,37 +19,32 @@
</ul> </ul>
<el-drawer title="添加应用" v-model="modsDrawer" :size="570" destroy-on-close> <el-drawer title="添加应用" v-model="modsDrawer" :size="570" destroy-on-close>
<el-container> <div class="setMods">
<el-main class="nopadding"> <h4>我的常用 ( {{myMods.length}} )</h4>
<el-scrollbar> <draggable tag="ul" v-model="myMods" animation="200" item-key="path" group="people">
<div class="setMods"> <template #item="{ element }">
<h4>我的常用 ( {{myMods.length}} )</h4> <li :style="{background:element.meta.color||'#909399'}">
<draggable tag="ul" v-model="myMods" animation="200" item-key="path" group="people"> <el-icon><component :is="element.meta.icon||el-icon-menu" /></el-icon>
<template #item="{ element }"> <p>{{element.meta.title}}</p>
<li :style="{background:element.meta.color||'#909399'}"> </li>
<el-icon><component :is="element.meta.icon||el-icon-menu" /></el-icon> </template>
<p>{{element.meta.title}}</p> </draggable>
</li> </div>
</template> <div class="setMods">
</draggable> <h4>全部应用 ( {{filterMods.length}} )</h4>
</div> <draggable tag="ul" v-model="filterMods" animation="200" item-key="path" :sort="false" group="people">
<div class="setMods"> <template #item="{ element }">
<h4>全部应用 ( {{filterMods.length}} )</h4> <li :style="{background:element.meta.color||'#909399'}">
<draggable tag="ul" v-model="filterMods" animation="200" item-key="path" :sort="false" group="people"> <el-icon><component :is="element.meta.icon||el-icon-menu" /></el-icon>
<template #item="{ element }"> <p>{{element.meta.title}}</p>
<li :style="{background:element.meta.color||'#909399'}"> </li>
<el-icon><component :is="element.meta.icon||el-icon-menu" /></el-icon> </template>
<p>{{element.meta.title}}</p> </draggable>
</li> </div>
</template> <template #footer>
</draggable> <el-button @click="modsDrawer=false">取消</el-button>
</div> <el-button type="primary" @click="saveMods">保存</el-button>
</el-scrollbar> </template>
</el-main>
<el-footer>
<el-button type="primary" size="small" @click="saveMods">保存</el-button>
</el-footer>
</el-container>
</el-drawer> </el-drawer>
</div> </div>
</template> </template>

View File

@ -20,7 +20,7 @@
</el-tree> </el-tree>
</el-main> </el-main>
<el-footer style="height:51px;"> <el-footer style="height:51px;">
<el-button type="primary" size="mini" icon="el-icon-plus" style="width: 100%;" @click="addDic">字典分类</el-button> <el-button type="primary" size="small" icon="el-icon-plus" style="width: 100%;" @click="addDic">字典分类</el-button>
</el-footer> </el-footer>
</el-container> </el-container>
</el-aside> </el-aside>
@ -34,7 +34,7 @@
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table" :apiObj="listApi" row-key="id" :params="listApiParams" @selection-change="selectionChange" stripe :paginationLayout="'prev, pager, next'"> <scTable ref="table" :apiObj="listApi" row-key="id" :params="listApiParams" @selection-change="selectionChange" stripe :paginationLayout="'prev, pager, next'">
<el-table-column type="selection" width="50"></el-table-column> <el-table-column type="selection" width="50"></el-table-column>
<el-table-column label="" width="50"> <el-table-column label="" width="60">
<template #default> <template #default>
<el-tag class="move" style="cursor: move;"><el-icon-d-caret style="width: 1em; height: 1em;"/></el-tag> <el-tag class="move" style="cursor: move;"><el-icon-d-caret style="width: 1em; height: 1em;"/></el-tag>
</template> </template>

View File

@ -9,7 +9,7 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-date-picker v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" size="mini"></el-date-picker> <el-date-picker v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div> </div>
<div class="right-panel"> <div class="right-panel">
@ -20,11 +20,11 @@
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" stripe highlightCurrentRow @row-click="rowClick"> <scTable ref="table" :apiObj="apiObj" stripe highlightCurrentRow @row-click="rowClick">
<el-table-column label="级别" prop="level" width="50"> <el-table-column label="级别" prop="level" width="60">
<template #default="scope"> <template #default="scope">
<el-icon v-if="scope.row.level=='error'" style="color: #F56C6C;font-size: 14px;"><el-icon-circle-close-filled /></el-icon> <el-icon v-if="scope.row.level=='error'" style="color: #F56C6C;"><el-icon-circle-close-filled /></el-icon>
<el-icon v-if="scope.row.level=='warn'" style="color: #E6A23C;font-size: 14px;"><el-icon-warning-filled /></el-icon> <el-icon v-if="scope.row.level=='warn'" style="color: #E6A23C;"><el-icon-warning-filled /></el-icon>
<el-icon v-if="scope.row.level=='info'" style="color: #409EFF;font-size: 14px;"><el-icon-info-filled /></el-icon> <el-icon v-if="scope.row.level=='info'" style="color: #409EFF;"><el-icon-info-filled /></el-icon>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="ID" prop="id" width="180"></el-table-column> <el-table-column label="ID" prop="id" width="180"></el-table-column>
@ -33,7 +33,7 @@
<el-table-column label="请求方法" prop="type" width="150"></el-table-column> <el-table-column label="请求方法" prop="type" width="150"></el-table-column>
<el-table-column label="用户" prop="user" width="150"></el-table-column> <el-table-column label="用户" prop="user" width="150"></el-table-column>
<el-table-column label="客户端IP" prop="cip" width="150"></el-table-column> <el-table-column label="客户端IP" prop="cip" width="150"></el-table-column>
<el-table-column label="日志时间" prop="time" width="150"></el-table-column> <el-table-column label="日志时间" prop="time" width="170"></el-table-column>
</scTable> </scTable>
</el-main> </el-main>
</el-container> </el-container>

View File

@ -22,8 +22,8 @@
</el-tree> </el-tree>
</el-main> </el-main>
<el-footer style="height:51px;"> <el-footer style="height:51px;">
<el-button type="primary" size="mini" icon="el-icon-plus" @click="add()"></el-button> <el-button type="primary" size="small" icon="el-icon-plus" @click="add()"></el-button>
<el-button type="danger" size="mini" plain icon="el-icon-delete" @click="delMenu"></el-button> <el-button type="danger" size="small" plain icon="el-icon-delete" @click="delMenu"></el-button>
</el-footer> </el-footer>
</el-container> </el-container>
</el-aside> </el-aside>
@ -157,7 +157,7 @@
.custom-tree-node .label {display: flex;align-items: center;;height: 100%;} .custom-tree-node .label {display: flex;align-items: center;;height: 100%;}
.custom-tree-node .label .el-tag {margin-left: 5px;} .custom-tree-node .label .el-tag {margin-left: 5px;}
.custom-tree-node .do {display: none;} .custom-tree-node .do {display: none;}
.custom-tree-node .do i {margin-left:5px;color: #999;padding:5px;} .custom-tree-node .do i {margin-left:5px;color: #999;}
.custom-tree-node .do i:hover {color: #333;} .custom-tree-node .do i:hover {color: #333;}
.custom-tree-node:hover .do {display: inline-block;} .custom-tree-node:hover .do {display: inline-block;}

View File

@ -25,17 +25,17 @@
</ul> </ul>
<div class="bottom"> <div class="bottom">
<div class="state"> <div class="state">
<el-tag v-if="item.state=='1'" size="mini">准备就绪</el-tag> <el-tag v-if="item.state=='1'" size="small">准备就绪</el-tag>
<el-tag v-if="item.state=='-1'" size="mini" type="info">停用</el-tag> <el-tag v-if="item.state=='-1'" size="small" type="info">停用</el-tag>
</div> </div>
<div class="handler"> <div class="handler">
<el-popconfirm title="确定立即执行吗?" @confirm="run(item)"> <el-popconfirm title="确定立即执行吗?" @confirm="run(item)">
<template #reference> <template #reference>
<el-button type="primary" icon="el-icon-caret-right" size="mini" circle></el-button> <el-button type="primary" icon="el-icon-caret-right" circle></el-button>
</template> </template>
</el-popconfirm> </el-popconfirm>
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<el-button type="primary" icon="el-icon-more" size="mini" circle plain></el-button> <el-button type="primary" icon="el-icon-more" circle plain></el-button>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item @click="edit(item)">编辑</el-dropdown-item> <el-dropdown-item @click="edit(item)">编辑</el-dropdown-item>

View File

@ -20,7 +20,7 @@
</el-table-column> </el-table-column>
<el-table-column label="执行日志" prop="logs" width="100" fixed="right"> <el-table-column label="执行日志" prop="logs" width="100" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button size="mini" @click="show(scope.row)" type="text">日志</el-button> <el-button size="small" @click="show(scope.row)" type="text">日志</el-button>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>

View File

@ -37,7 +37,7 @@
<el-table-column label="登录账号" prop="userName" width="150" sortable='custom' column-key="filterUserName" :filters="[{text: '系统账号', value: '1'}, {text: '普通账号', value: '0'}]"></el-table-column> <el-table-column label="登录账号" prop="userName" width="150" sortable='custom' column-key="filterUserName" :filters="[{text: '系统账号', value: '1'}, {text: '普通账号', value: '0'}]"></el-table-column>
<el-table-column label="姓名" prop="name" width="150" sortable='custom'></el-table-column> <el-table-column label="姓名" prop="name" width="150" sortable='custom'></el-table-column>
<el-table-column label="所属角色" prop="groupName" width="200" sortable='custom'></el-table-column> <el-table-column label="所属角色" prop="groupName" width="200" sortable='custom'></el-table-column>
<el-table-column label="加入时间" prop="date" width="150" sortable='custom'></el-table-column> <el-table-column label="加入时间" prop="date" width="170" sortable='custom'></el-table-column>
<el-table-column label="操作" fixed="right" align="right" width="140"> <el-table-column label="操作" fixed="right" align="right" width="140">
<template #default="scope"> <template #default="scope">
<el-button type="text" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button> <el-button type="text" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>

View File

@ -25,10 +25,10 @@
<h2>{{task.title}}</h2> <h2>{{task.title}}</h2>
<div class="task-bottom"> <div class="task-bottom">
<div class="tags"> <div class="tags">
<el-tag type="info" size="mini">#{{task.id}}</el-tag> <el-tag type="info" size="small">#{{task.id}}</el-tag>
<el-tag v-if="task.state=='open'" type="info" size="mini">{{task.state}}</el-tag> <el-tag v-if="task.state=='open'" type="info" size="small">{{task.state}}</el-tag>
<el-tag v-if="task.state=='complete'" type="success" size="mini">{{task.state}}</el-tag> <el-tag v-if="task.state=='complete'" type="success" size="small">{{task.state}}</el-tag>
<el-tag v-if="task.state=='timeout'" type="danger" size="mini">{{task.state}}</el-tag> <el-tag v-if="task.state=='timeout'" type="danger" size="small">{{task.state}}</el-tag>
</div> </div>
<el-avatar :size="20" :src="task.avatar"></el-avatar> <el-avatar :size="20" :src="task.avatar"></el-avatar>
</div> </div>

View File

@ -2,13 +2,13 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-radio-group v-model="dateType" size="mini" style="margin-right: 15px;"> <el-radio-group v-model="dateType" style="margin-right: 15px;">
<el-radio-button label="今天"></el-radio-button> <el-radio-button label="今天"></el-radio-button>
<el-radio-button label="昨天"></el-radio-button> <el-radio-button label="昨天"></el-radio-button>
<el-radio-button label="最近7天"></el-radio-button> <el-radio-button label="最近7天"></el-radio-button>
<el-radio-button label="最近30天"></el-radio-button> <el-radio-button label="最近30天"></el-radio-button>
</el-radio-group> </el-radio-group>
<el-date-picker v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" size="mini"></el-date-picker> <el-date-picker v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div> </div>
</el-header> </el-header>
<el-main> <el-main>

View File

@ -11,11 +11,11 @@
<div class="make"> <div class="make">
<div class="make-left"> <div class="make-left">
<el-button type="primary" size="small">主要操作</el-button> <el-button type="primary">主要操作</el-button>
<el-button size="small">次要操作</el-button> <el-button>次要操作</el-button>
<el-button size="small">次要操作</el-button> <el-button>次要操作</el-button>
<el-dropdown> <el-dropdown>
<el-button size="small" icon="el-icon-arrow-down"></el-button> <el-button icon="el-icon-arrow-down"></el-button>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item>更改状态</el-dropdown-item> <el-dropdown-item>更改状态</el-dropdown-item>
@ -40,8 +40,8 @@
<el-descriptions-item label="ID">5001</el-descriptions-item> <el-descriptions-item label="ID">5001</el-descriptions-item>
<el-descriptions-item label="名称">scEcharts</el-descriptions-item> <el-descriptions-item label="名称">scEcharts</el-descriptions-item>
<el-descriptions-item label="参与者"> <el-descriptions-item label="参与者">
<el-tag size="mini">Sakuya</el-tag> <el-tag size="small">Sakuya</el-tag>
<el-tag size="mini">Lolowan</el-tag> <el-tag size="small">Lolowan</el-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="类型">数据</el-descriptions-item> <el-descriptions-item label="类型">数据</el-descriptions-item>
<el-descriptions-item label="创建时间">2010-10-10</el-descriptions-item> <el-descriptions-item label="创建时间">2010-10-10</el-descriptions-item>

View File

@ -35,7 +35,7 @@
<el-input v-model="form.name" placeholder="请输入名称" clearable></el-input> <el-input v-model="form.name" placeholder="请输入名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="medium" @click="save"> </el-button> <el-button type="primary" @click="save"> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>

View File

@ -146,7 +146,7 @@
<el-table-column label="事件" prop="title" width="150"></el-table-column> <el-table-column label="事件" prop="title" width="150"></el-table-column>
<el-table-column label="等级" prop="type" width="150"></el-table-column> <el-table-column label="等级" prop="type" width="150"></el-table-column>
<el-table-column label="通知" prop="push" ></el-table-column> <el-table-column label="通知" prop="push" ></el-table-column>
<el-table-column label="触发时间" prop="time" width="150"></el-table-column> <el-table-column label="触发时间" prop="time" width="180"></el-table-column>
</scTable> </scTable>
</el-card> </el-card>
<el-card shadow="never" header="Rule" style="margin-top: 15px;"> <el-card shadow="never" header="Rule" style="margin-top: 15px;">
@ -158,7 +158,7 @@
<el-table-column></el-table-column> <el-table-column></el-table-column>
<el-table-column label="操作" width="150" align="right"> <el-table-column label="操作" width="150" align="right">
<el-dropdown> <el-dropdown>
<el-button type="text" size="mini" icon="el-icon-more"></el-button> <el-button type="text" size="small" icon="el-icon-more"></el-button>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item>编辑</el-dropdown-item> <el-dropdown-item>编辑</el-dropdown-item>

View File

@ -8,7 +8,7 @@
<el-avatar :size="80" src="img/avatar.jpg"></el-avatar> <el-avatar :size="80" src="img/avatar.jpg"></el-avatar>
<h2>{{ form.name||'-' }}</h2> <h2>{{ form.name||'-' }}</h2>
<p>{{ form.about||'无签名' }}</p> <p>{{ form.about||'无签名' }}</p>
<el-button type="primary" round icon="el-icon-collection-tag" size="medium">Administrator</el-button> <el-button type="primary" round icon="el-icon-collection-tag" size="large">Administrator</el-button>
</div> </div>
<div class="user-info-main"> <div class="user-info-main">
<ul> <ul>
@ -42,7 +42,7 @@
<el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.timestamp" placement="top"> <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="activity.timestamp" placement="top">
<div class="activity-item"> <div class="activity-item">
<el-avatar class="avatar" :size="24" src="img/avatar.jpg"></el-avatar> <el-avatar class="avatar" :size="24" src="img/avatar.jpg"></el-avatar>
<label>{{activity.operate}}</label><el-tag v-if="activity.mod" size="mini">{{activity.mod}}</el-tag>{{activity.describe}} <label>{{activity.operate}}</label><el-tag v-if="activity.mod">{{activity.mod}}</el-tag>{{activity.describe}}
</div> </div>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>

View File

@ -146,12 +146,12 @@
radius: 100, radius: 100,
center: ['50%', '55%'], center: ['50%', '55%'],
indicator: [ indicator: [
{ name: '销售', max: 6500}, { name: '销售', max: 100},
{ name: '管理', max: 16000}, { name: '管理', max: 100},
{ name: '信息技术', max: 30000}, { name: '信息技术', max: 100},
{ name: '客服', max: 38000}, { name: '客服', max: 100},
{ name: '研发', max: 52000}, { name: '研发', max: 100},
{ name: '市场', max: 25000} { name: '市场', max: 100}
] ]
}, },
series: [{ series: [{
@ -160,7 +160,7 @@
areaStyle: {}, areaStyle: {},
data: [ data: [
{ {
value: [4200, 3000, 20000, 35000, 50000, 18000], value: [74, 90, 95, 65, 80, 31],
} }
] ]
}] }]

View File

@ -4,7 +4,7 @@
<scFilterBar filterName="filterName" :options="options" @filterChange="change"> <scFilterBar filterName="filterName" :options="options" @filterChange="change">
<template #default="{filterLength, openFilter}"> <template #default="{filterLength, openFilter}">
<el-badge :value="filterLength" type="danger" :hidden="filterLength<=0"> <el-badge :value="filterLength" type="danger" :hidden="filterLength<=0">
<el-button size="small" icon="el-icon-filter" @click="openFilter"></el-button> <el-button icon="el-icon-filter" @click="openFilter"></el-button>
</el-badge> </el-badge>
</template> </template>
</scFilterBar> </scFilterBar>

View File

@ -26,7 +26,7 @@
<el-input v-model="scope.row.val" placeholder="请输入内容"></el-input> <el-input v-model="scope.row.val" placeholder="请输入内容"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="open" label="checked" width="80" align="center"> <el-table-column prop="open" label="checked" width="85" align="center">
<template #default="scope"> <template #default="scope">
<el-checkbox v-model="scope.row.checked"></el-checkbox> <el-checkbox v-model="scope.row.checked"></el-checkbox>
</template> </template>

View File

@ -14,22 +14,22 @@
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :lg="12"> <el-col :lg="12">
<el-card shadow="never" header="异步单选"> <el-card shadow="never" header="异步单选">
<sc-select v-model="value" :apiObj="$API.system.dic.get" clearable filterable></sc-select> <sc-select v-model="value" :apiObj="$API.system.dic.get" clearable filterable style="width: 100%;"></sc-select>
</el-card> </el-card>
</el-col> </el-col>
<el-col :lg="12"> <el-col :lg="12">
<el-card shadow="never" header="异步多选"> <el-card shadow="never" header="异步多选">
<sc-select v-model="value2" :apiObj="$API.system.dic.get" clearable filterable multiple></sc-select> <sc-select v-model="value2" :apiObj="$API.system.dic.get" clearable filterable multiple style="width: 100%;"></sc-select>
</el-card> </el-card>
</el-col> </el-col>
<el-col :lg="12"> <el-col :lg="12">
<el-card shadow="never" header="字典选择器"> <el-card shadow="never" header="字典选择器">
<sc-select v-model="value3" dic="notice" clearable filterable></sc-select> <sc-select v-model="value3" dic="notice" clearable filterable style="width: 100%;"></sc-select>
</el-card> </el-card>
</el-col> </el-col>
<el-col :lg="12"> <el-col :lg="12">
<el-card shadow="never" header="自定义模板"> <el-card shadow="never" header="自定义模板">
<sc-select v-model="value4" dic="notice" clearable filterable placeholder="自定义placeholder"> <sc-select v-model="value4" dic="notice" clearable filterable placeholder="自定义placeholder" style="width: 100%;">
<template #option="{data}"> <template #option="{data}">
<span style="float: left">{{ data.label }}</span> <span style="float: left">{{ data.label }}</span>
<span style="float: right; color: #999; font-size: 13px">{{ data.value }}</span> <span style="float: right; color: #999; font-size: 13px">{{ data.value }}</span>

View File

@ -12,7 +12,7 @@
<el-alert title="select深度改造的表格选择器, 非常适用于大量数据选择的场景" type="success" style="margin-bottom:20px;"></el-alert> <el-alert title="select深度改造的表格选择器, 非常适用于大量数据选择的场景" type="success" style="margin-bottom:20px;"></el-alert>
<el-card shadow="never" header="单选"> <el-card shadow="never" header="单选">
<sc-table-select v-model="value2" :apiObj="apiObj" :params="params" :table-width="600" :props="props"> <sc-table-select v-model="value2" :apiObj="apiObj" :params="params" :table-width="600" :props="props">
<el-table-column prop="id" label="ID" width="150"></el-table-column> <el-table-column prop="id" label="ID" width="180"></el-table-column>
<el-table-column prop="user" label="姓名"></el-table-column> <el-table-column prop="user" label="姓名"></el-table-column>
</sc-table-select> </sc-table-select>
</el-card> </el-card>
@ -22,13 +22,13 @@
<template #header="{form, submit}"> <template #header="{form, submit}">
<el-form :inline="true" :model="form"> <el-form :inline="true" :model="form">
<el-form-item> <el-form-item>
<el-select v-model="form.sex" placeholder="性别" clearable :popper-append-to-body="false"> <el-select v-model="form.sex" placeholder="性别" clearable :teleported="false">
<el-option label="男" value="1"></el-option> <el-option label="男" value="1"></el-option>
<el-option label="女" value="2"></el-option> <el-option label="女" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-date-picker v-model="form.date" value-format="YYYY-MM-DD" type="date" placeholder="注册时间" :append-to-body="false"></el-date-picker> <el-date-picker v-model="form.date" value-format="YYYY-MM-DD" type="date" placeholder="注册时间" :teleported="false"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="submit">查询</el-button> <el-button type="primary" @click="submit">查询</el-button>
@ -36,7 +36,7 @@
</el-form> </el-form>
<el-alert title="自定义FORM插糟 传递了form对象和提交方法" type="info" /> <el-alert title="自定义FORM插糟 传递了form对象和提交方法" type="info" />
</template> </template>
<el-table-column prop="id" label="ID" width="150"></el-table-column> <el-table-column prop="id" label="ID" width="180"></el-table-column>
<el-table-column prop="user" label="姓名" width="100"></el-table-column> <el-table-column prop="user" label="姓名" width="100"></el-table-column>
<el-table-column prop="cip" label="最后请求IP" width="150"></el-table-column> <el-table-column prop="cip" label="最后请求IP" width="150"></el-table-column>
<el-table-column prop="time" label="注册时间"></el-table-column> <el-table-column prop="time" label="注册时间"></el-table-column>