xs-common-plugins 1.4.3 → 1.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xs-common-plugins",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "private": false,
   "description": "向上公共代码部分",
   "author": "祝玲云 <1902733517@qq.com>",

package/src/common/common.js

@@ -256,6 +256,11 @@ common.popup = (options) => {
 	document.body.appendChild(div);
 
 	const dialogComponent = {
+		computed:{
+			loading() {
+				return this.$store.getters?.loading || false;
+			}
+		},
 		components: {
 			child: component
 		},
@@ -322,7 +327,7 @@ common.popup = (options) => {
 			<el-dialog :title="title" v-el-drag-dialog :visible.sync="visible" :width="width" :before-close="beforeClose" v-bind="dialogCfg" append-to-body>
 				<child ref="child" :srcData="srcData" v-bind="props" @close="close" @cancel="cancel"/>
 				<div v-if="showButton" style="text-align: right;margin-top: 10px">
-					<el-button size="medium" type="primary" @click="confirm">确认</el-button>
+					<el-button size="medium" type="primary" @click="confirm" v-loading="loading">确认</el-button>
 					<el-button size="medium" @click="cancel">取消</el-button>
 				</div>
 			</el-dialog>
@@ -332,6 +337,7 @@ common.popup = (options) => {
 
 	return new Vue({
 		el: div,
+		store,
 		render(h) {
 			return h(dialogComponent, {
 				props: {

package/src/store/getters.js

@@ -9,5 +9,6 @@ const getters = {
   menuList: state => state.app.menuList,
   ossCfg: state => state.oss.ossCfg,
   dic: state => state.dic.ask,
+  loading: state => state.app.requestNum > 0,
 }
 export default getters

package/src/utils/mixin.js

@@ -0,0 +1,11 @@
+import Vue from 'vue'
+import { mapGetters } from 'vuex'
+
+
+Vue.mixin({
+	computed:{
+		...mapGetters({
+			$app_loading: 'loading',
+		})
+	}
+})

package/src/utils/prototype.js

@@ -12,6 +12,7 @@ import common from '@/common/common'
 import Common_Search from '@/utils/search';
 import filterRules from './filterRules'
 import ossService from '@/utils/ossService'
+import '@/utils/mixin'
 
 //新版api 请求
 Vue.prototype.$ask = ask