Merge remote-tracking branch 'gitee/master' into gitee-master

report-ui/src/views/report/bigscreen/designer/tools.js

@@ -863,62 +863,62 @@ const widgetTools = [
       ],
     },
   },
-  {
+  // {
-    code: 'widget-table',
+  //   code: 'widget-table',
-    type: 'html',
+  //   type: 'html',
-    label: '表格',
+  //   label: '表格',
-    icon: 'iconbiaoge',
+  //   icon: 'iconbiaoge',
-    options: {
+  //   options: {
-      setup: [
+  //     setup: [
-        {
+  //       {
-          type: 'el-input-text',
+  //         type: 'el-input-text',
-          label: '图层名称',
+  //         label: '图层名称',
-          name: 'layerName',
+  //         name: 'layerName',
-          required: false,
+  //         required: false,
-          placeholder: '',
+  //         placeholder: '',
-          value: '表格',
+  //         value: '表格',
-        },
+  //       },
-        {
+  //       {
-          type: 'dynamic-add-table',
+  //         type: 'dynamic-add-table',
-        }
+  //       }
-      ],
+  //     ],
-      data: [],
+  //     data: [],
-      position: [
+  //     position: [
-        {
+  //       {
-          type: 'el-input-number',
+  //         type: 'el-input-number',
-          label: '左边距',
+  //         label: '左边距',
-          name: 'left',
+  //         name: 'left',
-          required: false,
+  //         required: false,
-          placeholder: 'px',
+  //         placeholder: 'px',
-          value: 0,
+  //         value: 0,
-        },
+  //       },
-        {
+  //       {
-          type: 'el-input-number',
+  //         type: 'el-input-number',
-          label: '上边距',
+  //         label: '上边距',
-          name: 'top',
+  //         name: 'top',
-          required: false,
+  //         required: false,
-          placeholder: 'px',
+  //         placeholder: 'px',
-          value: 0,
+  //         value: 0,
-        },
+  //       },
-        {
+  //       {
-          type: 'el-input-number',
+  //         type: 'el-input-number',
-          label: '宽度',
+  //         label: '宽度',
-          name: 'width',
+  //         name: 'width',
-          required: false,
+  //         required: false,
-          placeholder: '该容器在1920px大屏中的宽度',
+  //         placeholder: '该容器在1920px大屏中的宽度',
-          value: 600,
+  //         value: 600,
-        },
+  //       },
-        {
+  //       {
-          type: 'el-input-number',
+  //         type: 'el-input-number',
-          label: '高度',
+  //         label: '高度',
-          name: 'height',
+  //         name: 'height',
-          required: false,
+  //         required: false,
-          placeholder: '该容器在1080px大屏中的高度',
+  //         placeholder: '该容器在1080px大屏中的高度',
-          value: 300,
+  //         value: 300,
-        },
+  //       },
-      ]
+  //     ]
-    }
+  //   }
-  },
+  // },
   {
     code: 'widget-iframe',
     type: 'html',

report-ui/src/views/report/bigscreen/designer/widget/widget.vue

@@ -14,6 +14,7 @@
     :index="index"
     @focus="handleFocus"
     @blur="handleBlur"
+    :z-index="index"
   >
     <component :is="type" :value="value" />
   </avue-draggable>

report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue

@@ -15,6 +15,12 @@
   </div>
 </template>
 <script>
-export default {};
+export default {
+  data() {
+    return {
+      list: [{ name: 123 }]
+    };
+  }
+};
 </script>
 <style lang="scss" scoped></style>