xs-common-plugins 1.2.6 → 1.2.7

package/README.md

@@ -307,3 +307,9 @@
    1.2.6
    1.新增 el-input 回车执行查询方法
 ```
+
+```
+   1.2.7
+   1.优化common.popup弹窗方法。
+   2.优化common.clone方法
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xs-common-plugins",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "private": false,
   "description": "向上公共代码部分",
   "author": "祝玲云 <1902733517@qq.com>",

package/src/common/common.js

@@ -246,103 +246,133 @@ common.confirm = (that, message, title, callBack) => {
  *
  */
 common.popup = (options) => {
-    if (!options) return;
-    let { title, component, srcData, width, showButton, callBack, props, dialogCfg } = common.clone(options);
-    if (!component) return;
-    let e = document.createElement("div");
-    document.getElementsByTagName("body")[0].appendChild(e);
-    let template = '';
-    let v = '';
-    if (typeof component == 'string') {
-    } else {
-        let button = '';
-        if (showButton) {
-            button = `<div style="text-align:right"><el-button size="medium" type='primary' @click="confirm">确认</el-button><el-button size="medium" @click="cancel()">取消</el-button></div>`
-        }
-        template = `<div v-if="visible"> <el-dialog :title="title" v-bind="dialogCfg" :visible.sync="visible" :width="width" :before-close="beforeClose" append-to-body><child ref="child"  v-bind="props" :srcData="srcData" @close="close" @cancel="cancel" />${button}</el-dialog></div>`
-    }
-    v = new Vue({
-        el: e,
-        template: template,
-        router,
-        store,
-        data: function () {
-            return {
-                title: title ? title : '弹窗组件',
-                visible: true,
-                width: width ? width : '30%',
-                props: props ? props : null,
-                srcData: srcData ? srcData : null,
-                dialogCfg: dialogCfg ? dialogCfg: null
-            }
-        },
-        components: {
-            child: component
-        },
-        methods: {
-            confirm() {
-                if (this.$refs.child.confirm) {
-                    this.$refs.child.confirm();
-                }
-            },
-            beforeClose(done) {
-                if (this.$refs.child.beforeClose) {
-                    this.$refs.child.beforeClose(done);
-                } else {
-                    done()
-                }
-            },
-            cancel () {
-                this.visible = false
-            },
-            close(res) {
-                if (callBack) {
-                    callBack(res);
-                }
-                this.visible = false
-            }
-        }
-    })
-    return v
+	if (!options) return;
+	const { title, component, srcData, width, showButton, callBack, props, dialogCfg } = common.clone(options);
+	if (!component) return;
+
+	const div = document.createElement("div");
+	document.body.appendChild(div);
+
+	const dialogComponent = {
+		components: {
+			child: component
+		},
+		props: {
+			title: {
+				type: String,
+				default: '弹窗组件',
+			},
+			srcData: {
+				type: Object,
+				default: null,
+			},
+			showButton: {
+				type: Boolean,
+				default: true,
+			},
+			width: {
+				type: String,
+				default: '30%',
+			},
+			dialogCfg: {
+				type: Object,
+				default: null,
+			},
+			props: {
+				type: Object,
+				default: null,
+			},
+			callBack: {
+				type: Function,
+				default: null,
+			},
+		},
+		data() {
+			return {
+				visible: true,
+			};
+		},
+		methods: {
+			confirm() {
+				if (this.$refs.child.confirm) {
+					this.$refs.child.confirm();
+				}
+			},
+			beforeClose(done) {
+				if (this.$refs.child.beforeClose) {
+					this.$refs.child.beforeClose(done);
+				} else {
+					done();
+				}
+			},
+			cancel() {
+				this.visible = false;
+			},
+			close(res) {
+				if (this.callBack) {
+					this.callBack(res);
+				}
+				this.visible = false;
+			}
+		},
+		template: `
+			<div>
+			<el-dialog :title="title" :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;">
+					<el-button size="medium" type="primary" @click="confirm">确认</el-button>
+					<el-button size="medium" @click="cancel">取消</el-button>
+				</div>
+			</el-dialog>
+			</div>
+		`,
+	};
+
+	return new Vue({
+		el: div,
+		render(h) {
+			return h(dialogComponent, {
+				props: {
+					title,
+					srcData,
+					width,
+					showButton,
+					callBack,
+					props,
+					dialogCfg,
+				},
+			});
+		},
+	});
 }
 
+
+
 /**
  * 深度拷贝
  */
 common.clone = (obj) => {
-    // 其他类型
-    if (null == obj || 'object' == typeof (obj)) {
-        return obj
-    }
-    // 日期类型
-    if (obj instanceof Date) {
-        let copy = new Date();
-        copy.setTime(obj.getTime());
-        return copy;
-    }
-    //数组类型
-    if (obj instanceof Array) {
-        let copy = [];
-        for (let i = 0; index < obj.length; index++) {
-            copy[i] = common.clone(obj[i])
-        }
-        return copy
-    }
-    //对象类型
-    if (obj instanceof Object) {
-        let copy = {}
-        for (const key in obj) {
-            if (Object.hasOwnProperty.call(object, key)) {
-                copy[key] = common.copy(obj[key])
-            }
-        }
-        return copy
-    }
+	if (obj === null || typeof obj !== 'object') {
+		return obj;
+	}
+
+	if (obj instanceof Date) {
+		return new Date(obj.getTime());
+	}
 
-    throw new Error("无法复制对象！不支持其类型")
+	const clone = Array.isArray(obj) ? [] : {};
+
+	for (const key in obj) {
+		if (Object.prototype.hasOwnProperty.call(obj, key)) {
+			clone[key] = common.clone(obj[key]);
+		}
+	}
+
+	return clone;
 }
 
 
+
 /**
  *导出数据报表
  *@param query 默认 列表上的 query 条件去掉 data