sh-view 2.6.3 → 2.6.5

package/README.md

@@ -1,39 +1,85 @@
 # sh-view
 
 #### 介绍
-{**以下是 Gitee 平台说明，您可以替换此简介**
-Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
+1. 基于vxe-table扩展，功能更强大，配置更便捷，内置18种渲染器，灵活配置，足以满足您的业务需求！
+2. 完全兼容vxe-table原有组件及功能，完全可以自主扩展更多的自定义组件
 
-#### 软件架构
-软件架构说明
+#### 组件
+自封装组件，不依赖其他ui框架
+1. 默认全局安装：
+ShAlert,
+ShBadge,
+ShCard,
+ShCodeEditor,
+ShCol,
+ShCorner,
+ShCountTo,
+ShDrawer,
+ShEmpty,
+ShForm,
+ShHeader,
+ShIcon,
+ShImage,
+ShList,
+ShLoading,
+ShModal,
+ShNoticebar,
+ShPoptip,
+ShProgress,
+ShPullRefresh,
+ShQuery,
+ShResult,
+ShRow,
+ShSplit,
+ShGrid,
+ShTable,
+ShTabs,
+ShTag,
+ShToolbar,
+ShTree,
+ShUpload,
+ShWaterFall,
+ShWaterMark
 
+2. 手动安装（业务）：
+ShCronModal(cron表达式),
+ShMarkdown(富文本编辑),
+ShMenu(菜单、支持竖向、横向、收起)
 
 #### 安装教程
+版本：[vue](https://www.npmjs.com/package/vue) 3.x
+```shell
+npm install sh-tools sh-view@next
+```
+```javascript
+import { createApp } from 'vue'
+import ShView from 'sh-view'
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+createApp(App).use(ShView).mount('#app')
+```
 
 #### 使用说明
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+1.  暂无文档，请参考示例或者组件api
+2.  作者QQ：577754811
 
-#### 参与贡献
 
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
+#### 功能计划
+* [x] v2.6.4 基于 vxe4.+，包含vxe-table所有功能，扩展更强渲染器
+* [ ] 下一阶段：独立vxe的日历组件，独立范围选择日期渲染器；低代码配置；基础sh-view的admin系统开源（包含低代码设计模板，及系统鉴权、路由守卫等）
 
 
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+#### 项目预览
+<img alt="img.png" src="examples/assets/img/img.png" width="100%"/>
+<img alt="img_1.png" src="examples/assets/img/img_1.png" width="49%"/>
+<img alt="img_2.png" src="examples/assets/img/img_2.png" width="49%"/>
+<img alt="img_3.png" src="examples/assets/img/img_3.png" width="49%"/>
+<img alt="img_4.png" src="examples/assets/img/img_4.png" width="49%"/>
+<img alt="img_5.png" src="examples/assets/img/img_5.png" width="49%"/>
+<img alt="img_6.png" src="examples/assets/img/img_6.png" width="49%"/>
+<img alt="img_7.png" src="examples/assets/img/img_7.png" width="49%"/>
+<img alt="img_8.png" src="examples/assets/img/img_8.png" width="49%"/>
+<img alt="img_9.png" src="examples/assets/img/img_9.png" width="49%"/>
+<img alt="img_10.png" src="examples/assets/img/img_10.png" width="49%"/>
+<img alt="img_11.png" src="examples/assets/img/img_11.png" width="49%"/>
+<img alt="img_12.png" src="examples/assets/img/img_12.png" width="49%"/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "description": "基于vxe-table二次封装",
   "main": "packages/index.js",
   "scripts": {

package/packages/components/global-components/sh-table/components/sh-column.vue

@@ -1,69 +1,68 @@
-<script>
-import { computed, defineComponent, getCurrentInstance, h, inject, ref, resolveComponent, renderSlot } from 'vue'
-import { turnColumnItemFilters } from '../js/tableMethods'
-export default defineComponent({
-	name: 'ShColumn',
-	props: {
-		column: {
-			type: Object
-		}
-	},
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const { $vUtils } = proxy
-		const shTable = inject('ShTableInstance')
-
-		const isGroup = computed(() => {
-			return proxy.hasChildren(props.column)
-		})
-		const columnConfig = computed(() => {
-			let renderObj = { name: props.column.renderName, props: props.column.renderProps }
-			let config = Object.assign({}, shTable.columnObjConfig, props.column)
-			if (props.column.readonly) {
-				config.cellRender = config.cellRender || renderObj
-			} else {
-				config.editRender = config.editRender || renderObj
-			}
-			if (config.renderName === '$vMoney' && props.column.renderProps.bill) {
-				config.filter = false
-				config.headerClassName += ' header-bill-cell'
-			}
-			if (config.filter === true || Number(config.filter) === 1) {
-				shTable.turnColumnItemFilters(config, renderObj.props)
-			}
-			return $vUtils.omit(config, ['renderName', 'renderProps', 'renderRequire', 'requireProps'])
-		})
-		const groupConfig = computed(() => {
-			return $vUtils.omit(columnConfig.value, ['children', 'cellRender', 'editRender'])
-		})
-		const renderVN = () => {
-			let columnSlots = {}
-			if (props.column.slots) {
-				Object.keys(props.column.slots).map(key => {
-					columnSlots[key] = shTable.slots[props.column.slots[key]]
-				})
-			}
-			if (isGroup.value) {
-				let childrenList = props.column.children.map(child => {
-					return h(resolveComponent('sh-column'), { column: child })
-				})
-				columnSlots.default = () => childrenList
-				return h(resolveComponent('vxe-colgroup'), { ...groupConfig.value }, columnSlots)
-			}
-			return h(resolveComponent('vxe-column'), { ...columnConfig.value }, columnSlots)
-		}
-
-		return {
-			isGroup,
-			columnConfig,
-			groupConfig,
-			renderVN
-		}
-	},
-	render() {
-		return this.renderVN()
-	}
-})
-</script>
-
-<style scoped lang="scss"></style>
+<script>
+import { computed, defineComponent, getCurrentInstance, h, inject, ref, resolveComponent, renderSlot } from 'vue'
+export default defineComponent({
+	name: 'ShColumn',
+	props: {
+		column: {
+			type: Object
+		}
+	},
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const { $vUtils } = proxy
+		const shTable = inject('ShTableInstance')
+
+		const isGroup = computed(() => {
+			return proxy.hasChildren(props.column)
+		})
+		const columnConfig = computed(() => {
+			let renderObj = { name: props.column.renderName, props: props.column.renderProps }
+			let config = Object.assign({}, shTable.columnObjConfig, props.column)
+			if (props.column.readonly) {
+				config.cellRender = config.cellRender || renderObj
+			} else {
+				config.editRender = config.editRender || renderObj
+			}
+			if (config.renderName === '$vMoney' && props.column.renderProps.bill) {
+				config.filter = false
+				config.headerClassName += ' header-bill-cell'
+			}
+			if (config.filter === true || Number(config.filter) === 1) {
+				shTable.turnColumnItemFilters(config, renderObj.props)
+			}
+			return $vUtils.omit(config, ['children', 'renderName', 'renderProps', 'renderRequire', 'requireProps'])
+		})
+		const groupConfig = computed(() => {
+			return $vUtils.omit(columnConfig.value, ['cellRender', 'editRender'])
+		})
+		const renderVN = () => {
+			let columnSlots = {}
+			if (props.column.slots) {
+				Object.keys(props.column.slots).map(key => {
+					columnSlots[key] = shTable.slots[props.column.slots[key]]
+				})
+			}
+			if (isGroup.value) {
+				let childrenList = props.column.children.map(child => {
+					return h(resolveComponent('sh-column'), { column: child })
+				})
+				columnSlots.default = () => childrenList
+				return h(resolveComponent('vxe-colgroup'), { ...groupConfig.value }, columnSlots)
+			}
+			return h(resolveComponent('vxe-column'), { ...columnConfig.value }, columnSlots)
+		}
+
+		return {
+			isGroup,
+			columnConfig,
+			groupConfig,
+			renderVN
+		}
+	},
+	render() {
+		return this.renderVN()
+	}
+})
+</script>
+
+<style scoped lang="scss"></style>

package/packages/components/global-components/sh-table/js/useTable.js

@@ -204,7 +204,7 @@ export default function (props, context, proxy, isGrid) {
 				let cellValue = $vUtils.get(row, property)
 				if (!$vUtils.isNone(cellValue)) {
 					let { rvalue, rtext } = $vUtils.formatRender(cellValue, property, row, rname, rprops, proxy)
-					$vUtils.set(row, property, visible || ['$vMoney'].includes(rname) ? rtext : rvalue)
+					$vUtils.set(row, property, visible ? rtext : rvalue)
 				}
 				if (deleteXid) delete row._XID
 			})
@@ -302,11 +302,17 @@ export default function (props, context, proxy, isGrid) {
 	// 只对 edit-config 配置时有效，单元格编辑状态下被关闭时会触发该事件
 	const onEditClosed = params => {
 		// 此操作火狐浏览器（bug(vxe):编辑后不触发渲染器的blur问题）
-		let { row, column } = params
-		let editModel = $vUtils.get(column, 'params.__RowEditModelValue')
-		if (editModel !== undefined) {
-			$vUtils.set(row, column.property, editModel)
-			delete column.params.__RowEditModelValue
+		const userAgent = navigator.userAgent
+		if (userAgent.indexOf('Firefox') !== -1) {
+			let { row, column } = params
+			let editModel = $vUtils.get(column, 'params.__RowEditModelValue')
+			if (editModel !== undefined) {
+				if (['$vMoney'].includes(column.rname) && !$vUtils.isNone(editModel)) editModel = $vUtils.multiply(editModel, column.rprops.moneyUnit || 1)
+				let { rvalue, rtext } = $vUtils.formatRender(editModel, column.property, row, column.rname, column.rprops, proxy, true)
+				editModel = rvalue
+				$vUtils.set(row, column.property, editModel)
+				delete column.params.__RowEditModelValue
+			}
 		}
 		emit('edit-closed', params)
 	}

package/packages/vxeTable/render/cell/vxe-render-table.vue

@@ -1,51 +1,51 @@
-<template>
-	<span class="vxe-render--inner" style="display: inline-grid; width: 100%">
-		<sh-table
-			ref="shTableRef"
-			:disabled="!redit && !isEditAll"
-			v-bind="rprops"
-			:size="rsize"
-			:data-sourse="renderValue"
-			@edit-closed="vxeInputCallback"
-			@toolbaroption="onToolbaroption"></sh-table>
-	</span>
-</template>
-
-<script>
-import { defineComponent, getCurrentInstance, ref } from 'vue'
-import cellProps from '../mixin/cell-props'
-import cellHooks from '../mixin/cell-hooks'
-export default defineComponent({
-	name: 'VxeRenderTable',
-	props: cellProps,
-	setup(props, context) {
-		const { proxy } = getCurrentInstance()
-		const useCell = cellHooks(props, context, proxy)
-		const shTableRef = ref()
-
-		const fullData = () => {
-			return shTableRef.value.getFullData()
-		}
-
-		// 输入框回调
-		const vxeInputCallback = ({ $table, row }) => {
-			driveBackData()
-		}
-		// 新增、删除行回调
-		const onToolbaroption = (code, data, $table) => {
-			driveBackData()
-		}
-		// 回填数据
-		const driveBackData = value => {
-			useCell.setRenderValue(fullData(), true)
-		}
-
-		return {
-			...useCell,
-			shTableRef,
-			vxeInputCallback,
-			onToolbaroption
-		}
-	}
-})
-</script>
+<template>
+	<span class="vxe-render--inner" style="display: inline-grid; width: 100%">
+		<sh-table
+			ref="shTableRef"
+			:disabled="!redit && !isEditAll"
+			v-bind="rprops"
+			:size="rsize"
+			:data-sourse="renderValue"
+			@edit-closed="vxeInputCallback"
+			@toolbaroption="onToolbaroption"></sh-table>
+	</span>
+</template>
+
+<script>
+import { defineComponent, getCurrentInstance, ref } from 'vue'
+import cellProps from '../mixin/cell-props'
+import cellHooks from '../mixin/cell-hooks'
+export default defineComponent({
+	name: 'VxeRenderTable',
+	props: cellProps,
+	setup(props, context) {
+		const { proxy } = getCurrentInstance()
+		const useCell = cellHooks(props, context, proxy)
+		const shTableRef = ref()
+
+		const fullData = () => {
+			return shTableRef.value.getFullData({ deleteXid: true })
+		}
+
+		// 输入框回调
+		const vxeInputCallback = ({ $table, row }) => {
+			driveBackData()
+		}
+		// 新增、删除行回调
+		const onToolbaroption = (code, data, $table) => {
+			driveBackData()
+		}
+		// 回填数据
+		const driveBackData = value => {
+			useCell.setRenderValue(fullData(), true)
+		}
+
+		return {
+			...useCell,
+			shTableRef,
+			vxeInputCallback,
+			onToolbaroption
+		}
+	}
+})
+</script>

package/packages/vxeTable/render/mixin/cell-hooks.js

@@ -102,7 +102,10 @@ export default function (props, context, proxy) {
 	const setRenderValue = (value, isCall) => {
 		let cellValue = value || renderValue.value
 		if (!isCall) {
-			if (['$vMoney'].includes(props.rname) && !$vUtils.isNone(cellValue)) cellValue = $vUtils.multiply(cellValue, props.rprops.moneyUnit || 1)
+			if (['$vMoney'].includes(props.rname) && !$vUtils.isNone(cellValue)) {
+				if (props.rprops.commafy) cellValue = String(cellValue).replace(',', '')
+				cellValue = $vUtils.multiply(cellValue, props.rprops.moneyUnit || 1)
+			}
 			let { rvalue, rtext } = formatValueFun(cellValue, true)
 			cellValue = rvalue
 		}