sh-tools 2.2.14 → 2.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-tools",
-  "version": "2.2.14",
+  "version": "2.2.16",
   "description": "基于fetch和xe-utils二次封装，支持宏公式计算，及notification提示窗",
   "main": "packages/index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "hot-formula-parser": "^4.0.0",
-    "xe-utils": "^3.5.22"
+    "xe-utils": "^3.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

package/packages/api/index.js

@@ -1,5 +1,3 @@
-import Notice from '../components/sh-notification'
-
 // fetch文档： https://developer.mozilla.org/en-US/docs/Web/API/fetch
 
 class HttpRequest {
@@ -62,27 +60,9 @@ class HttpRequest {
 	}
 	// 响应拦截器
 	async responseInterceptors(response, request) {
-		const { status, statusText, headers } = response
 		let resBody = response
 		if (request.bodyType === 'json') {
 			resBody = await response.json()
-			let errorMsg = resBody.msg || resBody.message || resBody.result || resBody.error || statusText || '系统错误'
-			switch (status) {
-				case 0:
-					Notice.error({ title: '请求错误', content: errorMsg })
-					break
-				case 200:
-					break
-				case 401:
-					Notice.error({ title: '系统提示 401', content: '未授权，请重新登录' })
-					return
-				case 504:
-					Notice.error({ title: '系统提示 网络超时', content: errorMsg })
-					break
-				default:
-					Notice.error({ title: `系统提示 ${status}`, content: errorMsg })
-					break
-			}
 		}
 		return resBody
 	}

package/packages/index.js

@@ -2,6 +2,4 @@ import http from './api/index'
 
 import utils from './utils/index'
 
-import notice from './components/sh-notification'
-
-export { http, utils, notice }
+export { http, utils }

package/packages/utils/other.js

@@ -7,15 +7,15 @@ export default {
 		if (dateDiff.done) {
 			if (dateDiff.time < 10000) {
 				return '刚刚'
-			}else if(dateDiff.time < 60000) {
+			} else if (dateDiff.time < 60000) {
 				return `${dateDiff.ss}秒之前`
-			}else if(dateDiff.time < 360000) {
+			} else if (dateDiff.time < 360000) {
 				return `${dateDiff.mm}分钟之前`
-			}else if(dateDiff.time < 86400000) {
+			} else if (dateDiff.time < 86400000) {
 				return `${dateDiff.HH}小时之前`
-			}else if(dateDiff.time < 2592000000) {
+			} else if (dateDiff.time < 2592000000) {
 				return `${dateDiff.dd}天之前`
-			}else if(dateDiff.time < 31536000000) {
+			} else if (dateDiff.time < 31536000000) {
 				return `${dateDiff.MM}个月之前`
 			}
 			return `${dateDiff.yyyy}年之前`
@@ -148,7 +148,7 @@ export default {
 		// editable: 是否对返回值进行修正 默认 否
 		let rvalue, rtext, rname
 		let { $vUtils, $vxePluginNames } = renderContext
-		let { min, max, digits, type, multiple, split, range, options, format, nodeKey, labelField, moneyUnit, commafy, openValue, openLabel, closeValue, closeLabel, bill, defaultValue } = renderProps
+		let { min, max, digits, type, multiple, split, options, callvalue, format, nodeKey, labelField, moneyUnit, openValue, openLabel, closeValue, closeLabel, defaultValue } = renderProps || {}
 		let defaultDateFormat = {
 			date: 'yyyy-MM-dd',
 			time: 'HH:mm:ss',
@@ -165,8 +165,6 @@ export default {
 		}
 		// 对于多选获取数组类型值进行解析 赋值
 		let oriArray = []
-		//  是否需要对原值进行重写 默认为false
-		let resetValue = false
 		// 配置公式，优先取解析后的嵌套公式
 		let formula = $vUtils.get(renderProps, `formulaMap.${key}`) || renderProps.formula
 		// 进行默认赋值 若没有任何解析原数返回
@@ -196,20 +194,15 @@ export default {
 				}
 				if (rname === '$vMoney' && !$vUtils.isNone(rvalue)) {
 					rtext = $vUtils.truncate($vUtils.divide(rvalue, moneyUnit), digits)
-				}else if(rname === '$vInput' && format) {
+				} else if (rname === '$vInput' && format) {
 					rtext = $vUtils.format(format, rowData)
 				}
-				if (commafy && !bill && bill !== '0') rtext = $vUtils.commafy(rtext, { digits }).replace(/0+$/, '').replace(/\.+$/, '')
 				break
 			case '$vTime':
 				format = format ? format.replace('YYYY', 'yyyy').replace('DD', 'dd').replace('hh', 'HH') : defaultDateFormat[type]
 				if ($vUtils.isNumber(value)) value = String(value)
-				if (range && Array.isArray(value) && format) {
-					rvalue = value.map(item => $vUtils.toDateString(item || '', format))
-					resetValue = true
-				} else if (!$vUtils.isNone(value) && format) {
+				if (!$vUtils.isNone(value) && format) {
 					rvalue = $vUtils.toDateString(value, format)
-					resetValue = true
 				}
 				break
 			case '$vSelect':
@@ -217,7 +210,13 @@ export default {
 			case '$vRadiogroup':
 			case '$vUpload':
 			case '$vTree':
-				let prefixKey = key.endsWith('Id') ? String(key).replace('Id', '') : key
+				let prefixKey = key
+				const endStrs = ['Id', '_id']
+				endStrs.forEach(end => {
+					if (String(key).endsWith(end)) {
+						prefixKey = key.replace(end, '')
+					}
+				})
 				let isMutiple = multiple || ['$vCheckgroup', '$vUpload'].includes(rname)
 				let optionValue = 'value'
 				let optionLabel = 'label'
@@ -263,11 +262,15 @@ export default {
 				}
 				break
 		}
-		if ($vUtils.isString(rvalue)) rvalue = $vUtils.replaceNutrim(rvalue)
-		if (formula || resetValue) {
+		if ($vUtils.isString(rvalue)) {
+			rvalue = $vUtils.replaceNutrim(rvalue)
+		}
+		if (formula && !callvalue) {
 			$vUtils.set(rowData, key, rvalue)
 		}
-		rtext = rtext || rvalue
+		if ($vUtils.isNone(rtext) && !$vUtils.isNone(rvalue)) {
+			rtext = rvalue
+		}
 		return { rvalue, rtext }
 	}
 }

package/packages/utils/string.js

@@ -15,7 +15,7 @@ function format(format, data, toNumber) {
 	let formatStr = String(format)
 	keys.map((key, indexkey) => {
 		let value = XEUtils.get(data, key) || ''
-		if(toNumber) value = XEUtils.toNumber(value)
+		if (toNumber) value = XEUtils.toNumber(value)
 		formatStr = formatStr.replace(new RegExp('{' + key + '}', 'ig'), value)
 	})
 	return formatStr
@@ -37,7 +37,7 @@ export default {
 	getFormatKeys,
 	format,
 	replaceNutrim(str) {
-		return String(str).replace(/null|undefined|(^\s*)|(\s*$)/gi, '')
+		return String(str).replace(/undefined|(^\s*)|(\s*$)/gi, '')
 	},
 	replaceAll(str, from, to) {
 		// 替换全部 将str中的所有from替换为to

package/packages/components/sh-notification/index.js

@@ -1,55 +0,0 @@
-import { createApp } from 'vue'
-import Notification from './notification.vue'
-
-let instances = []
-let seed = 0
-const now = Date.now()
-function getUuid() {
-	return 'ShNotification_' + now + '_' + seed++
-}
-
-function notice(type, options) {
-	const option = Object.assign({ title: '提示', id: getUuid(), type, placement: 'right-top', offset: 10 }, options)
-	option.onClose = nid => {
-		const inss = instances.filter(n => n.placement.startsWith(option.placement))
-		const idx = inss.findIndex(n => n.id === nid)
-		const ins = inss[idx]
-		const ykey = option.placement.split('-')[1]
-		if (idx > -1 && ins) {
-			for (let i = idx + 1; i < inss.length; i++) {
-				const cmpcss = getComputedStyle(inss[i].$el)
-				const y = parseInt(cmpcss[ykey]) || 0
-				inss[i].show(y - ins.$el.offsetHeight - option.offset + 'px')
-			}
-			instances = instances.filter(n => n.id !== nid)
-		}
-	}
-	const notification = createApp(Notification, option)
-	const dom = document.createElement('div')
-	const ins = notification.mount(dom)
-	const inss = instances.filter(n => n.placement.startsWith(option.placement))
-	document.body.appendChild(ins.$el)
-	let y = option.offset
-	inss.forEach(n => (y += n.$el.offsetHeight + option.offset))
-	ins.show(y + 'px')
-	instances.push(ins)
-	return { option, ins }
-}
-
-export default {
-	open(options) {
-		return notice('', options)
-	},
-	info(options) {
-		return notice('info', options)
-	},
-	success(options) {
-		return notice('success', options)
-	},
-	warning(options) {
-		return notice('warning', options)
-	},
-	error(options) {
-		return notice('error', options)
-	}
-}

package/packages/components/sh-notification/notification.vue

@@ -1,212 +0,0 @@
-<template>
-	<transition :name="transtionName">
-		<div v-if="visible" class="sh-notification" :class="classes" :style="styles">
-			<svg v-if="['info', 'success', 'warning', 'error'].includes(type)" class="sh-notification-icon" :fill="colorStyle[type]" viewBox="64 64 896 896">
-				<template v-if="type === 'info'">
-					<path
-						d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path>
-					<path d="M464 336a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm72 112h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V456c0-4.4-3.6-8-8-8z"></path>
-				</template>
-				<template v-else-if="type === 'success'">
-					<path
-						d="M699 353h-46.9c-10.2 0-19.9 4.9-25.9 13.3L469 584.3l-71.2-98.8c-6-8.3-15.6-13.3-25.9-13.3H325c-6.5 0-10.3 7.4-6.5 12.7l124.6 172.8a31.8 31.8 0 0 0 51.7 0l210.6-292c3.9-5.3.1-12.7-6.4-12.7z"></path>
-					<path
-						d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path>
-				</template>
-				<template v-else-if="type === 'warning'">
-					<path
-						d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path>
-					<path d="M464 688a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"></path>
-				</template>
-				<template v-else-if="type === 'error'">
-					<path
-						d="M685.4 354.8c0-4.4-3.6-8-8-8l-66 .3L512 465.6l-99.3-118.4-66.1-.3c-4.4 0-8 3.5-8 8 0 1.9.7 3.7 1.9 5.2l130.1 155L340.5 670a8.32 8.32 0 0 0-1.9 5.2c0 4.4 3.6 8 8 8l66.1-.3L512 564.4l99.3 118.4 66 .3c4.4 0 8-3.5 8-8 0-1.9-.7-3.7-1.9-5.2L553.5 515l130.1-155c1.2-1.4 1.8-3.3 1.8-5.2z"></path>
-					<path
-						d="M512 65C264.6 65 64 265.6 64 513s200.6 448 448 448 448-200.6 448-448S759.4 65 512 65zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path>
-				</template>
-			</svg>
-			<div class="sh-notification-content">
-				<div class="sh-notification-title">
-					<u v-html="title"></u>
-					<a class="sh-notification-close" @click="close()">&times;</a>
-				</div>
-				<div v-if="content" class="sh-notification-description" v-html="content"></div>
-			</div>
-		</div>
-	</transition>
-</template>
-
-<script>
-export default {
-	name: 'ShNotification',
-	props: {
-		nid: String,
-		type: String,
-		duration: {
-			type: Number,
-			default: 3000
-		},
-		placement: {
-			type: String,
-			default: 'right-top' // left-top,right-top,left-bottom,right-bottom
-		},
-		title: String,
-		content: String,
-		className: String,
-		beforeClose: Function,
-		onClose: Function
-	},
-	data() {
-		return {
-			colorStyle: {
-				info: '#1890FF',
-				success: '#25ad4a',
-				error: '#ff3552',
-				warning: '#faad14'
-			},
-			visible: false,
-			vmOffset: 0,
-			timer: null
-		}
-	},
-	computed: {
-		transtionName() {
-			return 'notice-fade-' + this.placement.split('-')[0]
-		},
-		classes() {
-			return {
-				right: this.placement.startsWith('right'),
-				left: this.placement.startsWith('left'),
-				simple: !this.content
-			}
-		},
-		styles() {
-			let result = {}
-			const Y = this.placement.split('-')[1]
-			if (Y) result[Y] = this.vmOffset
-			return result
-		}
-	},
-	mounted() {
-		this.createTimer()
-	},
-	unmounted() {
-		this.clearTimer()
-	},
-	methods: {
-		createTimer() {
-			if (this.duration) {
-				this.timer = setTimeout(() => {
-					this.close()
-				}, this.duration)
-			}
-		},
-		clearTimer() {
-			if (this.timer) {
-				clearTimeout(this.timer)
-			}
-		},
-		show(top) {
-			this.visible = true
-			this.vmOffset = top
-		},
-		close() {
-			if (this.visible && this.onClose) {
-				this.beforeClose && this.beforeClose(this)
-				this.onClose(this.nid, this)
-				this.visible = false
-			}
-		}
-	}
-}
-</script>
-
-<style scoped lang="scss">
-.sh-notification {
-	border-radius: 5px;
-	color: #333;
-	display: inline-flex;
-	align-items: flex-start;
-	padding: 15px;
-	margin-bottom: 10px;
-	width: 400px;
-	max-width: 90%;
-	position: fixed;
-	z-index: 3000;
-	box-shadow: 0 0 8px rgba(0, 0, 0, 0.12);
-	background: #fff;
-	overflow: hidden;
-	vertical-align: top;
-	right: 15px;
-	transition: opacity 0.2s, transform 0.2s, left 0.2s, right 0.2s, top 0.3s, bottom 0.2s;
-	&.right {
-		right: 15px;
-		left: auto;
-	}
-	&.left {
-		left: 15px;
-		right: auto;
-	}
-	&.simple {
-		.sh-notification-icon {
-			width: 22px;
-		}
-	}
-	&-icon {
-		line-height: 1;
-		display: inline-block;
-		width: 33px;
-		margin: 2px 15px 0 5px;
-	}
-	&-content {
-		flex: 1;
-		.sh-notification-title {
-			width: 100%;
-			display: flex;
-			align-items: center;
-			font-size: 18px;
-			line-height: 24px;
-			& > u {
-				flex: 1;
-				display: block;
-				text-decoration: none;
-				font-weight: normal;
-
-				padding-right: 5px;
-			}
-			.sh-notification-close {
-				display: inline-block;
-				cursor: pointer;
-				padding: 0 5px;
-				color: inherit;
-				vertical-align: top;
-			}
-		}
-		.sh-notification-description {
-			display: block;
-			width: 100%;
-			margin-top: 8px;
-			color: #666;
-		}
-	}
-}
-.notice-fade-left,
-.notice-fade-right {
-	&-enter-active,
-	&-leave-active {
-		transition: transform 150ms ease-in-out;
-	}
-}
-.notice-fade-left {
-	&-enter-from,
-	&-leave-to {
-		transform: translateX(-100%);
-	}
-}
-.notice-fade-right {
-	&-enter-from,
-	&-leave-to {
-		transform: translateX(100%);
-	}
-}
-</style>