diff --git a/report-ui/src/mixins/access.js b/report-ui/src/mixins/access.js index d23c8a75..805c9bb7 100644 --- a/report-ui/src/mixins/access.js +++ b/report-ui/src/mixins/access.js @@ -88,11 +88,6 @@ export default { return result } }, - //深拷贝 - deepClone(obj){ - var temp = JSON.stringify(obj); - return JSON.parse(temp); - }, //从所有字典中，取某个字典的列表 getDict(dictname){ diff --git a/report-ui/src/mixins/common.js b/report-ui/src/mixins/common.js index f53bf314..f52bd6ed 100644 --- a/report-ui/src/mixins/common.js +++ b/report-ui/src/mixins/common.js @@ -4,6 +4,14 @@ export default { } }, computed: { + // 网页高度 + bodyWidth() { + return document.body.clientWidth + }, + // 网页宽度 + bodyHeight() { + return document.body.clientHeight + }, }, created () { }, @@ -86,22 +94,41 @@ export default { } } }, - objToOne (obj) { - var tmpData = {} - for (var index in obj) { - if (typeof obj[index] == 'object') { - var resObj = this.objToOne(obj[index]) - Object.assign(tmpData, resObj) // 这里使用对象合并 - } else { - tmpData[index] = obj[index] - } + // 获取对象类型 + getObjectType(obj) { + var toString = Object.prototype.toString + var map = { + '[object Boolean]': 'boolean', + '[object Number]': 'number', + '[object String]': 'string', + '[object Function]': 'function', + '[object Array]': 'array', + '[object Date]': 'date', + '[object RegExp]': 'regExp', + '[object Undefined]': 'undefined', + '[object Null]': 'null', + '[object Object]': 'object', } - return tmpData + if (obj instanceof Element) { + return 'element' + } + return map[toString.call(obj)] + }, + isNumber(obj) { + return this.getObjectType(obj) == 'number' + }, + isString(obj) { + return this.getObjectType(obj) == 'string' }, - isNotNull (val) { + + hasOwn(obj, key) { + return Object.prototype.hasOwnProperty.call(obj, key) + }, + + isNotNull(val) { return !this.isNull(val) }, - isNull (val) { + isNull(val) { // 特殊判断 if (val && parseInt(val) === 0) return false const list = ['$parent'] @@ -125,5 +152,108 @@ export default { } return false }, + + // 对象深拷贝 + deepClone(data) { + var type = this.getObjectType(data) + var obj + if (type === 'array') { + obj = [] + } else if (type === 'object') { + obj = {} + } else { + // 不再具有下一层次 + return data + } + if (type === 'array') { + for (var i = 0, len = data.length; i < len; i++) { + data[i] = (() => { + if (data[i] === 0) { + return data[i] + } + return data[i] + })() + if (data[i]) { + delete data[i].$parent + } + obj.push(this.deepClone(data[i])) + } + } else if (type === 'object') { + for (var key in data) { + if (data) { + delete data.$parent + } + obj[key] = this.deepClone(data[key]) + } + } + return obj + }, + + // 合并json + mergeObject() { + var target = arguments[0] || {} + var deep = false + var arr = Array.prototype.slice.call(arguments) + var i = 1 + var options, src, key, copy + var isArray = false + if (typeof target === 'boolean') { + deep = target + i++ + target = arguments[1] + } + for (; i < arr.length; i++) { + // 循环传入的对象数组 + if ((options = arr[i]) != null) { + // 如果当前值不是null，如果是null不做处理 + for (key in options) { + // for in循环对象中key + copy = options[key] + src = target[key] + // 如果对象中value值任然是一个引用类型 + if (deep && (toString.call(copy) === '[object Object]' || (isArray = toString.call(copy) == '[object Array]'))) { + if (isArray) { + // 如果引用类型是数组 + // 如果目标对象target存在当前key，且数据类型是数组，那就还原此值，如果不是就定义成一个空数组; + src = toString.call(src) === '[object Array]' ? src : [] + } else { + // 如果目标对象target存在当前key，且数据类型是对象，那就还原此值，如果不是就定义成一个空对象; + src = toString.call(src) === '[object Object]' ? src : {} + } + // 引用类型就再次调用extend，递归，直到此时copy是一个基本类型的值。 + target[key] = this.mergeObject(deep, src, copy) + } else if (copy !== undefined && copy !== src) { + // 如果这个值是基本值类型，且不是undefined + target[key] = copy + } + } + } + } + return target + }, + + // 获取dom在屏幕中的top和left + getDomTopLeftById(id) { + var dom = document.getElementById(id) + var top = 0 + var left = 0 + if (dom != null) { + top = dom.getBoundingClientRect().top + left = dom.getBoundingClientRect().left + } + return { top: top, left: left } + }, + objToOne(obj) { + var tmpData = {} + for (var index in obj) { + if (typeof obj[index] == 'object') { + var resObj = this.objToOne(obj[index]) + Object.assign(tmpData, resObj) // 这里使用对象合并 + } else { + tmpData[index] = obj[index] + } + } + return tmpData + }, } } diff --git a/report-ui/src/views/report/bigscreen/designer/form/contentMenu.vue b/report-ui/src/views/report/bigscreen/designer/form/contentMenu.vue index 15482708..2e828337 100644 --- a/report-ui/src/views/report/bigscreen/designer/form/contentMenu.vue +++ b/report-ui/src/views/report/bigscreen/designer/form/contentMenu.vue @@ -1,11 +1,6 @@