xs-common-plugins 1.4.5 → 1.4.7

package/.idea/codeStyles/Project.xml

@@ -29,6 +29,9 @@
       <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
       <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
     </VueCodeStyleSettings>
+    <editorconfig>
+      <option name="ENABLED" value="false" />
+    </editorconfig>
     <codeStyleSettings language="HTML">
       <option name="SOFT_MARGINS" value="400" />
       <indentOptions>

package/.idea/jsLibraryMappings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <includedPredefinedLibrary name="Node.js Core" />
+  </component>
+</project>

package/.idea/prettier.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PrettierConfiguration">
+    <option name="myConfigurationMode" value="MANUAL" />
+  </component>
+</project>

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "xs-common-plugins",
-  "version": "1.4.5",
-  "private": false,
+  "version": "1.4.7",
   "description": "向上公共代码部分",
   "author": "祝玲云 <1902733517@qq.com>",
   "main": "index.js",
@@ -13,4 +12,4 @@
     "type": "git",
     "url": "https://gitlab.365xs.cn/web/npm/xs-common-plugins.git"
   }
-}
+}

package/src/common/common.js

@@ -293,6 +293,10 @@ common.popup = (options) => {
 				type: Function,
 				default: null,
 			},
+			closeOnPressEscape:{
+				type: Boolean,
+				default: false,
+			}
 		},
 		data() {
 			return {
@@ -324,7 +328,7 @@ common.popup = (options) => {
 		},
 		template: `
 			<div>
-			<el-dialog :title="title" v-el-drag-dialog :visible.sync="visible" :width="width" :before-close="beforeClose" v-bind="dialogCfg" append-to-body>
+			<el-dialog :title="title" :close-on-click-modal="closeOnPressEscape"  :close-on-press-escape="closeOnPressEscape"  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" v-loading="loading">确认</el-button>

package/src/styles/table.scss

@@ -11,6 +11,10 @@
   height: 100%;
 }
 
+.el-loading-spinner {
+  transform: scale(0.5);
+}
+
 .el-image-viewer__close {
   color: #fff;
 }

package/src/utils/ossService.js

@@ -1,55 +1,69 @@
-import OSS from 'ali-oss'
-import { requestApi as axios} from 'xs-request'
-import store from '../store/index'
-import { getLocalStorage } from "@/utils/localStorage";
-import {getConfig} from '@/utils/global-config'
-
-// 去哪个服务下 获取 token 信息
-function getOssToken () {
-  return axios.get('@commng/UserCur/Oss/Config/' + getConfig('CLIENT_ID'))
-}
-
-let ossCfg = {}
-// 从 vuex 中 获取初始化值
-const initToken = function() {
-  ossCfg = store.getters.ossCfg
-  let timestamp = new Date().getTime()
-  // 有效期内不发送获取token 请求
-  if (ossCfg.region && ossCfg.timeout > timestamp) { return }
-  getOssToken()
-    .then(({ data }) => {
-      ossCfg.region = data.ossEndpoint
-      ossCfg.bucket = data.bucketName
-      ossCfg.accessKeyId = data.stsAccessKeyId
-      ossCfg.accessKeySecret = data.stsAccessKeySecret
-      ossCfg.stsToken = data.stsSecurityToken
-      ossCfg.baseDir = data.baseDir
-      ossCfg.timeout = timestamp + (data.durationSeconds * 1000)
-      store.commit("oss/SET_OSS", ossCfg)
-    })
-    .catch((err) => {
-      console.log('获取Token错误', err)
-    })
-}
-const newFileName = function(id = getConfig('CLIENT_ID'), userid = getLocalStorage("userProfile").id) {
-  let dt = new Date()
-  let y = dt.getFullYear()
-  let m = dt.getMonth() + 1 < 10 ? '0' + (dt.getMonth() + 1) : dt.getMonth() + 1
-  let d = dt.getDate() < 10 ? '0' + dt.getDate() : dt.getDate()
-  return `${ossCfg.baseDir}/${userid}/${y}${m}${d}/${id}_${dt.getTime()}` // 定义唯一的文件名
-}
-
-const ossService = {
-  token: ossCfg,
-  initToken,
-  newFileName,
-  _ossClient: null,
-  getOssClient() {
-    if (this._ossClient == null) { this._ossClient = new OSS(ossCfg) }
-    return this._ossClient
-  }
-}
-
-export default ossService
-
-
+import OSS from 'ali-oss'
+import { requestApi as axios } from 'xs-request'
+import store from '../store/index'
+import { getLocalStorage } from '@/utils/localStorage'
+import { getConfig } from '@/utils/global-config'
+
+let ossCfg = {}
+
+// 去哪个服务下 获取 token 信息
+function getOssToken() {
+	return axios
+		.get('@commng/UserCur/Oss/Config/' + getConfig('CLIENT_ID'))
+		.then(({ data }) => {
+			let timestamp = new Date().getTime()
+			ossCfg.region = data.ossEndpoint
+			ossCfg.bucket = data.bucketName
+			ossCfg.accessKeyId = data.stsAccessKeyId
+			ossCfg.accessKeySecret = data.stsAccessKeySecret
+			ossCfg.stsToken = data.stsSecurityToken
+			ossCfg.baseDir = data.baseDir
+			ossCfg.timeout = timestamp + data.durationSeconds * 1000
+			store.commit('oss/SET_OSS', ossCfg)
+			return ossCfg
+		})
+		.catch(err => {
+			console.log('获取Token错误', err)
+		})
+}
+
+//自动刷新token
+const initOssToken = function (time) {
+	setTimeout(() => {
+		getOssToken()
+	}, time)
+}
+
+// 从 vuex 中 获取初始化值
+const initToken = async function () {
+	ossCfg = store.getters.ossCfg
+	let timestamp = new Date().getTime()
+	// 有效期内不发送获取token 请求
+	let endTime = ossCfg.timeout - timestamp - 1000 * 60 // 提前1分钟刷新
+	initOssToken(endTime)
+	if (ossCfg.region && ossCfg.timeout > timestamp) {
+		return Promise.resolve(ossCfg)
+	}
+	return getOssToken()
+}
+
+const newFileName = function (id = getConfig('CLIENT_ID'), userid = getLocalStorage('userProfile').id) {
+	let dt = new Date()
+	let y = dt.getFullYear()
+	let m = dt.getMonth() + 1 < 10 ? '0' + (dt.getMonth() + 1) : dt.getMonth() + 1
+	let d = dt.getDate() < 10 ? '0' + dt.getDate() : dt.getDate()
+	return `${ossCfg.baseDir}/${userid}/${y}${m}${d}/${id}_${dt.getTime()}` // 定义唯一的文件名
+}
+
+const ossService = {
+	token: ossCfg,
+	initToken,
+	newFileName,
+	_ossClient: null,
+	getOssClient() {
+		this._ossClient = new OSS(ossCfg)
+		return this._ossClient
+	}
+}
+
+export default ossService

package/webpack.config.js

@@ -0,0 +1,12 @@
+const path = require('path')
+
+module.exports = {
+	context: path.resolve(__dirname, './'),
+	resolve: {
+		extension: ['.js', '.vue', '.json'],
+		alias: {
+			'@': path.resolve('src'),
+			'@modules': path.resolve('src/modules'),
+		}
+	}
+}