hjq/mart-admin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'admin-21.10.30:修复演示错误，TagsView拖拽问题，感谢群友@小明画家、@HelloWord'

Browse Source
This commit is contained in:
lyt 2021-10-30 21:11:40 +08:00
parent af13922492
commit e3aa4d4816
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package.json
View File

@ -10,13 +10,13 @@
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
}, },
"dependencies": { "dependencies": {
"axios": "^0.23.0", "axios": "^0.24.0",
"countup.js": "^2.0.8", "countup.js": "^2.0.8",
"cropperjs": "^1.5.12", "cropperjs": "^1.5.12",
"echarts": "^5.2.1", "echarts": "^5.2.1",
"echarts-gl": "^2.0.8", "echarts-gl": "^2.0.8",
"echarts-wordcloud": "^2.0.0", "echarts-wordcloud": "^2.0.0",
"element-plus": "^1.1.0-beta.20", "element-plus": "^1.1.0-beta.24",
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"mitt": "^3.0.0", "mitt": "^3.0.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
@ -32,27 +32,27 @@
"vue-router": "^4.0.12", "vue-router": "^4.0.12",
"vue-web-screen-shot": "^1.2.0", "vue-web-screen-shot": "^1.2.0",
"vuex": "^4.0.2", "vuex": "^4.0.2",
"wangeditor": "^4.7.8" "wangeditor": "^4.7.9"
}, },
"devDependencies": { "devDependencies": {
"@types/axios": "^0.14.0", "@types/axios": "^0.14.0",
"@types/clipboard": "^2.0.1", "@types/clipboard": "^2.0.1",
"@types/node": "^16.11.0", "@types/node": "^16.11.6",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.10.7", "@types/sortablejs": "^1.10.7",
"@typescript-eslint/eslint-plugin": "^5.0.0", "@typescript-eslint/eslint-plugin": "^5.2.0",
"@typescript-eslint/parser": "^5.0.0", "@typescript-eslint/parser": "^5.2.0",
"@vitejs/plugin-vue": "^1.9.3", "@vitejs/plugin-vue": "^1.9.4",
"@vue/compiler-sfc": "^3.2.20", "@vue/compiler-sfc": "^3.2.20",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"eslint": "^8.0.1", "eslint": "^8.1.0",
"eslint-plugin-vue": "^7.19.1", "eslint-plugin-vue": "^8.0.3",
"prettier": "^2.4.1", "prettier": "^2.4.1",
"sass": "^1.43.2", "sass": "^1.43.4",
"sass-loader": "^12.2.0", "sass-loader": "^12.3.0",
"typescript": "^4.4.4", "typescript": "^4.4.4",
"vite": "^2.6.7", "vite": "^2.6.13",
"vue-eslint-parser": "^7.11.0" "vue-eslint-parser": "^8.0.1"
}, },
"browserslist": [ "browserslist": [
"> 1%", "> 1%",

6
src/layout/navBars/tagsView/tagsView.vue
View File

@ -6,7 +6,7 @@
v-for="(v, k) in tagsViewList" v-for="(v, k) in tagsViewList"
:key="k" :key="k"
class="layout-navbars-tagsview-ul-li" class="layout-navbars-tagsview-ul-li"
:data-name="v.name" :data-url="v.url"
:class="{ 'is-active': isActive(v) }" :class="{ 'is-active': isActive(v) }"
@contextmenu.prevent="onContextmenu(v, $event)" @contextmenu.prevent="onContextmenu(v, $event)"
@click="onTagsClick(v, k)" @click="onTagsClick(v, k)"
@ -401,13 +401,13 @@ export default {
state.sortable && state.sortable.destroy(); state.sortable && state.sortable.destroy();
state.sortable = Sortable.create(el, { state.sortable = Sortable.create(el, {
animation: 300, animation: 300,
dataIdAttr: 'data-name', dataIdAttr: 'data-url',
disabled: getThemeConfig.value.isSortableTagsView ? false : true, disabled: getThemeConfig.value.isSortableTagsView ? false : true,
onEnd: () => { onEnd: () => {
const sortEndList: any = []; const sortEndList: any = [];
state.sortable.toArray().map((val: any) => { state.sortable.toArray().map((val: any) => {
state.tagsViewList.map((v: any) => { state.tagsViewList.map((v: any) => {
if (v.name === val) sortEndList.push({ ...v }); if (v.url === val) sortEndList.push({ ...v });
}); });
}); });
addBrowserSetSession(sortEndList); addBrowserSetSession(sortEndList);

4
src/views/pages/steps/index.vue
View File

@ -6,9 +6,9 @@
<el-step title="第二步" icon="iconfont icon-2_round_solid"></el-step> <el-step title="第二步" icon="iconfont icon-2_round_solid"></el-step>
<el-step title="第三步" icon="iconfont icon-3_round_solid"></el-step> <el-step title="第三步" icon="iconfont icon-3_round_solid"></el-step>
</el-steps> </el-steps>
<el-result icon="error" title="成功提示" subTitle="请根据提示进行操作" v-if="stepsActive === 1"> </el-result> <el-result icon="success" title="成功提示" subTitle="请根据提示进行操作" v-if="stepsActive === 1"> </el-result>
<el-result icon="warning" title="警告提示" subTitle="请根据提示进行操作" v-else-if="stepsActive === 2"> </el-result> <el-result icon="warning" title="警告提示" subTitle="请根据提示进行操作" v-else-if="stepsActive === 2"> </el-result>
<el-result icon="success" title="错误提示" subTitle="请根据提示进行操作" v-else-if="stepsActive === 3"> </el-result> <el-result icon="error" title="错误提示" subTitle="请根据提示进行操作" v-else-if="stepsActive === 3"> </el-result>
<el-button @click="onNextSteps" size="small" class="mt15" type="primary" icon="iconfont icon-step">下一步</el-button> <el-button @click="onNextSteps" size="small" class="mt15" type="primary" icon="iconfont icon-step">下一步</el-button>
</el-card> </el-card>
</div> </div>