xs-common-plugins 1.4.12 → 1.4.13

package/.idea/workspace.xml

@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="18da8823-8844-430e-8765-342a5b83382e" name="更改" comment="feat(common): 添加弹窗ESC关闭功能并优化OSS服务&#10;&#10;- 在popup函数中新增closeOnPressEscape参数，默认值为false&#10;- 将closeOnPressEscape参数传递给对话框配置&#10;- 优化OSS服务中的getOssToken函数，防止重复请求&#10;- 添加getIng变量控制请求状态&#10;- 在请求完成后重置getIng状态&#10;- 更新版本号从1.4.10到1.4.11">
+    <list default="true" id="18da8823-8844-430e-8765-342a5b83382e" name="更改" comment="chore(common): 移除对话框点击遮罩关闭功能并更新包信息&#10;&#10;- 移除了 el-dialog 的 close-on-click-modal 属性配置&#10;- 将包版本从 1.4.11 更新到 1.4.12&#10;- 清空了作者信息字段">
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/common/common.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/common.js" afterDir="false" />
     </list>
@@ -43,7 +43,7 @@
     "node.js.selected.package.tslint": "(autodetect)",
     "nodejs_interpreter_path": "node",
     "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "settings.nodejs",
+    "settings.editor.selected.configurable": "editor.preferences.fonts.default",
     "to.speed.mode.migration.done": "true",
     "ts.external.directory.path": "/Applications/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external",
     "vue.rearranger.settings.migration": "true"
@@ -71,7 +71,8 @@
       <workItem from="1766654268352" duration="129000" />
       <workItem from="1768291265910" duration="1000" />
       <workItem from="1772155854565" duration="1270000" />
-      <workItem from="1772171331103" duration="161000" />
+      <workItem from="1772171331103" duration="200000" />
+      <workItem from="1772172034321" duration="488000" />
     </task>
     <task id="LOCAL-00001" summary="fix(table): 更新单元格分析逻辑以正确处理括号- 替换正则表达式检测为 includes 方法检测括号和 null&#10;- 确保只在包含成对括号且不含 null 时才匹配&#10;&#10;chore: 升级版本号至 1.4.9">
       <option name="closed" value="true" />
@@ -97,7 +98,15 @@
       <option name="project" value="LOCAL" />
       <updated>1772155919495</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="chore(common): 移除对话框点击遮罩关闭功能并更新包信息&#10;&#10;- 移除了 el-dialog 的 close-on-click-modal 属性配置&#10;- 将包版本从 1.4.11 更新到 1.4.12&#10;- 清空了作者信息字段">
+      <option name="closed" value="true" />
+      <created>1772171500658</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1772171500658</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -119,6 +128,7 @@
     <MESSAGE value="fix(table): 更新单元格分析逻辑以正确处理括号- 替换正则表达式检测为 includes 方法检测括号和 null&#10;- 确保只在包含成对括号且不含 null 时才匹配&#10;&#10;chore: 升级版本号至 1.4.9" />
     <MESSAGE value="feat(common): 添加弹窗ESC关闭功能并优化OSS服务&#10;&#10;- 在popup函数中新增closeOnPressEscape参数，默认值为false&#10;- 将closeOnPressEscape参数传递给对话框配置&#10;- 优化OSS服务中的getOssToken函数，防止重复请求&#10;- 添加getIng变量控制请求状态&#10;-" />
     <MESSAGE value="feat(common): 添加弹窗ESC关闭功能并优化OSS服务&#10;&#10;- 在popup函数中新增closeOnPressEscape参数，默认值为false&#10;- 将closeOnPressEscape参数传递给对话框配置&#10;- 优化OSS服务中的getOssToken函数，防止重复请求&#10;- 添加getIng变量控制请求状态&#10;- 在请求完成后重置getIng状态&#10;- 更新版本号从1.4.10到1.4.11" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat(common): 添加弹窗ESC关闭功能并优化OSS服务&#10;&#10;- 在popup函数中新增closeOnPressEscape参数，默认值为false&#10;- 将closeOnPressEscape参数传递给对话框配置&#10;- 优化OSS服务中的getOssToken函数，防止重复请求&#10;- 添加getIng变量控制请求状态&#10;- 在请求完成后重置getIng状态&#10;- 更新版本号从1.4.10到1.4.11" />
+    <MESSAGE value="chore(common): 移除对话框点击遮罩关闭功能并更新包信息&#10;&#10;- 移除了 el-dialog 的 close-on-click-modal 属性配置&#10;- 将包版本从 1.4.11 更新到 1.4.12&#10;- 清空了作者信息字段" />
+    <option name="LAST_COMMIT_MESSAGE" value="chore(common): 移除对话框点击遮罩关闭功能并更新包信息&#10;&#10;- 移除了 el-dialog 的 close-on-click-modal 属性配置&#10;- 将包版本从 1.4.11 更新到 1.4.12&#10;- 清空了作者信息字段" />
   </component>
 </project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xs-common-plugins",
-  "version": "1.4.12",
+  "version": "1.4.13",
   "description": "向上公共代码部分",
   "author": "",
   "main": "index.js",

package/src/common/common.js

@@ -1,10 +1,9 @@
 import Vue from 'vue'
 import ask from '@/automatically/api'
-import router from '@/router/index'
 import store from '@/store/index'
-import {OrgEnum} from '@/utils/enum'
+import { OrgEnum } from '@/utils/enum'
 import filterRules from '@/utils/filterRules'
-import request from "xs-request";
+import request from 'xs-request'
 import moduleCfg from '@/modules/module.config.js'
 
 
@@ -18,42 +17,42 @@ const common = {}
  * @param {Function} callBack  返回函数， 页面在接口返回后自行处理
  */
 common.getList = (that, url, query, callBack) => {
-    let newQuery = {}
-    if (query) newQuery = query
-    else {
-        let obj = Object.assign({}, that.data)
-        if (obj.pageInfo === undefined) {
-            that.$set(obj, 'pageInfo', {page: 1, pageSize: 30})
-        } // 移除空项查询条件
-        for (const key in obj) {
-            if(obj[key] == null || obj[key] === '')
-            delete obj[key]
-        }
-        delete obj.data
-        newQuery = obj
-    }
-    let request = common.getObject(url)
-    request(query ? query : newQuery).then((res)=>{
-        if(callBack) {
-            callBack(res);
-            return;
-        }
-        if(res.code == 0) {
-            that.data = res.data
-        }
-    })
+	let newQuery = {}
+	if (query) newQuery = query
+	else {
+		let obj = Object.assign({}, that.data)
+		if (obj.pageInfo === undefined) {
+			that.$set(obj, 'pageInfo', { page: 1, pageSize: 30 })
+		} // 移除空项查询条件
+		for (const key in obj) {
+			if (obj[key] == null || obj[key] === '')
+				delete obj[key]
+		}
+		delete obj.data
+		newQuery = obj
+	}
+	let request = common.getObject(url)
+	request(query ? query : newQuery).then((res) => {
+		if (callBack) {
+			callBack(res)
+			return
+		}
+		if (res.code == 0) {
+			that.data = res.data
+		}
+	})
 }
 
 /**
  *根据请求URL解析对象
  **/
 common.getObject = (url, obj = ask) => {
-    let value = obj
-    let keys = url.split('.')
-    for (let i = 1; i < keys.length; i++) {
-        value = value[keys[i]]
-    }
-    return value
+	let value = obj
+	let keys = url.split('.')
+	for (let i = 1; i < keys.length; i++) {
+		value = value[keys[i]]
+	}
+	return value
 }
 
 /**
@@ -69,19 +68,19 @@ common.getObject = (url, obj = ask) => {
 
  */
 common.saveData = (that, url, query, ref, callBack) => {
-    let newQuery = query ? query : JSON.parse(JSON.stringify(that.postForm)); // 深拷贝， 避免影响页面显示
-    if(ref === false) {
-        common.handleData(that, url, newQuery, callBack)
-    } else {
-        let newRef = ref ? ref : that.$refs.pageDetail.$refs.postForm
-        newRef.validate(res => {
-            if(!res) return
-            if (that.beforeSaveData) {
-                newQuery = that['beforeSaveData'](newQuery);
-            }
-            common.handleData(that, url, newQuery, callBack)
-        })
-    }
+	let newQuery = query ? query : JSON.parse(JSON.stringify(that.postForm)) // 深拷贝， 避免影响页面显示
+	if (ref === false) {
+		common.handleData(that, url, newQuery, callBack)
+	} else {
+		let newRef = ref ? ref : that.$refs.pageDetail.$refs.postForm
+		newRef.validate(res => {
+			if (!res) return
+			if (that.beforeSaveData) {
+				newQuery = that['beforeSaveData'](newQuery)
+			}
+			common.handleData(that, url, newQuery, callBack)
+		})
+	}
 }
 /**
  * 保存数据 一般作为 common.saveData 的内嵌方法使用， 不推荐单独使用 （表单提交，原则上要经过表单校验）
@@ -91,19 +90,19 @@ common.saveData = (that, url, query, ref, callBack) => {
  * @param {*} callBack 接口返回后， 页面要进行后续操作
  */
 
-common.handleData  = (that, url, query, callBack)=> {
-    let newQuery = query ? query : that.postForm;
-    if (that.loading !== undefined) that.loading = true;
-    let request = common.getObject(url)
-    request(newQuery ? newQuery : undefined).then((res) => {
-        if (that.loading !== undefined) that.loading = false;
-        if (res.code == 0) {
-            that.$message('保存成功');
-            if(!callBack) that.$emit('close')
-        }
-        if (callBack) callBack(res.data)
-    }).finally(()=>{
-		if(callBack) callBack(null)
+common.handleData = (that, url, query, callBack) => {
+	let newQuery = query ? query : that.postForm
+	if (that.loading !== undefined) that.loading = true
+	let request = common.getObject(url)
+	request(newQuery ? newQuery : undefined).then((res) => {
+		if (that.loading !== undefined) that.loading = false
+		if (res.code == 0) {
+			that.$message('保存成功')
+			if (!callBack) that.$emit('close')
+		}
+		if (callBack) callBack(res.data)
+	}).finally(() => {
+		if (callBack) callBack(null)
 	})
 
 }
@@ -117,13 +116,14 @@ common.handleData  = (that, url, query, callBack)=> {
  * @param {Function} callBack  返回函数， 页面在接口返回后要进行其他处理
  */
 common.getById = (that, url, query, callBack) => {
-    let request = common.getObject(url)
-    request(query).then((res)=>{
-        if (res.code == 0) {
-            if (callBack) { callBack(res.data) }
-            else that.postForm = res.data
-        }
-    })
+	let request = common.getObject(url)
+	request(query).then((res) => {
+		if (res.code == 0) {
+			if (callBack) {
+				callBack(res.data)
+			} else that.postForm = res.data
+		}
+	})
 }
 
 /**
@@ -134,14 +134,16 @@ common.getById = (that, url, query, callBack) => {
  * @param {Function} callBack  返回函数， 页面在接口返回后要进行其他处理
  */
 common.updateById = (that, url, query, callBack) => {
-    let newQuery = query ? query : that.postForm;
-    let request = common.getObject(url)
-    request(newQuery).then((res)=>{
-        if (res.code == 0) {
-            that.$message('操作成功');
-            if (callBack) { callBack(res.data) }
-        }
-    })
+	let newQuery = query ? query : that.postForm
+	let request = common.getObject(url)
+	request(newQuery).then((res) => {
+		if (res.code == 0) {
+			that.$message('操作成功')
+			if (callBack) {
+				callBack(res.data)
+			}
+		}
+	})
 }
 /**
  * 判断多条数据  返回 true/false 或者 重新拼接好的 ids []
@@ -158,21 +160,21 @@ common.updateById = (that, url, query, callBack) => {
  *      this.$common.updateData(that, 'ask.xxx.xxx', {保存对象})
  * }
  */
- common.checkRows = async (that, row, title, prop = "id", check = true) => {
-    if(row.length == 0) {
-        common.message(that, `请选择数据`, 'error');
-        return false;
-    }
-    if(check) {
-        try {
-            await common.confirm(that, `您确定进行${title}操作`, '操作提醒')
-            return prop ? row.map(item => item[prop]) : row
-        } catch (error) {
-            return false
-        }
-    } else {
-        return true
-    }
+common.checkRows = async (that, row, title, prop = 'id', check = true) => {
+	if (row.length == 0) {
+		common.message(that, `请选择数据`, 'error')
+		return false
+	}
+	if (check) {
+		try {
+			await common.confirm(that, `您确定进行${title}操作`, '操作提醒')
+			return prop ? row.map(item => item[prop]) : row
+		} catch (error) {
+			return false
+		}
+	} else {
+		return true
+	}
 }
 
 /**
@@ -183,13 +185,13 @@ common.updateById = (that, url, query, callBack) => {
  * @param {Function} callBack 接口响应成功后， 界面上自行处理返回事件， 不传， 默认执行页面 getList 方法 (刷新列表页)
  */
 common.updateData = (that, url, query, callBack) => {
-    let request = common.getObject(url)
-    request(Object.assign({}, query)).then(res => {
-        if(res.code !== 0) return
-        common.message(that, res.message)
-        if(callBack) callBack(res)
-        else that.getList && that.getList()
-    })
+	let request = common.getObject(url)
+	request(Object.assign({}, query)).then(res => {
+		if (res.code !== 0) return
+		common.message(that, res.message)
+		if (callBack) callBack(res)
+		else that.getList && that.getList()
+	})
 }
 
 
@@ -200,10 +202,10 @@ common.updateData = (that, url, query, callBack) => {
  * @param {String} type  类型 可选值：查看element ui 文档，  默认 success
  */
 common.message = (that, message, type) => {
-    that.$message({
-        message: message,
-        type: type ? type : 'success'
-    });
+	that.$message({
+		message: message,
+		type: type ? type : 'success'
+	})
 }
 
 /**
@@ -214,21 +216,21 @@ common.message = (that, message, type) => {
  * @param {Function} callBack 返回函数， 页面在接口返回后要进行其他处理
  */
 common.confirm = (that, message, title, callBack) => {
-    let result = that.$confirm(message, title ? title : "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "none"
-    })
-    if(callBack) {
-        result.then(() => {
-            callBack(true)
-        })
-        .catch(() => {
-            callBack(false)
-        });
-    } else {
-        return result
-    }
+	let result = that.$confirm(message, title ? title : '提示', {
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		type: 'none'
+	})
+	if (callBack) {
+		result.then(() => {
+			callBack(true)
+		})
+			.catch(() => {
+				callBack(false)
+			})
+	} else {
+		return result
+	}
 }
 
 
@@ -248,17 +250,27 @@ common.confirm = (that, message, title, callBack) => {
  *
  */
 common.popup = (options) => {
-	if (!options) return;
-	const { title, component, srcData, width, showButton, callBack, props, dialogCfg,closeOnPressEscape = false } = common.clone(options);
-	if (!component) return;
+	if (!options) return
+	const { title, component, srcData, width, showButton, callBack, props, dialogCfg = {} } = common.clone(options)
+	if (!component) return
+
+	// 	添加默认值
+	if (!Object.hasOwn(dialogCfg, 'close-on-click-modal')) {
+		dialogCfg['close-on-click-modal'] = false
+	}
+
+	// 	添加默认值
+	if (!Object.hasOwn(dialogCfg, 'close-on-press-escape')) {
+		dialogCfg['close-on-press-escape'] = true
+	}
 
-	const div = document.createElement("div");
-	document.body.appendChild(div);
+	const div = document.createElement('div')
+	document.body.appendChild(div)
 
 	const dialogComponent = {
-		computed:{
+		computed: {
 			loading() {
-				return this.$store.getters?.loading || false;
+				return this.$store.getters?.loading || false
 			}
 		},
 		components: {
@@ -267,68 +279,70 @@ common.popup = (options) => {
 		props: {
 			title: {
 				type: String,
-				default: '弹窗组件',
+				default: '弹窗组件'
 			},
 			srcData: {
 				type: Object,
-				default: null,
+				default: null
 			},
 			showButton: {
 				type: Boolean,
-				default: false,
+				default: false
 			},
 			width: {
 				type: String,
-				default: '30%',
+				default: '30%'
 			},
 			dialogCfg: {
 				type: Object,
-				default: null,
+				default: null
 			},
 			props: {
 				type: Object,
-				default: null,
+				default: null
 			},
 			callBack: {
 				type: Function,
-				default: null,
-			},
-			closeOnPressEscape:{
-				type: Boolean,
-				default: false,
+				default: null
 			}
 		},
 		data() {
 			return {
 				visible: true,
-			};
+			}
 		},
 		methods: {
 			confirm() {
 				if (this.$refs.child.confirm) {
-					this.$refs.child.confirm();
+					this.$refs.child.confirm()
 				}
 			},
 			beforeClose(done) {
 				if (this.$refs.child.beforeClose) {
-					this.$refs.child.beforeClose(done);
+					this.$refs.child.beforeClose(done)
 				} else {
-					done();
+					done()
 				}
+				setTimeout(() => {
+					div.remove()
+					Vue.nextTick(() => {
+						this.$destroy()
+					})
+				}, 300)
 			},
 			cancel() {
-				this.visible = false;
+				this.visible = false
 			},
 			close(res) {
 				if (this.callBack) {
-					this.callBack(res);
+					this.callBack(res)
 				}
-				this.visible = false;
+				this.visible = false
 			}
 		},
 		template: `
 			<div>
-			<el-dialog :title="title"  :close-on-press-escape="closeOnPressEscape"  v-el-drag-dialog :visible.sync="visible" :width="width" :before-close="beforeClose" v-bind="dialogCfg" append-to-body>
+			<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" v-loading="loading">确认</el-button>
@@ -336,8 +350,8 @@ common.popup = (options) => {
 				</div>
 			</el-dialog>
 			</div>
-		`,
-	};
+		`
+	}
 
 	return new Vue({
 		el: div,
@@ -351,14 +365,13 @@ common.popup = (options) => {
 					showButton,
 					callBack,
 					props,
-					dialogCfg,
-					closeOnPressEscape
+					dialogCfg
 				},
-			});
-		},
-	});
-}
 
+			})
+		}
+	})
+}
 
 
 /**
@@ -366,26 +379,25 @@ common.popup = (options) => {
  */
 common.clone = (obj) => {
 	if (obj === null || typeof obj !== 'object') {
-		return obj;
+		return obj
 	}
 
 	if (obj instanceof Date) {
-		return new Date(obj.getTime());
+		return new Date(obj.getTime())
 	}
 
-	const clone = Array.isArray(obj) ? [] : {};
+	const clone = Array.isArray(obj) ? [] : {}
 
 	for (const key in obj) {
 		if (Object.prototype.hasOwnProperty.call(obj, key)) {
-			clone[key] = common.clone(obj[key]);
+			clone[key] = common.clone(obj[key])
 		}
 	}
 
-	return clone;
+	return clone
 }
 
 
-
 /**
  *导出数据报表
  *@param query 默认 列表上的 query 条件去掉 data
@@ -393,24 +405,24 @@ common.clone = (obj) => {
  *@param {String} url 请求方法
  *@param {String} fileName 文件名
  */
- common.exportExcel = async (url, query, fileName = 'demo', headers = { responseType: 'arraybuffer' }) => {
-    let newQuery = JSON.parse(JSON.stringify(query))
-    delete newQuery.data
-    for (const key in newQuery) {
-        if(newQuery[key] == null || newQuery[key] === '')
-        delete newQuery[key]
-    }
-    const httpRequest = common.getObject(url)
-    const response = await httpRequest(newQuery, headers)
-    const blob = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' })
-    const objectUrl = URL.createObjectURL(blob)
-    const a = document.createElement('a')
-    document.body.appendChild(a)
-    a.style = 'display: none'
-    a.href = objectUrl
-    a.download = `${fileName}.xlsx`
-    a.click()
-    document.body.removeChild(a)
+common.exportExcel = async (url, query, fileName = 'demo', headers = { responseType: 'arraybuffer' }) => {
+	let newQuery = JSON.parse(JSON.stringify(query))
+	delete newQuery.data
+	for (const key in newQuery) {
+		if (newQuery[key] == null || newQuery[key] === '')
+			delete newQuery[key]
+	}
+	const httpRequest = common.getObject(url)
+	const response = await httpRequest(newQuery, headers)
+	const blob = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' })
+	const objectUrl = URL.createObjectURL(blob)
+	const a = document.createElement('a')
+	document.body.appendChild(a)
+	a.style = 'display: none'
+	a.href = objectUrl
+	a.download = `${fileName}.xlsx`
+	a.click()
+	document.body.removeChild(a)
 }
 
 /**
@@ -420,14 +432,14 @@ common.clone = (obj) => {
  * @param {String} name 完整的按钮名称
  *
  */
- common.getBtnListByEnum = (enumName, methodName, name = '') => {
-    let enums = OrgEnum[enumName];
-    let list = []
-    enums.filter(item => {
-        if(item.Id == null) return
-        list.push({name: name + item.Text, methodName, type: item.Id, row: item})
-    })
-   return list
+common.getBtnListByEnum = (enumName, methodName, name = '') => {
+	let enums = OrgEnum[enumName]
+	let list = []
+	enums.filter(item => {
+		if (item.Id == null) return
+		list.push({ name: name + item.Text, methodName, type: item.Id, row: item })
+	})
+	return list
 }
 
 /**
@@ -435,11 +447,11 @@ common.clone = (obj) => {
  *  @param {List} list 必填项字段名列表
  */
 common.requiredList = (list) => {
-    let obj = {}
-    list.forEach(key => {
-        obj[key] = filterRules({required: true})
-    });
-    return obj
+	let obj = {}
+	list.forEach(key => {
+		obj[key] = filterRules({ required: true })
+	})
+	return obj
 }
 
 /**
@@ -448,42 +460,42 @@ common.requiredList = (list) => {
  * @param {*} type  要格式化的类型 [date, price, price, money, enum, list(前端自定义枚举)]
  * @returns
  */
- common.format = (value, type="date") => {
-    let newType = ['money', 'date', 'mdate'].includes(type) ? type : type.split('.').length > 1 ? 'enum' : 'list'
-    switch (newType) {
-        case 'money':
-            return Number(value).toFixed(4);
-        case 'date':
-            if(value === '1970-01-01T00:00:00') return '/'
-            return value ? value.replace('T', ' ').substr(0, 19) : ''
-        case 'mdate':
-            if(value === '1970-01-01T00:00:00') return '/'
-            return value ? value.replace('T', ' ').substr(5, 19) : ''
-        case 'price':
-            if(typeof(value) === 'number') {
-                return value.toFixed(2).toString().replace(/,/g,'').replace(/\d+/, function (n) { // 先提取整数部分
-                    return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) { // 对整数部分添加分隔符
-                        return $1 + ",";
-                    });
-                });
-            }
-            else return ''
-        case 'enum':
-            return getValueByType('enum', type, value)
-        case 'list':
-            return getValueByType('list', type, value)
-        default:
-            break;
-    }
-    function getValueByType (type, name, value) {
-        if(type === 'enum') {
-            let row = OrgEnum[name].find(item => item.Id == value)
-            return row ? row.Text : ''
-        } else if(type === 'list') {
-            let row = moduleCfg.format ? moduleCfg.format[name].find(item => item.id == value) : null
-            return row ? row.name: ''
-        }
-    }
+common.format = (value, type = 'date') => {
+	let newType = ['money', 'date', 'mdate'].includes(type) ? type : type.split('.').length > 1 ? 'enum' : 'list'
+	switch (newType) {
+		case 'money':
+			return Number(value).toFixed(4)
+		case 'date':
+			if (value === '1970-01-01T00:00:00') return '/'
+			return value ? value.replace('T', ' ').substr(0, 19) : ''
+		case 'mdate':
+			if (value === '1970-01-01T00:00:00') return '/'
+			return value ? value.replace('T', ' ').substr(5, 19) : ''
+		case 'price':
+			if (typeof (value) === 'number') {
+				return value.toFixed(2).toString().replace(/,/g, '').replace(/\d+/, function(n) { // 先提取整数部分
+					return n.replace(/(\d)(?=(\d{3})+$)/g, function($1) { // 对整数部分添加分隔符
+						return $1 + ','
+					})
+				})
+			} else return ''
+		case 'enum':
+			return getValueByType('enum', type, value)
+		case 'list':
+			return getValueByType('list', type, value)
+		default:
+			break
+	}
+
+	function getValueByType(type, name, value) {
+		if (type === 'enum') {
+			let row = OrgEnum[name].find(item => item.Id == value)
+			return row ? row.Text : ''
+		} else if (type === 'list') {
+			let row = moduleCfg.format ? moduleCfg.format[name].find(item => item.id == value) : null
+			return row ? row.name : ''
+		}
+	}
 }
 
 /**
@@ -494,19 +506,19 @@ common.requiredList = (list) => {
  * @param {Function} callBack 自定义事件， 传此参数， 接口响应后， 后续事情自定义
  * @param {String} methodName  接口响应后， 调用界面哪个方法
  */
- common.getReportCfg = (that, url, query, callBack, methodName = 'getReportList') => {
-    let request = common.getObject(url)
-    request(query).then(res => {
-        if(callBack) {
-            callBack(res)
-        } else {
-            that.config.reportList = res.data
-            if(res.data[0]) {
-                that.reportCfgVal = JSON.parse(res.data[0].jsonCfg)
-                that[methodName]();
-            }
-        }
-    })
+common.getReportCfg = (that, url, query, callBack, methodName = 'getReportList') => {
+	let request = common.getObject(url)
+	request(query).then(res => {
+		if (callBack) {
+			callBack(res)
+		} else {
+			that.config.reportList = res.data
+			if (res.data[0]) {
+				that.reportCfgVal = JSON.parse(res.data[0].jsonCfg)
+				that[methodName]()
+			}
+		}
+	})
 }
 
 /**
@@ -517,23 +529,23 @@ common.requiredList = (list) => {
  * @param {*} callBack 接口响应后， 自定义事件
  */
 common.getReportList = (that, url, query, callBack) => {
-    let newQuery = {}
-    if(query) newQuery = query
-    else {
-       let obj = Object.assign({}, that.data)
-       delete obj.data
-       // 移除空项查询条件
-       for (const key in obj) {
-            if(obj[key] == null || obj[key] === '')
-            delete obj[key]
-        }
-       newQuery = Object.assign(obj, {report: that.reportCfgVal})
-    }
-    let request = common.getObject(url)
-    request(newQuery).then(res => {
-        if(callBack) callBack(res)
-        else that.data = res.data
-    })
+	let newQuery = {}
+	if (query) newQuery = query
+	else {
+		let obj = Object.assign({}, that.data)
+		delete obj.data
+		// 移除空项查询条件
+		for (const key in obj) {
+			if (obj[key] == null || obj[key] === '')
+				delete obj[key]
+		}
+		newQuery = Object.assign(obj, { report: that.reportCfgVal })
+	}
+	let request = common.getObject(url)
+	request(newQuery).then(res => {
+		if (callBack) callBack(res)
+		else that.data = res.data
+	})
 }
 
 
@@ -550,35 +562,38 @@ common.getReportList = (that, url, query, callBack) => {
  */
 
 common.dic = async (props, val) => {
-    let isArray = Array.isArray(val)
-    let server = props[0] || ''
-    let tableName = props[1] || ''
-    let prop = props[2] || 'name'
-    let key = server + tableName
-    if(store.getters.dic[key]) {
-        if(isArray) return await getDicVal()
-        let row =  store.getters.dic[key].find(item => item.id == val)
-        if(row && (row.isNull || row[prop] === null)) { return '' }
-        if(row) return row[prop]
-        if(!row) return await getDicVal()
-
-    } else {
-        return await getDicVal()
-    }
-    async function getDicVal () {
-        let servers = props[0] || "";
-        let tableName = props[1] || "";
-        let key = servers + tableName;
-        let url = servers + "/UserAll/Search/Dic/" + tableName;
-        let res = await request.post(url, isArray ? val : [val])
-        if (res.code !== 0) return;
-        store.commit("dic/SET_ASK", { key, val: res.data });
-        if(isArray) return res.data
-        else {
-            let row = res.data.find(item => item.id == val)
-            return row ? row[prop] : ''
-        }
-    }
+	let isArray = Array.isArray(val)
+	let server = props[0] || ''
+	let tableName = props[1] || ''
+	let prop = props[2] || 'name'
+	let key = server + tableName
+	if (store.getters.dic[key]) {
+		if (isArray) return await getDicVal()
+		let row = store.getters.dic[key].find(item => item.id == val)
+		if (row && (row.isNull || row[prop] === null)) {
+			return ''
+		}
+		if (row) return row[prop]
+		if (!row) return await getDicVal()
+
+	} else {
+		return await getDicVal()
+	}
+
+	async function getDicVal() {
+		let servers = props[0] || ''
+		let tableName = props[1] || ''
+		let key = servers + tableName
+		let url = servers + '/UserAll/Search/Dic/' + tableName
+		let res = await request.post(url, isArray ? val : [val])
+		if (res.code !== 0) return
+		store.commit('dic/SET_ASK', { key, val: res.data })
+		if (isArray) return res.data
+		else {
+			let row = res.data.find(item => item.id == val)
+			return row ? row[prop] : ''
+		}
+	}
 }
 /**
  * 快速给页面变量赋值
@@ -587,17 +602,17 @@ common.dic = async (props, val) => {
  * @param {*} prop  要为哪个字段名赋值
  */
 common.getLabelList = (that, prop, url, query) => {
-    common.getObject(url)(query).then(res => {
-        that[prop] = res.data
-    })
+	common.getObject(url)(query).then(res => {
+		that[prop] = res.data
+	})
 }
 
-common.checkRows2 = async (that, row, title, prop = "id", check = true) => {
-	if(row.length == 0) {
-		common.message(that, `请选择数据`, 'error');
-		return false;
+common.checkRows2 = async (that, row, title, prop = 'id', check = true) => {
+	if (row.length == 0) {
+		common.message(that, `请选择数据`, 'error')
+		return false
 	}
-	if(check) {
+	if (check) {
 		try {
 			return prop ? row.map(item => item[prop]) : row
 		} catch (error) {
@@ -608,12 +623,12 @@ common.checkRows2 = async (that, row, title, prop = "id", check = true) => {
 	}
 }
 
-common.checkStatus = async (that, row, title, prop = "status", check = true) => {
-	if(row.length == 0) {
+common.checkStatus = async (that, row, title, prop = 'status', check = true) => {
+	if (row.length == 0) {
 		//common.message(that, `请选择数据`, 'error');
-		return false;
+		return false
 	}
-	if(check) {
+	if (check) {
 		try {
 			//await common.confirm(that, `您确定进行${title}操作`, '操作提醒')
 			return prop ? row.map(item => item[prop]) : row
@@ -626,6 +641,4 @@ common.checkStatus = async (that, row, title, prop = "status", check = true) =>
 }
 
 
-
-
 export default common