Merge branch 'master' of github.com:dream2023/f-render

Author: dream2023

CHANGELOG.md

@@ -2,14 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [4.12.3](https://github.com/dream2023/f-render/compare/v4.12.2...v4.12.3) (2021-01-01)
-
-### [4.12.2](https://github.com/dream2023/f-render/compare/v4.12.1...v4.12.2) (2021-01-01)
+### [4.12.2](https://github.com/dream2023/f-render/compare/v4.12.1...v4.12.2) (2020-12-22)
 
 
 ### Bug Fixes
 
-* 修复 formPropsData 无效问题 ([35f3796](https://github.com/dream2023/f-render/commit/35f37969c57c13ee0d523c4fe40a5121eadd9446))
+* **#66:** attrs 属性未隔离 & 火狐浏览器拖拽打开新页面 ([7d733e9](https://github.com/dream2023/f-render/commit/7d733e94131d8ae6a9384b6b25cf8a1c0009136f)), closes [#66](https://github.com/dream2023/f-render/issues/66)
 
 ### [4.12.1](https://github.com/dream2023/f-render/compare/v4.12.0...v4.12.1) (2020-11-17)
 

src/f-render.vue

@@ -249,12 +249,12 @@ export default {
     // 通过类型获取表单项
     getFormItemByType(type) {
       const comp = this.getCompByType(type);
-      return {
+      return cloneDeep({
         type,
-        ...cloneDeep(this.formItemCommon.data),
-        ...cloneDeep(comp?.config?.common?.data || {}),
+        ...this.formItemCommon.data,
+        ...(comp?.config?.common?.data || {}),
         attrs: comp?.config?.attrs?.data || {}
-      };
+      });
     },
     // 通过类型获取组件
     getCompByType(type) {
@@ -302,6 +302,17 @@ export default {
   created() {
     // 设置表单属性默认值
     this.initFormPropsData();
+
+    // 防止火狐拖拽打开新标签
+    this.ondrop = function(event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+
+    document.body.addEventListener("drop", this.ondrop);
+  },
+  beforeDestroy() {
+    document.body.removeEventListener("drop", this.ondrop);
   }
 };
 </script>