样式

陈鑫涛
1 parent a1bffa96
Showing 34 changed files with 154 additions and 139 deletions
src/assets/styles/screen.scss
src/components/AnjiPlus/anji-autocomplete.vue
src/components/AnjiPlus/anji-crud/anji-crud.vue
src/components/AnjiPlus/anji-crud/edit.vue
src/components/AnjiPlus/anji-dialog.vue
src/components/AnjiPlus/anji-input.vue
src/components/AnjiPlus/anji-upload.vue
src/views/accessRole/components/RoleAuthority.vue
src/views/bigscreenDesigner/designer/components/colorPicker.vue
src/views/bigscreenDesigner/designer/components/customColorComponents.vue
src/views/bigscreenDesigner/designer/components/customUpload.vue
src/views/bigscreenDesigner/designer/components/customUploadMulti.vue
src/views/bigscreenDesigner/designer/components/customUploadNew.vue
src/views/bigscreenDesigner/designer/components/dynamicAddPicAdress.vue
src/views/bigscreenDesigner/designer/components/dynamicAddRadar.vue
src/views/bigscreenDesigner/designer/components/dynamicAddSvg.vue
src/views/bigscreenDesigner/designer/components/dynamicAddTable.vue
src/views/bigscreenDesigner/designer/components/dynamicForm.vue
src/views/bigscreenDesigner/designer/components/dynamicHtmlSlider.vue
src/views/bigscreenDesigner/designer/index.vue
@@ -440,7 +440,7 @@ li {
       height: calc(100vh - 80px);
       text-align: center;
-      ::v-deep.el-tabs__header {
+      ::v-deep .el-tabs__header {
         width: 30%;
         margin-right: 0;
@@ -459,7 +459,7 @@ li {
         }
       }
-      ::v-deep.el-tabs__content {
+      ::v-deep .el-tabs__content {
         width: 70%;
       }
     }
@@ -495,7 +495,7 @@ li {
     }
   }
-  ::v-deep.el-tabs__content {
+  ::v-deep .el-tabs__content {
     padding: 0;
   }
 }
@@ -132,7 +132,7 @@ export default {
   }
 };
 </script>
-<style lang="less" scoped>
+<style lang="scss" scoped>
 .inline-input {
   width: 100%;
 }
@@ -935,17 +935,17 @@ export default {
     position: relative;
   }
 }
-::v-deep.button {
+::v-deep .button {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.08);
   border-radius: 6px;
 }
-::v-deep.el-table th > .cell {
+::v-deep .el-table th > .cell {
   text-align: center;
 }
-::v-deep.el-table .cell {
+::v-deep .el-table .cell {
   text-align: center;
 }
-::v-deep.elTable {
+::v-deep .elTable {
   margin: 10px 0 50px;
 }
 .el-table {
@@ -960,7 +960,7 @@ export default {
     height: 36px;
   }
 }
-::v-deep.el-table--striped .el-table__body tr.el-table__row--striped td {
+::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
   background: #f9fbfd;
 }
 .screenFlex {
@@ -1022,7 +1022,7 @@ export default {
   &:hover {
     background: none !important;
   }
-  ::v-deep.el-button--text:hover,
+  ::v-deep .el-button--text:hover,
   .el-button--text:focus {
     color: #799ffc !important;
     background-color: #ecf5ff !important;
@@ -1041,7 +1041,7 @@ export default {
     float: right;
   }
 }
-::v-deep.el-pagination.is-background .btn-prev,
+::v-deep .el-pagination.is-background .btn-prev,
 .el-pagination.is-background .btn-next,
 .el-pagination.is-background .el-pager li {
   margin: 0 5px;
@@ -1051,7 +1051,7 @@ export default {
   min-width: 30px;
   border-radius: 2px;
 }
-::v-deep.el-pagination.is-background .el-pager li:not(.disabled).active {
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
   background-color: #5887fb;
   color: #ffffff;
   border-radius: 4px;
@@ -1074,7 +1074,7 @@ export default {
 .el-table ::v-deep .bgColor {
   background: #d9ecff;
 }
-::v-deep.edit_button {
+::v-deep .edit_button {
   width: 22px;
   height: 22px;
   padding: 0;
@@ -386,7 +386,7 @@ export default {
 <style scoped lang="scss">
 .notfull-screen {
-  ::v-deep.el-dialog__body {
+  ::v-deep .el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     max-height: 60vh;
@@ -394,7 +394,7 @@ export default {
   }
 }
 .full-screen {
-  ::v-deep.el-dialog__body {
+  ::v-deep .el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     height: calc(100vh - 110px);
@@ -151,7 +151,7 @@ export default {
 <style scoped lang="scss">
 .notfull-screen {
-  ::v-deep.el-dialog__body {
+  ::v-deep .el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     max-height: 60vh;
@@ -159,7 +159,7 @@ export default {
   }
 }
 .full-screen {
-  ::v-deep.el-dialog__body {
+  ::v-deep .el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     height: calc(100vh - 110px);
@@ -203,7 +203,7 @@ export default {
 .addForm {
   text-align: center;
 }
-.activeColor ::v-deep.el-form-item__label {
+.activeColor ::v-deep .el-form-item__label {
   color: #5887fb;
 }
 </style>
@@ -167,8 +167,8 @@ export default {
   },
 }
 </script>
-<style lang="less" scoped>
-::v-deep.el-input__suffix {
+<style lang="scss" scoped>
+::v-deep .el-input__suffix {
   padding: 0 6px;
 }
 .anji-input ::v-deep .el-input__inner {
@@ -170,7 +170,7 @@ export default {
   width: 60px;
   height: 60px;
 }
-.hide_box ::v-deep.el-upload--picture-card {
+.hide_box ::v-deep .el-upload--picture-card {
   display: none;
 }
 .el-upload-list__item {
@@ -85,7 +85,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep.el-dialog__body {
+::v-deep .el-dialog__body {
   height: 400px;
   overflow-y: scroll;
 }
@@ -63,8 +63,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep.el-color-picker--mini,
-::v-deep.el-color-picker--mini .el-color-picker__trigger {
+::v-deep .el-color-picker--mini,
+::v-deep .el-color-picker--mini .el-color-picker__trigger {
   width: 23px;
   height: 23px;
 }
@@ -172,30 +172,30 @@ export default {
     flex-direction: row;
   }
 }
-::v-deep.el-table,
-::v-deep.el-table__expanded-cell,
-::v-deep.el-table th,
-::v-deep.el-table tr {
+::v-deep .el-table,
+::v-deep .el-table__expanded-cell,
+::v-deep .el-table th,
+::v-deep .el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
 }
-::v-deep.el-table td,
-::v-deep.el-table th.is-leaf {
+::v-deep .el-table td,
+::v-deep .el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-::v-deep.el-table tbody tr:hover > td {
+::v-deep .el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-::v-deep.el-table::before {
+::v-deep .el-table::before {
   height: 0;
 }
-::v-deep.el-color-picker--mini,
-::v-deep.el-color-picker--mini .el-color-picker__trigger {
+::v-deep .el-color-picker--mini,
+::v-deep .el-color-picker--mini .el-color-picker__trigger {
   width: 23px;
   height: 23px;
 }
-::v-deep.el-dialog {
+::v-deep .el-dialog {
   background: #1b1e25;
   .el-dialog__title {
     color: #fff;
@@ -90,8 +90,8 @@ export default {
   top: 0;
   opacity: 0;
 }
-::v-deep.el-input-group__append,
-::v-deep.el-input-group__prepend {
+::v-deep .el-input-group__append,
+::v-deep .el-input-group__prepend {
   padding: 0 10px !important;
   overflow: hidden;
 }
@@ -142,8 +142,8 @@ export default {
   display: none;
 }
-::v-deep.el-input-group__append,
-::v-deep.el-input-group__prepend {
+::v-deep .el-input-group__append,
+::v-deep .el-input-group__prepend {
   padding: 0 10px !important;
   overflow: hidden;
 }
@@ -156,7 +156,7 @@ export default {
 ::v-deep .el-dialog .el-dialog__header,
 ::v-deep .el-dialog__body,
-::v-deep.el-dialog__footer {
+::v-deep .el-dialog__footer {
   background: #1b1e25;
 }
@@ -115,8 +115,8 @@ export default {
   display: none;
 }
-::v-deep.el-input-group__append,
-::v-deep.el-input-group__prepend {
+::v-deep .el-input-group__append,
+::v-deep .el-input-group__prepend {
   padding: 0 10px !important;
   overflow: hidden;
 }
@@ -149,26 +149,26 @@ export default {
   border-radius: 5px;
   background-color: rgba(144, 146, 152, 0.3);
 }
-::v-deep.el-table,
-::v-deep.el-table__expanded-cell,
-::v-deep.el-table th,
-::v-deep.el-table tr {
+::v-deep .el-table,
+::v-deep .el-table__expanded-cell,
+::v-deep .el-table th,
+::v-deep .el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
   font-size: 12px !important;
 }
-::v-deep.el-table td,
-::v-deep.el-table th.is-leaf {
+::v-deep .el-table td,
+::v-deep .el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-::v-deep.el-table tbody tr:hover {
+::v-deep .el-table tbody tr:hover {
   background-color: #263445 !important;
 }
-::v-deep.el-table tbody tr:hover > td {
+::v-deep .el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-::v-deep.el-table::before {
+::v-deep .el-table::before {
   height: 0;
 }
 .button-group .el-button {
@@ -150,26 +150,26 @@ export default {
   border-radius: 5px;
   background-color: rgba(144, 146, 152, 0.3);
 }
-::v-deep.el-table,
-::v-deep.el-table__expanded-cell,
-::v-deep.el-table th,
-::v-deep.el-table tr {
+::v-deep .el-table,
+::v-deep .el-table__expanded-cell,
+::v-deep .el-table th,
+::v-deep .el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
   font-size: 12px !important;
 }
-::v-deep.el-table td,
-::v-deep.el-table th.is-leaf {
+::v-deep .el-table td,
+::v-deep .el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-::v-deep.el-table tbody tr:hover {
+::v-deep .el-table tbody tr:hover {
   background-color: #263445 !important;
 }
-::v-deep.el-table tbody tr:hover > td {
+::v-deep .el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-::v-deep.el-table::before {
+::v-deep .el-table::before {
   height: 0;
 }
 .button-group .el-button {
@@ -149,26 +149,26 @@ export default {
   border-radius: 5px;
   background-color: rgba(144, 146, 152, 0.3);
 }
-::v-deep.el-table,
-::v-deep.el-table__expanded-cell,
-::v-deep.el-table th,
-::v-deep.el-table tr {
+::v-deep .el-table,
+::v-deep .el-table__expanded-cell,
+::v-deep .el-table th,
+::v-deep .el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
   font-size: 12px !important;
 }
-::v-deep.el-table td,
-::v-deep.el-table th.is-leaf {
+::v-deep .el-table td,
+::v-deep .el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-::v-deep.el-table tbody tr:hover {
+::v-deep .el-table tbody tr:hover {
   background-color: #263445 !important;
 }
-::v-deep.el-table tbody tr:hover > td {
+::v-deep .el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-::v-deep.el-table::before {
+::v-deep .el-table::before {
   height: 0;
 }
 .button-group .el-button {
@@ -193,26 +193,26 @@ export default {
   border-radius: 5px;
   background-color: rgba(144, 146, 152, 0.3);
 }
-::v-deep.el-table,
-::v-deep.el-table__expanded-cell,
-::v-deep.el-table th,
-::v-deep.el-table tr {
+::v-deep .el-table,
+::v-deep .el-table__expanded-cell,
+::v-deep .el-table th,
+::v-deep .el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
   font-size: 12px !important;
 }
-::v-deep.el-table td,
-::v-deep.el-table th.is-leaf {
+::v-deep .el-table td,
+::v-deep .el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-::v-deep.el-table tbody tr:hover {
+::v-deep .el-table tbody tr:hover {
   background-color: #263445 !important;
 }
-::v-deep.el-table tbody tr:hover > td {
+::v-deep .el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-::v-deep.el-table::before {
+::v-deep .el-table::before {
   height: 0;
 }
 .button-group .el-button {
@@ -540,7 +540,7 @@ export default {
   border-top: none;
   border-bottom: none;
 }
-::v-deep.el-collapse-item__header {
+::v-deep .el-collapse-item__header {
   height: 40px;
   line-height: 40px;
   background: transparent;
@@ -549,11 +549,11 @@ export default {
   font-size: 12px;
   border-color: #282e3a;
 }
-::v-deep.el-collapse-item__wrap {
+::v-deep .el-collapse-item__wrap {
   background: transparent;
   border: none;
 }
-::v-deep.el-collapse-item__content {
+::v-deep .el-collapse-item__content {
   padding-bottom: 0;
 }
 </style>
@@ -162,26 +162,26 @@ export default {
   border-radius: 5px;
   background-color: rgba(144, 146, 152, 0.3);
 }
-::v-deep.el-table,
-::v-deep.el-table__expanded-cell,
-::v-deep.el-table th,
-::v-deep.el-table tr {
+::v-deep .el-table,
+::v-deep .el-table__expanded-cell,
+::v-deep .el-table th,
+::v-deep .el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
   font-size: 12px !important;
 }
-::v-deep.el-table td,
-::v-deep.el-table th.is-leaf {
+::v-deep .el-table td,
+::v-deep .el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-::v-deep.el-table tbody tr:hover {
+::v-deep .el-table tbody tr:hover {
   background-color: #263445 !important;
 }
-::v-deep.el-table tbody tr:hover > td {
+::v-deep .el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-::v-deep.el-table::before {
+::v-deep .el-table::before {
   height: 0;
 }
 .button-group .el-button {
@@ -1026,18 +1026,20 @@ export default {
       return widgetJson;
     },
     setWidgetConfigValue(config, configValue) {
-      config.forEach((item) => {
-        if (this.isObjectFn(item)) {
-          configValue[item.name] = item.value;
-        }
-        if (this.isArrayFn(item)) {
-          item.forEach((itemChild) => {
-            itemChild.list.forEach((ev) => {
-              configValue[ev.name] = ev.value;
+      if (config && config.length) {
+        config.forEach((item) => {
+          if (this.isObjectFn(item)) {
+            configValue[item.name] = item.value;
+          }
+          if (this.isArrayFn(item)) {
+            item.forEach((itemChild) => {
+              itemChild.list.forEach((ev) => {
+                configValue[ev.name] = ev.value;
+              });
             });
-          });
-        }
-      });
+          }
+        });
+      }
     },
     // 对组件默认值处理
     handleDefaultValue(widgetJson) {
@@ -1638,7 +1638,7 @@ li {
       width: 100%;
       height: calc(100vh - 80px);
       text-align: center;
-      ::v-deep.el-tabs__header {
+      ::v-deep .el-tabs__header {
         width: 30%;
         margin-right: 0;
         .el-tabs__nav-wrap {
@@ -1654,7 +1654,7 @@ li {
           }
         }
       }
-      ::v-deep.el-tabs__content {
+      ::v-deep .el-tabs__content {
         width: 70%;
       }
     }
@@ -1687,7 +1687,7 @@ li {
       font-size: 12px !important;
     }
   }
-  ::v-deep.el-tabs__content {
+  ::v-deep .el-tabs__content {
     padding: 0;
   }
 }
@@ -73,6 +73,14 @@ export const widgetText =  {
           value: '0',
         },
         {
+          type: 'el-input-number',
+          label: '边框倒角',
+          name: 'borderRadius',
+          required: false,
+          placeholder: '',
+          value: '0',
+        },
+        {
           type: 'vue-color',
           label: '字体背景',
           name: 'background',
@@ -93,7 +93,7 @@ export default {
         width: this.optionsStyle.width + "px",
         height: this.optionsStyle.height+ "px",
         left: this.optionsStyle.left + "px",
-        top: this.optionsStyle.top-20 + "px",
+        top: this.optionsStyle.top - 20 + "px",
         position: "static",
         display: 'flex'
       };
@@ -114,6 +114,7 @@ export default {
   },
   created() {
     this.optionsStyle = this.value.position;
+    console.log("🚀 ~ created ~ this.optionsStyle:", this.optionsStyle)
     this.optionsData = this.value.data;
     this.optionsSetup = this.value.setup;
     this.editorOptions();
@@ -81,6 +81,8 @@ export default {
     this.optionsCollapse = this.value.collapse;
     this.optionsSetup = this.value.setup;
     this.editorOptions();
+    console.log(11111);
+
   },
   methods: {
     // 修改图标options属性
@@ -90,6 +90,7 @@ export default {
     this.optionsCollapse = this.value.collapse;
     this.optionsSetup = this.value.setup;
     this.editorOptions();
+    
   },
   methods: {
     // 修改图标options属性
@@ -46,6 +46,7 @@ export default {
         "font-size": this.transStyle.fontSize + "px",
         "letter-spacing": this.transStyle.letterSpacing + "em",
         background: this.transStyle.background,
+        'border-radius': this.transStyle.borderRadius + 'px',
         "text-align": this.transStyle.textAlign,
         width: this.transStyle.width + "px",
         height: this.transStyle.height + "px",
@@ -63,8 +63,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep.el-color-picker--mini,
-::v-deep.el-color-picker--mini .el-color-picker__trigger {
+::v-deep .el-color-picker--mini,
+::v-deep .el-color-picker--mini .el-color-picker__trigger {
   width: 23px;
   height: 23px;
 }
@@ -308,7 +308,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep.el-dropdown {
+::v-deep .el-dropdown {
   margin-right: 20px;
 }
 </style>
@@ -63,8 +63,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep.el-color-picker--mini,
-::v-deep.el-color-picker--mini .el-color-picker__trigger {
+::v-deep .el-color-picker--mini,
+::v-deep .el-color-picker--mini .el-color-picker__trigger {
   width: 23px;
   height: 23px;
 }
@@ -149,30 +149,30 @@ export default {
     flex-direction: row;
   }
 }
-::v-deep.el-table,
-::v-deep.el-table__expanded-cell,
-::v-deep.el-table th,
-::v-deep.el-table tr {
+::v-deep .el-table,
+::v-deep .el-table__expanded-cell,
+::v-deep .el-table th,
+::v-deep .el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
 }
-::v-deep.el-table td,
-::v-deep.el-table th.is-leaf {
+::v-deep .el-table td,
+::v-deep .el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-::v-deep.el-table tbody tr:hover > td {
+::v-deep .el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-::v-deep.el-table::before {
+::v-deep .el-table::before {
   height: 0;
 }
-::v-deep.el-color-picker--mini,
-::v-deep.el-color-picker--mini .el-color-picker__trigger {
+::v-deep .el-color-picker--mini,
+::v-deep .el-color-picker--mini .el-color-picker__trigger {
   width: 23px;
   height: 23px;
 }
-::v-deep.el-dialog {
+::v-deep .el-dialog {
   background: #1b1e25;
   .el-dialog__title {
     color: #fff;
@@ -90,8 +90,8 @@ export default {
   top: 0;
   opacity: 0;
 }
-::v-deep.el-input-group__append,
-::v-deep.el-input-group__prepend {
+::v-deep .el-input-group__append,
+::v-deep .el-input-group__prepend {
   padding: 0 10px !important;
   overflow: hidden;
 }
@@ -164,26 +164,26 @@ export default {
   border-radius: 5px;
   background-color: rgba(144, 146, 152, 0.3);
 }
-::v-deep.el-table,
-::v-deep.el-table__expanded-cell,
-::v-deep.el-table th,
-::v-deep.el-table tr {
+::v-deep .el-table,
+::v-deep .el-table__expanded-cell,
+::v-deep .el-table th,
+::v-deep .el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
   font-size: 12px !important;
 }
-::v-deep.el-table td,
-::v-deep.el-table th.is-leaf {
+::v-deep .el-table td,
+::v-deep .el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-::v-deep.el-table tbody tr:hover {
+::v-deep .el-table tbody tr:hover {
   background-color: #263445 !important;
 }
-::v-deep.el-table tbody tr:hover > td {
+::v-deep .el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-::v-deep.el-table::before {
+::v-deep .el-table::before {
   height: 0;
 }
 .button-group .el-button {
@@ -423,7 +423,7 @@ export default {
   border-top: none;
   border-bottom: none;
 }
-::v-deep.el-collapse-item__header {
+::v-deep .el-collapse-item__header {
   height: 40px;
   line-height: 40px;
   background: transparent;
@@ -432,11 +432,11 @@ export default {
   font-size: 12px;
   border-color: #282e3a;
 }
-::v-deep.el-collapse-item__wrap {
+::v-deep .el-collapse-item__wrap {
   background: transparent;
   border: none;
 }
-::v-deep.el-collapse-item__content {
+::v-deep .el-collapse-item__content {
   padding-bottom: 0;
 }
 </style>
@@ -74,7 +74,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep.el-dropdown-menu__item {
+::v-deep .el-dropdown-menu__item {
   max-width: none;
 }
 .layout-left {
@@ -90,7 +90,7 @@ export default {
       width: 100%;
       height: calc(100vh - 80px);
       text-align: center;
-      ::v-deep.el-tabs__header {
+      ::v-deep .el-tabs__header {
         width: 30%;
         margin-right: 0;
         .el-tabs__nav-wrap {
@@ -105,7 +105,7 @@ export default {
           }
         }
       }
-      ::v-deep.el-tabs__content {
+      ::v-deep .el-tabs__content {
         width: 70%;
       }
     }
@@ -137,7 +137,7 @@ export default {
     .tools-item-text {
     }
   }
-  ::v-deep.el-tabs__content {
+  ::v-deep .el-tabs__content {
     padding: 0;
   }
 }