sh-tools 2.1.4 → 2.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-tools",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "基于xe-ajax和xe-utils二次封装",
   "main": "packages/index.js",
   "scripts": {

package/packages/utils/other.js

@@ -170,6 +170,8 @@ export default {
 		}
 		// 对于多选获取数组类型值进行解析 赋值
 		let oriArray = []
+		//  是否需要对原值进行重写 默认为false
+		let resetValue = false
 		// 进行默认赋值 若没有任何解析原数返回
 		rvalue = value
 		// 首先提取公式进行公式计算
@@ -178,7 +180,7 @@ export default {
 		switch (rname) {
 			case '$vInput':
 			case '$vMoney':
-				if (editable && (type === '$vMoney' || ['integer', 'number', 'float'].includes(type)) && !$vUtils.isNone(value)) {
+				if (editable && (rname === '$vMoney' || ['integer', 'number', 'float'].includes(type)) && !$vUtils.isNone(value)) {
 					if ($vUtils.isNumber(+max) && +value > +max) {
 						value = +max
 					} else if ($vUtils.isNumber(+min) && +value < +min) {
@@ -191,14 +193,18 @@ export default {
 					rvalue = $vUtils.truncate(value, digits)
 				}
 				if ($vUtils.isString(rvalue)) rvalue = $vUtils.replaceNutrim(rvalue)
-				if (type === '$vMoney' && !$vUtils.isNone(rvalue)) {
+				if (rname === '$vMoney' && !$vUtils.isNone(rvalue)) {
 					rtext = $vUtils.truncate($vUtils.divide(rvalue, moneyUnit), digits)
 				}
 				if (commafy && !bill && bill !== '0') rtext = $vUtils.commafy(rtext, { digits })
 				break
 			case '$vTime':
 				format = format ? format.replace('YYYY', 'yyyy').replace('DD', 'dd').replace('hh', 'HH') : defaultDateFormat[type]
-				if (!$vUtils.isNone(value) && format) rvalue = $vUtils.toDateString(value, format)
+				if ($vUtils.isNumber(value)) value = String(value)
+				if (!$vUtils.isNone(value) && format) {
+					rvalue = $vUtils.toDateString(value, format)
+					resetValue = true
+				}
 				break
 			case '$vSelect':
 			case '$vCheckgroup':
@@ -230,8 +236,10 @@ export default {
 					}
 					rvalue = oriArray
 				} else {
-					let valueOption = options.find(option => $vUtils.isEqual(option[optionValue], value))
-					rtext = valueOption ? valueOption[optionLabel] : ''
+					if (options && options.length) {
+						let valueOption = options.find(option => $vUtils.isEqual(option[optionValue], value))
+						rtext = valueOption ? valueOption[optionLabel] : ''
+					}
 					rvalue = rname === '$vTree' ? (value ? [value] : []) : value
 				}
 				if (format) {
@@ -251,7 +259,7 @@ export default {
 				break
 		}
 		if ($vUtils.isString(rvalue)) rvalue = $vUtils.replaceNutrim(rvalue)
-		if (formula) {
+		if (formula || resetValue) {
 			$vUtils.set(rowData, key, rvalue)
 		}
 		rtext = rtext || rvalue

package/packages/utils/string.js

@@ -1,227 +1,54 @@
-import XEUtils from 'xe-utils'
-
-// 数据格式化获取keys
-function getFormatKeys(format) {
-	let regR = new RegExp('({[a-zA-Z0-9_.]*})', 'ig')
-	let formatStr = String(format)
-	return (formatStr.match(regR) || []).map((key, keyIndex) => {
-		return key.replace(/{|}/gi, '')
-	})
-}
-
-// 格式化数据结构
-function format(format, data) {
-	let keys = getFormatKeys(format)
-	let formatStr = String(format)
-	keys.map((key, indexkey) => {
-		let value = XEUtils.get(data, key) || ''
-		formatStr = formatStr.replace(new RegExp('{' + key + '}', 'ig'), value)
-	})
-	return formatStr
-}
-
-// 生成随机字符串
-function randomStr(len = 32) {
-	const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'
-	const maxPos = $chars.length
-	let str = ''
-	for (let i = 0; i < len; i++) {
-		str += $chars.charAt(Math.floor(Math.random() * maxPos))
-	}
-	return str
-}
-
-export default {
-	randomStr,
-	getFormatKeys,
-	format,
-	replaceNutrim(str) {
-		return String(str).replace(/null|undefined|(^\s*)|(\s*$)/gi, '')
-	},
-	replaceAll(str, from, to) {
-		// 替换全部 将str中的所有from替换为to
-		return str.replace(new RegExp(from, 'gm'), to)
-	},
-	filterTag(str) {
-		/* 过滤html代码(把<>转换字符串) */
-		let me = this
-		str = me.replaceAll(str, /&/gi, '&amp;')
-		str = me.replaceAll(str, /</gi, '&lt;')
-		str = me.replaceAll(str, />/gi, '&gt;')
-		str = me.replaceAll(str, ' ', '&nbsp;')
-		return str
-	},
-	setWaterMark(text, settings) {
-		// 生成水印 推荐 canvas
-		class WaterMark {
-			constructor(text, settings) {
-				this.settings = Object.assign(
-					{
-						container: document.body,
-						id: 'waterMark',
-						showType: 'canvas', // div 还是 canvas
-						x: 0, // 水印起始位置x轴坐标
-						y: 100, // 水印起始位置Y轴坐标
-						xSpace: 150, // 水印x轴间隔
-						ySpace: 100, // 水印y轴间隔
-						color: '#cfcccc', // 水印字体颜色
-						alpha: 0.5, // 水印透明度
-						fontsize: '15px', // 水印字体大小
-						angle: 20, // 水印倾斜度数
-						curTime: false // 是否自动拼接当前时间
-					},
-					settings || {}
-				)
-				this.globalWidth = this.settings.container.clientWidth
-				this.globalHeight = this.settings.container.clientHeight
-				this.initCanvas()
-				this.draw(text)
-				this.insertWaterMark()
-			}
-			initCanvas() {
-				this.renderCanvas = document.createElement('canvas')
-				this.renderContext = this.renderCanvas.getContext('2d')
-				this.renderCanvas.width = this.globalWidth
-				this.renderCanvas.height = this.globalHeight
-				this.div = document.createElement('div')
-				this.oldData = this.renderContext.getImageData(0, 0, this.globalWidth, this.globalHeight)
-			}
-			insertWaterMark() {
-				const { type, id, alpha, container } = this.settings
-				this.WaterMarkEl = this.renderCanvas
-				if (type === 'div') {
-					this.WaterMarkEl = this.div
-					this.WaterMarkEl.style.backgroundImage = 'url(' + this.renderCanvas.toDataURL('image/png') + ')'
-				}
-				const style = this.WaterMarkEl.style
-				style.position = 'absolute'
-				style.opacity = alpha
-				style.top = style.left = 0
-				style.zIndex = '9999'
-				style.width = this.globalWidth + 'px'
-				style.height = this.globalHeight + 'px'
-				style.pointerEvents = 'none'
-				this.WaterMarkEl.id = id
-				container.append(this.WaterMarkEl)
-			}
-			draw(waterMarkText, settings) {
-				this.settings = Object.assign(this.settings, settings || {})
-				let { x, y, xSpace, ySpace, color, fontsize, angle, curTime } = this.settings
-				let { globalWidth, globalHeight, renderContext } = this
-				let timeStr = ''
-				if (curTime) {
-					let today = new Date()
-					timeStr =
-						today.getFullYear() +
-						'-' +
-						String(today.getMonth() + 1).padStart(2, 0) +
-						'-' +
-						String(today.getDate()).padStart(2, 0) +
-						' ' +
-						String(today.getHours()).padStart(2, 0) +
-						':' +
-						String(today.getMinutes()).padStart(2, 0) +
-						':' +
-						String(today.getSeconds()).padStart(2, 0)
-				}
-				waterMarkText = waterMarkText ? waterMarkText + ' ' + timeStr : timeStr
-				renderContext.clearRect(0, 0, globalWidth, globalHeight)
-				renderContext.font = fontsize + ' microsoft yahei'
-				renderContext.fillStyle = color
-				renderContext.textAlign = 'left'
-				renderContext.textBaseline = 'Middle'
-				let measureText = renderContext.measureText(waterMarkText)
-				let width = measureText.width
-				let height = Math.ceil(width / Math.tan(angle) + 50)
-				for (let xx = x; xx < globalWidth; xx += xSpace + width) {
-					for (let yy = y; yy < globalHeight; yy += ySpace + height) {
-						// 填充文字，x 间距, y 间距
-						renderContext.save()
-						renderContext.translate(xx, yy)
-						renderContext.rotate(0 - (angle * Math.PI) / 180)
-						renderContext.fillText(waterMarkText, 0, 0)
-						renderContext.restore()
-					}
-				}
-			}
-			// 图片的像素信息里存储着 RGB 的色值，R、G、B 分别为该像素的红、绿、蓝通道，每个通道的分量值范围在 0~255，16 进制则是 00~FF。在 CSS 中经常使用其 16 进制形式，比如指定博客头部背景色为 #A9D5F4。其中 R（红色）的 16 进制值为 A9，换算成十进制为 169。这时候，对 R 分量的值 + 1，即为 170，整个像素 RGB 值为 #AAD5F4，别说你看不出差别，就连火眼金金的“ 像素眼” 设计师都察觉不出来呢。于此同时，修改 G、B 的分量值，也是我们无法察觉的。因此可以得出重要结论：RGB 分量值的小量变动，是肉眼无法分辨的，不影响对图片的识别。
-			// 有了这个结论，那就给我们了利用空间，常用手段的就是对二进制最低位进行操作，下面就用 canvas 来演示一下。
-			inVisible(ctx, newData, originalData, color = 'R') {
-				var oData = originalData.data
-				var bit, offset // offset的作用是找到alpha通道值，这里需要大家自己动动脑筋
-				switch (color) {
-					case 'R':
-						bit = 0
-						offset = 3
-						break
-					case 'G':
-						bit = 1
-						offset = 2
-						break
-					case 'B':
-						bit = 2
-						offset = 1
-						break
-				}
-				for (var i = 0; i < oData.length; i++) {
-					if (i % 4 === bit) {
-						// 只处理目标通道
-						if (newData[i + offset] === 0 && oData[i] % 2 === 1) {
-							// 没有信息的像素，该通道最低位置0，但不要越界
-							if (oData[i] === 255) {
-								oData[i]--
-							} else {
-								oData[i]++
-							}
-						} else if (newData[i + offset] !== 0 && oData[i] % 2 === 0) {
-							// // 有信息的像素，该通道最低位置1，可以想想上面的斑点效果是怎么实现的
-							oData[i]++
-						}
-					}
-				}
-				ctx.putImageData(originalData, 0, 0)
-			}
-			visible(ctx, originalData, color = 'R') {
-				var bit, offset // offset的作用是找到alpha通道值，这里需要大家自己动动脑筋
-				switch (color) {
-					case 'R':
-						bit = 0
-						offset = 3
-						break
-					case 'G':
-						bit = 1
-						offset = 2
-						break
-					case 'B':
-						bit = 2
-						offset = 1
-						break
-				}
-				var data = originalData.data
-				for (var i = 0; i < data.length; i++) {
-					if (i % 4 === bit) {
-						// 只处理目标通道
-						if (data[i] % 2 === 0) {
-							// 没有信息的像素，该通道最低位置0，但不要越界
-							if (data[i] % 2 === 0) {
-								data[i] = 0
-							} else if (i % 4 === 3) {
-								// alpha通道不做处理
-								continue
-							} else {
-								// 关闭其他分量，不关闭也不影响答案
-								data[i] = 0
-							}
-						}
-					}
-					ctx.putImageData(originalData, 0, 0)
-				}
-			}
-		}
-		return new WaterMark(text, settings)
-	},
-	removeWaterMark(container, id) {
-		const body = container || document.body
-		body.removeChild(document.getElementById(id || 'waterMark'))
-	}
-}
+import XEUtils from 'xe-utils'
+
+// 数据格式化获取keys
+function getFormatKeys(format) {
+	let regR = new RegExp('({[a-zA-Z0-9_.]*})', 'ig')
+	let formatStr = String(format)
+	return (formatStr.match(regR) || []).map((key, keyIndex) => {
+		return key.replace(/{|}/gi, '')
+	})
+}
+
+// 格式化数据结构
+function format(format, data) {
+	let keys = getFormatKeys(format)
+	let formatStr = String(format)
+	keys.map((key, indexkey) => {
+		let value = XEUtils.get(data, key) || ''
+		formatStr = formatStr.replace(new RegExp('{' + key + '}', 'ig'), value)
+	})
+	return formatStr
+}
+
+// 生成随机字符串
+function randomStr(len = 32) {
+	const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'
+	const maxPos = $chars.length
+	let str = ''
+	for (let i = 0; i < len; i++) {
+		str += $chars.charAt(Math.floor(Math.random() * maxPos))
+	}
+	return str
+}
+
+export default {
+	randomStr,
+	getFormatKeys,
+	format,
+	replaceNutrim(str) {
+		return String(str).replace(/null|undefined|(^\s*)|(\s*$)/gi, '')
+	},
+	replaceAll(str, from, to) {
+		// 替换全部 将str中的所有from替换为to
+		return str.replace(new RegExp(from, 'gm'), to)
+	},
+	filterTag(str) {
+		/* 过滤html代码(把<>转换字符串) */
+		let me = this
+		str = me.replaceAll(str, /&/gi, '&amp;')
+		str = me.replaceAll(str, /</gi, '&lt;')
+		str = me.replaceAll(str, />/gi, '&gt;')
+		str = me.replaceAll(str, ' ', '&nbsp;')
+		return str
+	}
+}