tianheng-ui 0.0.74 → 0.0.76

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,

package/packages/FormMaking/Container.vue

@@ -389,7 +389,7 @@ export default {
     data: {
       type: Object,
       default: () => {
-        return { list: [], config: baseConfig };
+        return {};
       }
     },
     tools: {
@@ -447,8 +447,11 @@ export default {
     this.layoutComponents = layoutComponents;
     this.advanceComponents = advanceComponents;
     return {
-      widgetFormData: this.data,
-      widgetFormSelect: this.data.list[0],
+      widgetFormData: {
+        list: [],
+        config: baseConfig
+      },
+      widgetFormSelect: {},
       widgetValue: {},
       configTab: "widget",
       client: "monitor",
@@ -510,17 +513,22 @@ export default {
     widgetFormData: {
       deep: true,
       handler: function(val) {
-        console.log("widgetFormData =>", val);
         this.$emit("update:data", val);
       }
     },
     data(val) {
-      console.log("data =>", val);
       this.setJSON(val);
-      // this.widgetFormData = val;
     }
   },
-  mounted() {},
+  mounted() {
+    if (this.data && this.data.list) {
+      this.widgetFormData.list = this.data.list;
+      this.widgetFormSelect = this.data.list[0]
+    }
+    if (this.data && this.data.config) {
+      this.widgetFormData.config = this.data.config;
+    }
+  },
   methods: {
     // 读取excel file
     readExcelFile(file) {

package/packages/FormMaking/styles/index.scss

@@ -239,9 +239,9 @@ $primary-background-color: #ecf5ff;
           margin-left: 0 !important;
         }
       }
-      .widget-table-list:hover::-webkit-scrollbar-thumb {
-        background-color: rgba(69, 90, 100, 0.2);
-      }
+      // .widget-table-list:hover::-webkit-scrollbar-thumb {
+      //   background-color: rgba(69, 90, 100, 0.2);
+      // }
 
       .tableH5 {
         min-height: 50px;

package/packages/TableMaking/widgetConfig.vue

@@ -228,11 +228,13 @@ export default {
     .fields-item {
       padding: 0 10px;
       height: 30px;
+      margin-right: 0;
       line-height: 30px;
     }
 
     .el-checkbox {
       padding: 0 10px;
+      margin-right: 0;
       width: 100%;
       height: 30px;
       line-height: 30px;

package/packages/TableMaking/widgetTable.vue

@@ -161,13 +161,13 @@ export default {
     box-sizing: border-box;
 
     .table-content {
-      height: 160px;
+      height: 120px;
       overflow-y: scroll;
     }
   }
   .tableList {
     margin-top: 10px;
-    height: calc(100% - 280px);
+    height: calc(100% - 240px);
     border: 1px solid #dcdfe6;
 
     .table-header {
@@ -230,11 +230,11 @@ export default {
       }
     }
   }
-  .table-content:hover::-webkit-scrollbar-thumb {
-    background-color: rgba(69, 90, 100, 0.2);
-  }
-  .table-content:hover::-webkit-scrollbar-thumb {
-    background-color: rgba(69, 90, 100, 0.2);
-  }
+  // .table-content:hover::-webkit-scrollbar-thumb {
+  //   background-color: rgba(69, 90, 100, 0.2);
+  // }
+  // .table-content:hover::-webkit-scrollbar-thumb {
+  //   background-color: rgba(69, 90, 100, 0.2);
+  // }
 }
 </style>

package/packages/Workflow/index.vue

@@ -365,35 +365,35 @@ export default {
   color: #fafafa;
 }
 
-body,
-body * {
-  /* 滚动条 */
-  &::-webkit-scrollbar-track-piece {
-    background-color: #fff; /*滚动条的背景颜色*/
-    -webkit-border-radius: 0; /*滚动条的圆角宽度*/
-  }
-  &::-webkit-scrollbar {
-    width: 10px; /*滚动条的宽度*/
-    height: 8px; /*滚动条的高度*/
-  }
-  &::-webkit-scrollbar-thumb:vertical {
-    /*垂直滚动条的样式*/
-    height: 50px;
-    background-color: rgba(153, 153, 153, 0.5);
-    -webkit-border-radius: 4px;
-    outline: 2px solid #fff;
-    outline-offset: -2px;
-    border: 2px solid #fff;
-  }
-  &::-webkit-scrollbar-thumb {
-    /*滚动条的hover样式*/
-    background-color: rgba(159, 159, 159, 0.3);
-    -webkit-border-radius: 4px;
-  }
-  &::-webkit-scrollbar-thumb:hover {
-    /*滚动条的hover样式*/
-    background-color: rgba(159, 159, 159, 0.5);
-    -webkit-border-radius: 4px;
-  }
-}
+// body,
+// body * {
+//   /* 滚动条 */
+//   &::-webkit-scrollbar-track-piece {
+//     background-color: #fff; /*滚动条的背景颜色*/
+//     -webkit-border-radius: 0; /*滚动条的圆角宽度*/
+//   }
+//   &::-webkit-scrollbar {
+//     width: 10px; /*滚动条的宽度*/
+//     height: 8px; /*滚动条的高度*/
+//   }
+//   &::-webkit-scrollbar-thumb:vertical {
+//     /*垂直滚动条的样式*/
+//     height: 50px;
+//     background-color: rgba(153, 153, 153, 0.5);
+//     -webkit-border-radius: 4px;
+//     outline: 2px solid #fff;
+//     outline-offset: -2px;
+//     border: 2px solid #fff;
+//   }
+//   &::-webkit-scrollbar-thumb {
+//     /*滚动条的hover样式*/
+//     background-color: rgba(159, 159, 159, 0.3);
+//     -webkit-border-radius: 4px;
+//   }
+//   &::-webkit-scrollbar-thumb:hover {
+//     /*滚动条的hover样式*/
+//     background-color: rgba(159, 159, 159, 0.5);
+//     -webkit-border-radius: 4px;
+//   }
+// }
 </style>