修改

core/core-frontend/src/components/dashboard/DbToolbar.vue

@@ -212,7 +212,6 @@ const publishStatusChange = status => {
 }
 
 const saveCanvasWithCheck = (withPublish = false, status?) => {
-  debugger
   if (userStore.getOid && wsCache.get('user.oid') && userStore.getOid !== wsCache.get('user.oid')) {
     ElMessageBox.confirm(t('components.from_other_organizations'), {
       confirmButtonType: 'primary',
@@ -263,7 +262,7 @@ const saveResource = (checkParams?) => {
       canvasSaveWithParams(checkParams, () => {
         snapshotStore.resetStyleChangeTimes()
         let url = window.location.href
-        url = url.replace(/(#\/[^?]*)(?:\?[^#]*)?/, `$1?resourceId=${dvInfo.value.id}`)
+        url = url.replace(/(#\/[^?]*)(?:\?[^#]*)?/, `$1?resourceId=${dvInfo.value.id}&appId=${route.query.appId}`)
         if (!embeddedStore.baseUrl) {
           window.history.replaceState(
             {

core/core-frontend/src/components/dashboard/subject-setting/pre-subject/SubjectEditDialog.vue

@@ -105,7 +105,7 @@ const onImgChange = imgUrl => {
   text-align: left;
 }
 .m-label {
-  color: #1f2329;
+  color: #ffffff;
   font-size: 14px;
   font-style: normal;
   font-weight: 400;

core/core-frontend/src/components/data-visualization/ComponentToolBar.vue

@@ -185,7 +185,9 @@ onUnmounted(() => {
 :deep(.ed-input-number--dark:not(.is-disabled) .ed-input-number__increase:not(.is-disabled)) {
   background-color: #1a1a1a;
 }
-
+:deep(.ed-input-number__increase){
+  background-color: #1a1a1a !important;
+}
 .custom-divider_scale {
   height: 18px;
   border-color: #ffffff26;
@@ -204,7 +206,7 @@ onUnmounted(() => {
       position: absolute;
       content: '%';
       right: 35px;
-      top: 1px;
+      top: -1px;
       height: 24px;
       line-height: 24px;
     }

core/core-frontend/src/components/data-visualization/DvToolbar.vue

@@ -184,7 +184,7 @@ const saveResource = (checkParams?) => {
         snapshotStore.resetStyleChangeTimes()
         wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
         let url = window.location.href
-        url = url.replace(/(#\/[^?]*)(?:\?[^#]*)?/, `$1?dvId=${dvInfo.value.id}`)
+        url = url.replace(/(#\/[^?]*)(?:\?[^#]*)?/,`$1?dvId=${dvInfo.value.id}&appId=${route.query.appId}`)
         if (!embeddedStore.baseUrl) {
           window.history.replaceState(
             {

core/core-frontend/src/components/visualization/DatasetParamsComponent.vue

@@ -115,7 +115,7 @@ defineExpose({
   text-align: left;
 }
 .m-label {
-  color: #1f2329;
+  color: #ffffff;
   font-size: 14px;
   font-style: normal;
   font-weight: 400;

core/core-frontend/src/components/visualization/DvSidebar.vue

@@ -125,39 +125,22 @@ const onComponentNameChange = () => {
 </script>
 
 <template>
-  <div
+  <div @keyup.stop @keydown.stop class="dv-aside"
-    @keyup.stop
+    :class="['aside-' + asidePosition + '-' + themeInfo, 'aside-area-' + themeInfo]" :style="slideStyle">
-    @keydown.stop
-    class="dv-aside"
-    :class="['aside-' + asidePosition + '-' + themeInfo, 'aside-area-' + themeInfo]"
-    :style="slideStyle"
-  >
     <el-row align="middle" :class="'title-' + themeInfo" justify="space-between">
-      <div
+      <div :id="'attr-slide-component-name' + slideIndex" v-if="!canvasCollapse[sideName]" class="name-area-attr"
-        :id="'attr-slide-component-name' + slideIndex"
-        v-if="!canvasCollapse[sideName]"
-        class="name-area-attr"
         style="max-width: 180px; text-overflow: ellipsis; white-space: nowrap"
         :style="{ width: componentNameEdit ? '300px' : 'auto' }"
-        :class="{ 'component-name-dark': themeInfo === 'dark' }"
+        :class="{ 'component-name-dark': themeInfo === 'dark' }" @dblclick="editComponentName">
-        @dblclick="editComponentName"
-      >
         {{ isViewTitle ? view.title : title }}
-        <el-popover
+        <el-popover show-arrow :offset="8" :effect="themes" placement="bottom" width="200" trigger="click">
-          show-arrow
-          :offset="8"
-          :effect="themes"
-          placement="bottom"
-          width="200"
-          trigger="click"
-        >
           <template #reference>
             <span>
-              <el-icon
+              <el-icon v-show="element && element['id']" style="margin: 2px 0 0 4px; cursor: pointer">
-                v-show="element && element['id']"
+                <Icon>
-                style="margin: 2px 0 0 4px; cursor: pointer"
+                  <dvInfoSvg class="svg-icon" />
-                ><Icon><dvInfoSvg class="svg-icon" /></Icon
+                </Icon>
-              ></el-icon>
+              </el-icon>
             </span>
           </template>
           <div style="margin-bottom: 4px; font-size: 14px">
@@ -168,18 +151,12 @@ const onComponentNameChange = () => {
           </div>
         </el-popover>
       </div>
-      <el-icon
+      <el-icon :title="title" :class="['custom-icon-' + themeInfo, 'collapse-icon-' + themeInfo]" size="20px"
-        :title="title"
+        @click="collapseChange">
-        :class="['custom-icon-' + themeInfo, 'collapse-icon-' + themeInfo]"
+        <Expand v-if="
-        size="20px"
+          (canvasCollapse[sideName] && asidePosition === 'left') ||
-        @click="collapseChange"
+          (!canvasCollapse[sideName] && asidePosition === 'right')
-      >
+        " />
-        <Expand
-          v-if="
-            (canvasCollapse[sideName] && asidePosition === 'left') ||
-            (!canvasCollapse[sideName] && asidePosition === 'right')
-          "
-        />
         <Fold v-else />
       </el-icon>
     </el-row>
@@ -192,14 +169,8 @@ const onComponentNameChange = () => {
       <span>{{ title }}</span>
     </div>
     <Teleport v-if="componentNameEdit" :to="'#attr-slide-component-name' + slideIndex">
-      <input
+      <input ref="componentNameInputAttr" v-model="inputComponentName.name" width="100%" :effect="themeInfo"
-        ref="componentNameInputAttr"
+        @change="onComponentNameChange" @blur="closeEditComponentName" />
-        v-model="inputComponentName.name"
-        width="100%"
-        :effect="themeInfo"
-        @change="onComponentNameChange"
-        @blur="closeEditComponentName"
-      />
     </Teleport>
   </div>
 </template>
@@ -212,14 +183,17 @@ const onComponentNameChange = () => {
 
 .aside-area-light {
   color: #ebebeb;
-  background-color: #1a1a1a;
+  background-color: #1a1a1a !important;
+
   :deep(.title) {
     border-bottom: rgba(255, 255, 255, 0.15) 1px solid !important;
   }
 }
+
 .dv-aside {
   position: relative;
   transition: 0.5s;
+
   .title-dark {
     font-size: 14px;
     font-weight: 500;
@@ -230,6 +204,7 @@ const onComponentNameChange = () => {
     text-overflow: ellipsis;
     padding: 8px 10px 8px 8px;
   }
+
   .title-light {
     font-size: 14px;
     font-weight: 500;
@@ -240,6 +215,7 @@ const onComponentNameChange = () => {
     text-overflow: ellipsis;
     padding: 8px 10px 8px 8px;
   }
+
   .collapse-title {
     width: 35px;
     font-size: 14px;
@@ -247,15 +223,18 @@ const onComponentNameChange = () => {
     text-align: center;
     padding: 5px;
     margin-top: 5px;
+
     span {
       writing-mode: vertical-rl;
       text-orientation: mixed;
     }
   }
+
   .main-content {
     height: calc(100% - 45px);
     overflow-y: auto;
   }
+
   .custom-icon {
     position: absolute;
     right: 5px;
@@ -271,9 +250,11 @@ const onComponentNameChange = () => {
     width: var(--de-scroll-width);
   }
 }
+
 .aside-left-dark {
   border-right: @side-outline-border-color 1px solid;
 }
+
 .aside-right-dark {
   border-left: @side-outline-border-color 1px solid;
 }
@@ -281,18 +262,23 @@ const onComponentNameChange = () => {
 .aside-left-light {
   border-right: @side-outline-border-color-light 1px solid;
 }
+
 .aside-right-light {
   border-left: @side-outline-border-color-light 1px solid;
 }
+
 .ed-collapse {
   border-top: 0;
 }
+
 :deep(.ed-collapse) {
   border-top: unset;
 }
+
 :deep(.ed-collapse-item__header.is-active) {
   border-bottom-color: rgba(31, 35, 41, 0.15);
 }
+
 :deep(.ed-collapse-item.ed-collapse--dark .ed-collapse-item__header) {
   border-color: rgba(255, 255, 255, 0.15);
   border-top: unset;
@@ -321,6 +307,7 @@ const onComponentNameChange = () => {
   cursor: pointer;
   display: flex;
   align-items: center;
+
   input {
     position: absolute;
     left: 0;
@@ -346,209 +333,387 @@ const onComponentNameChange = () => {
     padding: 0 4px;
     height: 100%;
   }
-  .ed-icon{
 
-  }
+  .ed-icon {}
 }
 </style>
 <style>
 .ed-popper.is-light {
-    border: 1px solid #434343 !important;
+  border: 1px solid #434343 !important;
-    background: rgba(41, 41, 41, 1) !important;
+  background: rgba(41, 41, 41, 1) !important;
-    color: #ffffff ;
+  color: #ffffff;
 }
+
 .ed-popper[data-popper-placement^=bottom] .ed-popper__arrow::before {
-    background: rgba(41, 41, 41, 1) !important;
+  background: rgba(41, 41, 41, 1) !important;
 }
-.ed-popover.ed-popper{
+
+.ed-popover.ed-popper {
   background: rgba(41, 41, 41, 1) !important;
   border: 1px solid #434343 !important;
 }
-.ed-collapse-item.ed-collapse--light .ed-collapse-item__header{
+
+.ed-collapse-item.ed-collapse--light .ed-collapse-item__header {
   background-color: #1a1a1a;
   color: #fff;
 }
-.ed-collapse-item__header{
+
-  border-bottom: 1px solid rgba(255,255,255,0.15) !important;
+.ed-collapse-item__header {
+  color: #EBEBEB !important;
+  background-color: #1a1a1a !important;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.15) !important;
 }
-.ed-collapse-item__wrap{
+
+.ed-collapse-item--light .ed-collapse-item__wrap {
+  border-bottom: none;
+  background: #292929;
+}
+
+.ed-collapse-item__wrap {
   background-color: #292929;
+  border-bottom: none;
 }
-.ed-collapse-item__wrap .ed-form--default.ed-form--label-top .ed-form-item .ed-form-item__label{
+
+.ed-collapse-item__wrap .ed-form--default.ed-form--label-top .ed-form-item .ed-form-item__label {
   color: #a6a6a6;
 }
-.ed-collapse-item__wrap .ed-radio .ed-radio__label{
+
+.ed-collapse-item__wrap .ed-radio .ed-radio__label {
   color: #fff;
 }
-.ed-collapse-item__wrap .ed-radio .ed-radio__input.is-checked + .ed-radio__label{
+
+.ed-collapse-item__wrap .ed-radio .ed-radio__input.is-checked+.ed-radio__label {
   color: #0089ff !important;
 }
-.ed-collapse-item__wrap .ed-input.is-disabled .ed-input__wrapper{
+
+.ed-collapse-item__wrap .ed-input.is-disabled .ed-input__wrapper {
   background-color: #373737;
   box-shadow: none !important;
 }
+
 .ed-collapse-item__wrap .ed-input--light .ed-input-group__append .ed-select.ed-select--disabled .ed-input__wrapper {
   background: #373737 !important;
   box-shadow: none !important;
-  border-color:#636363 !important;
+  border-color: #636363 !important;
   border-left: none !important;
 }
+
 .ed-collapse-item__wrap .ed-input--dark .ed-input-group__append .ed-select .ed-input__wrapper {
   background: #373737 !important;
   box-shadow: none !important;
-  border-color:#636363 !important;
+  border-color: #636363 !important;
   border-left: none !important;
 }
-.ed-collapse-item__wrap .ed-input-group__append, .ed-input-group__prepend{
+
+.ed-collapse-item__wrap .ed-input-group__append,
+.ed-input-group__prepend {
   background: #373737 !important;
 }
-.ed-collapse-item__wrap .ed-input-group--append .ed-input-group__append .ed-select:not(.ed-select--disabled) .ed-input .ed-input__wrapper{
+
-  box-shadow: none  !important;
+.ed-collapse-item__wrap .ed-input-group--append .ed-input-group__append .ed-select:not(.ed-select--disabled) .ed-input .ed-input__wrapper {
-  border:1px solid #636363  !important;
+  box-shadow: none !important;
-  border-left: none  !important;
+  border: 1px solid #636363 !important;
+  border-left: none !important;
 }
-.ed-collapse-item__wrap .image-hint{
+
-  color:#757575 !important;
+.ed-collapse-item__wrap .image-hint {
+  color: #757575 !important;
 }
+
 .ed-collapse-item__wrap .avatar-uploader .ed-upload--picture-card {
   background: #373737 !important;
   border: 1px dashed #373737 !important;
 }
+
 .ed-collapse-item__wrap .indented-container .indented-item.disabled .img-area_light .ed-upload--picture-card .ed-icon {
   color: #5f5f5f !important;
 }
-.ed-collapse-item__wrap .avatar-uploader .ed-upload--picture-card .ed-icon{
+
+.ed-collapse-item__wrap .avatar-uploader .ed-upload--picture-card .ed-icon {
   color: #ebebeb !important;
 }
-.ed-collapse-item__wrap .ed-input-number__decrease, .ed-input-number__increase{
+
+.ed-collapse-item__wrap .ed-input-number__decrease,
+.ed-input-number__increase {
   background-color: #434343 !important;
-  color:#ffffff !important;
+  color: #ffffff !important;
 }
-.ed-input-number__decrease, .ed-input-number__increase{
+
-  color:#ffffff !important;
+.ed-input-number__decrease,
+.ed-input-number__increase {
+  color: #ffffff !important;
 }
-.ed-collapse-item__wrap .ed-input-number.is-controls-right .ed-input-number__increase{
+
+.ed-collapse-item__wrap .ed-input-number.is-controls-right .ed-input-number__increase {
   border-bottom: 1px solid #434343 !important;
   border-left: 1px solid #5f5f5f !important;
 }
-.ed-collapse-item__wrap .ed-input-number.is-controls-right .ed-input-number__decrease{
+
+.ed-collapse-item__wrap .ed-input-number.is-controls-right .ed-input-number__decrease {
   border-left: 1px solid #5f5f5f !important;
 }
-.ed-collapse-item__wrap .ed-input.is-disabled .ed-select__prefix--light{
+
+.ed-collapse-item__wrap .ed-input.is-disabled .ed-select__prefix--light {
   border-color: #5f5f5f;
 }
-.ed-collapse-item__wrap .ed-color-picker.is-custom.is-disabled .ed-color-picker__trigger{
+
+.ed-collapse-item__wrap .ed-color-picker.is-custom.is-disabled .ed-color-picker__trigger {
   border-color: #5f5f5f;
 }
-.ed-collapse-item__wrap .ed-select .ed-input.is-disabled:not(.ed-input--dark) .ed-input__wrapper:hover{
+
+.ed-collapse-item__wrap .ed-select .ed-input.is-disabled:not(.ed-input--dark) .ed-input__wrapper:hover {
   box-shadow: none !important;
 }
-.ed-collapse-item__wrap .custom-color-setting-btn{
+
+.ed-collapse-item__wrap .custom-color-setting-btn {
   border: 1px solid #5f5f5f !important;
   color: #fff !important;
 }
-.ed-collapse-item__wrap .ed-form-item__label{
+
+.ed-collapse-item__wrap .ed-form-item__label {
   color: #A6A6A6 !important;
 }
-.ed-collapse-item__wrap .custom-color-extend-setting{
+
+.ed-collapse-item__wrap .custom-color-extend-setting {
   color: #A6A6A6 !important;
 }
-.ed-collapse-item.ed-collapse--light .ed-collapse-item__content{
+
-  color: #A6A6A6 ;
+.ed-collapse-item.ed-collapse--light .ed-collapse-item__content {
+  color: #A6A6A6;
 }
-.ed-collapse-item__wrap .m-divider{
+
+.ed-collapse-item__content {
+  background-color: #292929 !important;
+}
+
+.ed-collapse-item__wrap .m-divider {
   border-color: rgba(233, 236, 241, 0.15) !important;
 }
-.ed-collapse-item__wrap .icon-btn{
+
-color: #ffffff !important;
+.ed-collapse-item__wrap .icon-btn {
+  color: #ffffff !important;
 }
-.ed-collapse-item__wrap .icon-btn.active{
+
+.ed-collapse-item__wrap .icon-btn.active {
   color: #0089ff !important;
 }
-.ed-collapse-item__wrap .color-button-outer{
+
+.ed-collapse-item__wrap .color-button-outer {
   border-color: rgba(233, 236, 241, 0.15) !important;
 }
-.ed-collapse-item__wrap .text-area{
+
+.ed-collapse-item__wrap .text-area {
   color: #fff !important;
 }
+
 .ed-collapse-item__wrap .ed-radio__input.is-disabled.is-checked .ed-radio__inner {
   background-color: #5f5f5f;
   border: 1px solid #5f5f5f;
 }
+
 .ed-collapse-item__wrap .ed-radio__input.is-disabled.is-checked .ed-radio__inner::after {
   background-color: #212121;
 }
-.ed-collapse-item__wrap .ed-radio .ed-radio__input.is-disabled.is-checked + .ed-radio__label {
+
+.ed-collapse-item__wrap .ed-radio .ed-radio__input.is-disabled.is-checked+.ed-radio__label {
   color: #bbbfc4 !important;
 }
-.editor-light .editor-title{
+
+.editor-light .editor-title {
   color: #ebebeb;
 }
+
 .editor-dark {
   border-left: solid 1px rgba(235, 235, 235, 0.15) !important;
 }
+
 .content-area {
   border-left: solid 1px rgba(235, 235, 235, 0.15) !important;
 }
+
 .editor-light .dataset-main {
   border-left: 1px solid rgba(235, 235, 235, 0.15) !important;
 }
-.collapse-title{
+
+.collapse-title {
   color: #ebebeb !important;
 }
+
 .editor-light .ed-tabs__header {
-  border-top: 1px solid  #363636 !important;
+  border-top: 1px solid #363636 !important;
 }
-.de-chart-editor .tab-header .ed-tabs__nav-wrap::after{
+
+.de-chart-editor .tab-header .ed-tabs__nav-wrap::after {
   background-color: rgba(235, 235, 235, 0.15) !important;
 }
-.de-chart-editor .tab-header .ed-tabs__item{
+
+.de-chart-editor .tab-header .ed-tabs__item {
   color: #A6A6A6 !important;
 }
-.de-chart-editor .drag-block-style{
+
+.de-chart-editor .drag-block-style {
   border: 1px dashed #5f5f5f !important;
   background-color: rgba(235, 235, 235, 0.05) !important;
 }
-.editor-light .item-span-style{
+
+.editor-light .item-span-style {
   color: #fff !important;
 }
+
 .ed-input--dark .ed-input__wrapper {
   background-color: #292929;
   box-shadow: none !important;
 }
-.el-loading-mask{
+
-  background-color: rgba(33,33,33, 0.9) !important;
+.el-loading-mask {
+  background-color: rgba(33, 33, 33, 0.9) !important;
 }
-.ed-input--dark .ed-input__wrapper:hover{
+
+.ed-input--dark .ed-input__wrapper:hover {
   box-shadow: none !important;
 }
-.ed-input-number--dark:not(.is-disabled) .ed-input-number__decrease:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper, .ed-input-number--dark:not(.is-disabled) .ed-input-number__increase:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper{
+
+.ed-input-number--dark:not(.is-disabled) .ed-input-number__decrease:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper,
+.ed-input-number--dark:not(.is-disabled) .ed-input-number__increase:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper {
   box-shadow: none !important;
   border: 1px solid #0089ff !important;
 }
+
 .ed-input__wrapper.is-focus {
   box-shadow: none !important;
 }
+
 .ed-input__wrapper:hover {
   box-shadow: none !important;
 }
-.ed-input__wrapper{
+
+.ed-input__wrapper {
   box-shadow: none !important;
 }
-.ed-input-number--light:not(.is-disabled).is-controls-right .ed-input-number__decrease:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper, .ed-input-number--light:not(.is-disabled).is-controls-right .ed-input-number__increase:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper{
+
+.ed-input-number--light:not(.is-disabled).is-controls-right .ed-input-number__decrease:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper,
+.ed-input-number--light:not(.is-disabled).is-controls-right .ed-input-number__increase:not(.is-disabled):hover~.ed-input:not(.is-disabled) .ed-input__wrapper {
   box-shadow: none !important;
   border: 1px solid #0089ff !important;
 }
-.ed-input-number--light .ed-input-number__decrease.is-disabled .ed-icon, .ed-input-number--light .ed-input-number__increase.is-disabled .ed-icon {
+
+.ed-input-number--light .ed-input-number__decrease.is-disabled .ed-icon,
+.ed-input-number--light .ed-input-number__increase.is-disabled .ed-icon {
   color: #ffffff;
 }
-.ed-input-number__decrease:hover, .ed-input-number__increase:hover {
+
+.ed-input-number__decrease:hover,
+.ed-input-number__increase:hover {
   color: #0089ff !important;
 }
-.ed-select .ed-input.is-disabled:not(.ed-input--dark) .ed-input__wrapper:hover{
+
-  box-shadow: none!important;;
+.ed-select .ed-input.is-disabled:not(.ed-input--dark) .ed-input__wrapper:hover {
+  box-shadow: none !important;
+  ;
 }
-.icon-checkbox:before{
+
-  content:''
+.icon-checkbox:before {
+  content: ''
+}
+
+.ed-select__wrapper {
+  background-color: transparent;
+  border: 1px solid #434343;
+  box-shadow: none;
+}
+
+.ed-select__placeholder {
+  color: #fff;
+}
+
+.ed-select__wrapper.is-focused,
+.ed-select__wrapper.is-hovering:not(.is-focused):not(.is-disabled) {
+  box-shadow: none;
+}
+
+.ed-select__popper.ed-popper {
+  background: rgb(41, 41, 41) !important;
+  color: #fff;
+  border: 1px solid #434343;
+}
+
+.ed-select-dropdown__item.is-hovering {
+  background: #434343 !important;
+}
+
+.ed-select-dropdown__item {
+  color: #fff;
+}
+
+.ed-select-dropdown__footer {
+  padding: 5px 0px;
+  border-top: 1px solid #434343;
+}
+
+.ed-input-group__append {
+  border-left: 0;
+  box-shadow: 0 1px 0 0 #636363 inset,
+    0 -1px 0 0 #636363 inset,
+    -1px 0 0 0 #636363 inset;
+}
+
+.ed-input-group--append .ed-input-group__append .ed-select .ed-select__wrapper {
+  box-shadow: none;
+}
+.ed-input.is-disabled .ed-input__wrapper{
+  background-color: transparent;
+}
+.ed-color-picker.is-custom{
+  border:1px solid #636363 !important;
+}
+.ed-select__wrapper.is-disabled{
+  background-color:#434343;
+  box-shadow:0 0 0 1px #787878 inset;
+}
+.ed-checkbox__input .ed-checkbox__inner:after{
+  background: transparent!important;
+}
+.ed-checkbox__input.is-checked .ed-checkbox__inner:after{
+  background: #fff !important;
+}
+.ed-select--light .ed-select__prefix:after {
+    background-color: #434343;
+}
+.ed-select__wrapper.is-disabled .ed-select--light .ed-select__prefix:after {
+    background-color: #292929;
+}
+.ed-input-number.is-controls-right .ed-input-number__decrease [class*=ed-icon], .ed-input-number.is-controls-right .ed-input-number__increase [class*=ed-icon]{
+  color: #ffffff;
+}
+.ed-input-number--light.is-disabled .ed-input-number__decrease.ed-input-number__decrease.ed-input-number__decrease, .ed-input-number--light.is-disabled .ed-input-number__increase.ed-input-number__increase.ed-input-number__increase{
+  border-color:#636363 !important;
+}
+.ed-checkbox__input.is-disabled .ed-checkbox__inner{
+  background-color:#434343;
+  border: 1px solid #787878;
+}
+.is-disabled .icon-btn.active{
+  background-color:#434343 !important;
+}
+.menu-item-padding span{
+  color: #fff !important;
+}
+.menu-item-padding .ed-icon{
+  color: #fff !important;
+}
+.ed-message-box{
+  background: #212121;
+}
+.ed-message-box__content{
+  color: #ffffff;
+}
+.ed-message-box__btns .ed-button--primary{
+  background: #0089ff;
+  border-color: #0089ff;
+}
+.ed-message-box__btns .ed-button.is-secondary{
+  color: #F2F4F5 !important;
+  background-color: #212121 !important;
+  border: 1px solid #434343 !important;
 }
 </style>

core/core-frontend/src/components/visualization/LinkageSet.vue

@@ -673,7 +673,7 @@ defineExpose({
 
 .preview {
   margin-top: 5px;
-  border: 1px solid #e6e6e6;
+  border: 1px solid #434343;
   border-radius: 4px;
   height: 470px !important;
   overflow: hidden;
@@ -681,7 +681,7 @@ defineExpose({
 }
 
 .preview-show {
-  border-left: 1px solid #e6e6e6;
+  border-left: 1px solid #434343;
   height: 470px;
   background-size: 100% 100% !important;
 }

core/core-frontend/src/components/visualization/OuterParamsSet.vue

@@ -785,7 +785,7 @@ defineExpose({
 
 .preview {
   margin-top: 5px;
-  border: 1px solid #e6e6e6;
+  border: 1px solid #434343;
   border-radius: 4px;
   height: 470px !important;
   overflow: hidden;
@@ -1100,6 +1100,7 @@ defineExpose({
 
 .ed-select-dropdown__header {
   padding: 0 8px;
+  border-bottom: 1px solid #434343 !important;
   .params-select--header {
     --ed-tabs-header-height: 32px;
     .ed-tabs__item {
@@ -1114,7 +1115,7 @@ defineExpose({
 }
 
 .params-attach-setting {
-  border-left: 1px solid #e6e6e6;
+  border-left: 1px solid #434343;
 }
 
 .params-attach-content {
@@ -1135,7 +1136,7 @@ defineExpose({
   cursor: pointer;
   font-size: 14px;
   color: #646a73;
-  margin: 10px 0 0 4px;
+  margin: 3px 0 0 4px;
 }
 :deep(.ed-tree--highlight-current .ed-tree-node.is-current > .ed-tree-node__content){
   background:  rgb(47,47,47) !important;
@@ -1159,3 +1160,14 @@ box-shadow: 0 0 0 1px #434343 inset;
   color: #3370ff;
 }
 </style>
+<style>
+.root-class .ed-button{
+  color: #F2F4F5;
+  background-color: #212121 !important;
+  border: 1px solid #363636 !important;
+}
+.root-class .ed-button--primary{
+  background-color: #0089ff !important;
+  border: 1px solid #0089ff !important;
+}
+</style>

core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TableThresholdEdit.vue

@@ -440,7 +440,7 @@ init()
           </el-button>
         </el-row>
 
-        <el-row :style="{ marginTop: '16px', borderTop: '1px solid #d5d6d8' }">
+        <el-row :style="{ marginTop: '16px', borderTop: '1px solid #656565' }">
           <el-row
             v-for="(item, index) in fieldItem.conditions"
             :key="index"
@@ -914,9 +914,9 @@ span {
   padding: 0 11px;
 }
 :deep(.ed-input__wrapper){
-  background-color: #252424 ;
+  background-color: #252424 !important;
-  box-shadow: none;
+  box-shadow: none !important;
-  border: 1px solid #636363;
+  border: 1px solid #636363 !important;
 }
 :deep(.ed-input__inner){
   color: #fff;

core/core-frontend/src/views/chart/components/editor/index.vue

@@ -3521,7 +3521,7 @@ const deleteChartFieldItem = id => {
               <div
                 ref="elDrag"
                 v-loading="fieldLoading && !fullscreenFlag"
-                style="height: calc(100% - 137px); min-height: 120px"
+                style="height: calc(100% - 137px); min-height: 120px;margin-top: 10px;"
               >
                 <div
                   class="padding-lr field-height first right-dimension"
@@ -4810,7 +4810,7 @@ span {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    color: #1f2329;
+    color: #fff;
     font-weight: 500;
 
     &.dark {
@@ -5347,6 +5347,7 @@ span {
   color: #A6A6A6 !important;
 }
 .de-chart-editor .dataset-search-input .ed-input__wrapper{
+  border:none !important;
   border-bottom: 1px solid hsla(0, 0%, 100%, 0.15) !important;
   background-color: #1a1a1a !important;
 }

core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue

@@ -823,7 +823,6 @@ const loadModelInternal = (loader, filePath) => {
 };
 // 新增方法 - 根据经纬度放置模型
 const placeModelByLngLat = (lng: number, lat: number) => {
-  debugger
   if (!model || !myChart?.getScene()) {
     console.warn('模型或地图场景未初始化');
     return;

core/core-frontend/src/views/common/DeResourceCreateOpt.vue

@@ -246,14 +246,14 @@ defineExpose({
 
 .preview {
   margin-top: 5px;
-  border: 1px solid #e6e6e6;
+  border: 1px solid #434343;
   height: 310px !important;
   overflow: hidden;
   background-size: 100% 100% !important;
 }
 
 .preview-show {
-  border-left: 1px solid #e6e6e6;
+  border-left: 1px solid #434343;
   height: 310px;
   background-size: 100% 100% !important;
 }

core/core-frontend/src/views/dashboard/index.vue

@@ -227,6 +227,18 @@ onMounted(async () => {
         // do init
       })
     }
+    if (createType === 'template') {
+      let deTemplateData
+      let preName
+      const templateParamsApply = JSON.parse(Base64.decode(decodeURIComponent(templateParams + '')))
+      await decompressionPre(templateParamsApply, result => {
+        deTemplateData = result
+        preName = deTemplateData.baseInfo?.preName
+        dvMainStore.setComponentData(deTemplateData['componentData'])
+        dvMainStore.setCanvasStyle(deTemplateData['canvasStyleData'])
+        dvMainStore.setCanvasViewInfo(deTemplateData['canvasViewInfo'])
+      })
+    }
   } else if (opt && opt === 'create') {
     dataInitState.value = false
     let watermarkBaseInfo

core/core-frontend/src/views/template/component/DeTemplateImport.vue

@@ -322,14 +322,14 @@ if (props.templateId) {
 }
 .preview {
   margin-top: -8px;
-  border: 1px solid #e6e6e6;
+  border: 1px solid #434343;
   height: 300px !important;
   overflow: auto;
   background-size: 100% 100% !important;
   border-radius: 4px;
 }
 .preview-show {
-  border-left: 1px solid #e6e6e6;
+  border-left: 1px solid #434343;
   height: 300px;
   background-size: 100% 100% !important;
 }

core/core-frontend/src/viewsnew/TemplateResource/addclass.vue

@@ -64,7 +64,7 @@ function cancel() {
 <style lang="less" scoped>
 .preview {
     margin-top: -8px;
-    border: 1px solid #e6e6e6;
+    border: 1px solid #434343;
     height: 300px !important;
     overflow: auto;
     background-size: 100% 100% !important;

core/core-frontend/src/viewsnew/TemplateResource/addtemplate.vue

@@ -17,7 +17,11 @@ const props = defineProps({
         required: true,
         default: 'insert'
     },
-
+    templateId: {
+        type: String,
+        required: true,
+        default: ''
+    },
 })
 const emits = defineEmits(['closeTemplateDialog', 'init'])
 const { t } = useI18n()
@@ -112,6 +116,12 @@ const classBackground = computed(() => {
     }
 })
 onMounted(() => {
+    if (props.templateId && props.templateId !== '') {
+    findOne(props.templateId).then(rsp => {
+        state.templateInfo = rsp.data
+        console.log(rsp)
+    })
+    }
     queryclass()
 })
 function queryclass() {
@@ -223,7 +233,7 @@ function classrefresh(){
 </script>
 <template>
     <div class="template-import">
-        <el-form ref="ruleFormRef" :model="state.templateInfo" label-width="80px">
+        <el-form ref="ruleFormRef" :model="state.templateInfo" label-width="80px" style="margin-top: 15px;">
             <el-form-item label="模板名称" prop="name">
                 <div class="flex-template">
                     <el-input v-model="state.templateInfo.name" />
@@ -258,7 +268,7 @@ function classrefresh(){
 <style lang="less" scoped>
 .preview {
     margin-top: -8px;
-    border: 1px solid #e6e6e6;
+    border: 1px solid #434343;
     height: 300px !important;
     overflow: auto;
     background-size: 100% 100% !important;

core/core-frontend/src/viewsnew/TemplateResource/index.vue

@@ -266,10 +266,11 @@ function closeTemplateDialog() {
 function classrefresh() {
   init()
 }
+const templateId = ref('')
 function editTemplate(item) { 
-  optType.value = 'template'
+  optType.value = 'update'
-  console.log(item)
+  dialogVisibles.value = true
-
+  templateId.value = item.id
 }
 function refresh(){
   searchMarketPreview().then(res => {
@@ -300,6 +301,7 @@ function delTemplate(item){
       })
     })
 }
+const isclassmask = ref(false)
 </script>
 <template>
   <div class="common-layout">
@@ -314,9 +316,14 @@ function delTemplate(item){
     </div>
     <div>
       <div class="class_list_box">
-        <div v-for="(item, index) in classList" :key="index"
+        <div v-for="(item, classindex) in classList" :key="classindex"
-          :class="activeIndex === index ? 'class_list_active' : 'class_list'" @click="classclick(index)">
+          :class="activeIndex === classindex ? 'class_list_active' : 'class_list'" @click="classclick(classindex)" 
+          @mouseover="mouseover(classindex)" @mouseleave="mouseleave">
           <div class="class_list_text">{{ item.category.label }} ({{ item.contents.length }}) </div>
+          <div v-if="mask == classindex" style="position: absolute;right: -10px;top: -20px;">
+              <img src="@/assets/newimg/icon/editpro.png" style="width: 14px;height: 14px;cursor: pointer;" @click="editTemplate(item)" title="编辑模板">
+              <img src="@/assets/newimg/icon/del.png" alt="" @click="delTemplate(item)" style="width: 14px;height: 14px;margin-left: 5px;cursor: pointer;" title="删除">
+          </div>
         </div>
       </div>
       <div class="application_list_box">
@@ -335,7 +342,7 @@ function delTemplate(item){
             </div>
             <div style="display: flex;justify-content: center;margin-top: 20px;">
               <div class="yulan" @click="preview(item, index)">预览</div>
-              <div class="mokuaipeizhi" @click="design(item, index)">设计</div>
+              <!-- <div class="mokuaipeizhi" @click="design(item, index)">设计</div> -->
             </div>
           </div>
         </div>
@@ -345,7 +352,7 @@ function delTemplate(item){
       <AddTemplateClass v-if="dialogVisible" @closeClassDialog="closeClassDialog" :classrefresh="classrefresh" />
     </el-dialog>
     <el-dialog v-model="dialogVisibles" title="导入模板" width="30%" :before-close="closeTemplateDialog">
-      <AddTemplate v-if="dialogVisibles" :optType="optType" :classList="classList" @init="init"
+      <AddTemplate v-if="dialogVisibles" :optType="optType" :classList="classList" :templateId="templateId" @init="init"
         @closeTemplateDialog="closeTemplateDialog" />
     </el-dialog>
   </div>
@@ -544,6 +551,7 @@ function delTemplate(item){
   font-size: 14px;
   color: #C9C9C9;
   cursor: pointer;
+  position: relative;
 }
 
 .class_list_active {
@@ -551,7 +559,7 @@ function delTemplate(item){
   height: 40px;
   line-height: 40px;
   text-align: center;
-  background-color: rgba(54, 55, 56, 1);
+  background-color: #0089ff;
   border-radius: 4px;
   font-size: 14px;
   color: #F2F4F5;
@@ -686,4 +694,8 @@ function delTemplate(item){
   background: #434343;
   color: #fff;
 }
+.ed-dialog__header{
+  padding: 0px;
+  padding-bottom: 10px;
+}
 </style>

core/core-frontend/src/viewsnew/TemplateResource/templateinfo.vue

@@ -12,6 +12,7 @@ import { useAppStoreWithOut } from '@/store/modules/app'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import { Base64 } from 'js-base64'
 import { useCache } from '@/hooks/web/useCache'
+import { moduleAdd } from '@/api/application/module'
 const props = defineProps({
     templateinfo: {
         type: Object,
@@ -142,9 +143,47 @@ const state = reactive({
         ]
     }
 })
+const isDialog = ref(false)
+const dataInfo: any = ref({
+    pid: '',
+    level: '',
+    type: '',
+    nodeType: '',
+    name: '',
+    appId: ''
+})
+const typeList: any = ref([{
+    code: '01',
+    name: '登录页面'
+}, {
+    code: '02',
+    name: '主框架页面'
+}, {
+    code: '03',
+    name: 'GIS大屏页面'
+}, {
+    code: '0301',
+    name: '数据看板页面'
+}, {
+    code: '04',
+    name: '二级弹窗页面'
+}, {
+    code: '05',
+    name: '数据填报页面'
+}, {
+    code: '06',
+    name: '文档资源页面'
+}, {
+    code: '09',
+    name: '自定义页面'
+}])
 onMounted(() => {
+    console.log(props.templateinfo, 66)
     init()
 })
+function paramsCloseForm() {
+    isDialog.value = false
+}
 function init() {
     treedata.value = []
     templateList.value = []
@@ -171,9 +210,37 @@ function init() {
 function preview(item) {
 
 }
+const createTemplateInfo = ref({})
 function design(item) {
-    templateApply(item)
+    createTemplateInfo.value = item
-    state.pid = props.templateinfo.pid
+    dataInfo.value = {
+        appId: props.templateinfo.appId,
+        pid: props.templateinfo.pid,
+        level: 2,
+        nodeType: '02',
+        name: item.name,
+        type: props.templateinfo.type,
+    }
+    isDialog.value = true
+
+}
+const isSwitch = ref(false)
+const projectId = ref('')
+function saveData() {
+    if (isSwitch.value == true) {
+        return
+    }
+    isSwitch.value = true
+    moduleAdd(dataInfo.value).then((res) => {
+        console.log(res)
+        projectId.value = res.data.data
+        ElMessage.success('添加成功')
+        isDialog.value = false
+        state.pid = props.templateinfo.pid
+        templateApply(createTemplateInfo.value)
+    }).catch(() => {
+        isSwitch.value = false
+    })
 }
 const templateApply = (template: any) => {
     state.curApplyTemplate = template
@@ -204,9 +271,9 @@ const apply = () => {
     state.curApplyTemplate.categoryNames.push(t('work_branch.recent'))
     const baseUrl =
         (['dataV', 'SCREEN'].includes(state.dvCreateForm.nodeType)
-            ? '#/dvCanvas?opt=create&createType=template'
+            ? '#/dvsCanvas?opt=create&createType=template&dvId=' + projectId.value
-            : '#/dashboard?opt=create&createType=template') +
+            : '#/dashboard?opt=create&createType=template&resourceId=' + projectId.value) +
-        '&templateParams=' +
+        '&pid=' + props.templateinfo.pid + '&appId='+ props.templateinfo.appId+ '&templateParams=' +
         encodeURIComponent(Base64.encode(JSON.stringify(templateTemplate)))
     let newWindow = null
     if (isEmbedded.value) {
@@ -254,7 +321,7 @@ function mouseleave() { // 鼠标移出遮罩层
 }
 </script>
 <template>
-    <div class="template-container">
+    <div class="template-container" style="margin-top: 15px;">
         <div class="template-header">
             <div>使用模板创建</div>
             <div>
@@ -281,14 +348,35 @@ function mouseleave() { // 鼠标移出遮罩层
                         </div>
                         <div class="mask_box" v-if="mask == index">
                             <div style="display: flex;justify-content: center;margin-top: 20px;">
-                                <div class="yulan" @click="preview(item, index)">预览</div>
+                                <div class="yulan" @click="preview(item)">预览</div>
-                                <div class="mokuaipeizhi" @click="design(item, index)">应用</div>
+                                <div class="mokuaipeizhi" @click="design(item)">创建</div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
+        <el-dialog title="新建模块" v-model="isDialog" width="570px" class="create-project-dialog"
+            :before-close="paramsCloseForm">
+            <el-form ref="paramsObjRef" :model="dataInfo" label-width="100px" style="margin-top: 15px;">
+                <el-form-item label="模块名称：" prop="name">
+                    <el-input :placeholder="'请输入'" v-model="dataInfo.name" />
+                </el-form-item>
+
+                <el-form-item label="模块类型" prop="type">
+                    <el-select v-model="dataInfo.type" placeholder="" style="width: 100%"
+                        :disabled="dataInfo.nodeType == '02'">
+                        <el-option v-for="item in typeList" :key="item.code" :label="item.name" :value="item.code" />
+                    </el-select>
+                </el-form-item>
+
+
+            </el-form>
+            <template #footer>
+                <el-button class="root-class" @click="paramsCloseForm">{{ t('dataset.cancel') }} </el-button>
+                <el-button class="root-class" type="primary" @click="saveData">{{ t('dataset.confirm') }} </el-button>
+            </template>
+        </el-dialog>
     </div>
 </template>
 

core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue

@@ -59,6 +59,7 @@ const dataInfo:any =ref({
 const treeData:any=ref([])// 树数据
 const defaultProps =  { label: "name" }
 const templatedialog = ref(false)
+const templateinfo = ref({})
 watch(() => props.projectInfo, val => { // 初始化数据
   projectInfo.value = val
   getInit()
@@ -92,8 +93,6 @@ function addClic(name:any,level:any,pid:any){ // 新建目录、模块
     dataInfo.value.nodeType = '02'
   }
   title.value = '新建' + name
-
-
   isSwitch.value = false
   isDialog.value=true
   
@@ -260,7 +259,7 @@ function delTreeClic(){ // 删除
     })
 
 }
-const templateinfo = ref({})
+
 function templateAdd(){
   templateinfo.value = dataInfo.value
   templatedialog.value = true
@@ -287,17 +286,17 @@ function templatedialogClose(){
       <img src="@/assets/newimg/u62.png" alt="">
     </template>
   </el-input>
-  <el-scrollbar style="height: calc(100vh - 260px);margin-top: 10px;">
+  <!-- <el-scrollbar style="margin-top: 10px;"> -->
     <el-tree v-loading="treeloading" id="treeRefClickId" ref="treeRef" node-key="id" :data="treeData" default-expand-all 
       :highlight-current="true" :props="defaultProps" :expand-on-click-node="false"
-      @node-click="handleNodeClick">
+      @node-click="handleNodeClick" style="height: calc(100vh - 170px);overflow: auto;">
       <template #default="{ data }">
         <!-- @mouseleave="isTreeDrag = false" -->
         <div class="el-tree-node__content"  >
           <img v-if="data.node_type=='01'" src="@/assets/newimg/u74.png" alt="" style="width: 14px;height: 13px;margin-right: 10px;">
           <div class="el-tree-node__label">{{ data.name }}</div>
           <div class="operation-button-box">
-            <div  style="    
+            <div style="    
             width: 20px;
              height: 24px;">
               <img v-if="data.node_type == '01'" src="@/assets/newimg/icon/add.png" alt="" style="width: 14px;height: 13px;" @click.stop="addTreeChildNode($event, Number(data.level)+1,data)">
@@ -313,7 +312,7 @@ function templatedialogClose(){
         </div>
       </template>
     </el-tree>
-  </el-scrollbar>
+  <!-- </el-scrollbar> -->
   <el-dialog
     :title="title"
     v-model="isDialog"
@@ -431,6 +430,7 @@ function templatedialogClose(){
   }
   :deep(.ed-tree-node__content){
     height: 40px;
+    position: relative;
   }
   .operation-button-box{
     display: none;
@@ -438,6 +438,7 @@ function templatedialogClose(){
     right: 20px;
     // display: flex;
     align-items: center;
+    top: 13px;
 
   }
   :deep(.ed-tree-node__content:hover){

core/core-frontend/src/viewsnew/common/DeResourceCreateOpt.vue

@@ -246,14 +246,14 @@ defineExpose({
 
 .preview {
   margin-top: 5px;
-  border: 1px solid #e6e6e6;
+  border: 1px solid #434343;
   height: 310px !important;
   overflow: hidden;
   background-size: 100% 100% !important;
 }
 
 .preview-show {
-  border-left: 1px solid #e6e6e6;
+  border-left: 1px solid #434343;
   height: 310px;
   background-size: 100% 100% !important;
 }

core/core-frontend/src/viewsnew/data-visualization/index.vue

@@ -413,6 +413,18 @@ onMounted(async () => {
         // do init
       })
     }
+    if (createType === 'template') {
+      let deTemplateData
+      let preName
+      const templateParamsApply = JSON.parse(Base64.decode(decodeURIComponent(templateParams + '')))
+      await decompressionPre(templateParamsApply, result => {
+        deTemplateData = result
+        preName = deTemplateData.baseInfo?.preName
+        dvMainStore.setComponentData(deTemplateData['componentData'])
+        dvMainStore.setCanvasStyle(deTemplateData['canvasStyleData'])
+        dvMainStore.setCanvasViewInfo(deTemplateData['canvasViewInfo'])
+      })
+    }
   } else if (opt && opt === 'create') {
     state.canvasInitStatus = false
     let watermarkBaseInfo