Merge branch 'main' of github.com:dataease/dataease into main

backend/src/main/java/io/dataease/listener/AppStartListener.java

@@ -1,8 +1,10 @@
 package io.dataease.listener;
 
 import io.dataease.base.domain.DatasetTableTask;
+import io.dataease.commons.constants.ScheduleType;
 import io.dataease.service.ScheduleService;
 import io.dataease.service.dataset.DataSetTableTaskService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.annotation.Order;
@@ -26,8 +28,16 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
         List<DatasetTableTask> list = dataSetTableTaskService.list(new DatasetTableTask());
         for (DatasetTableTask task : list) {
             try {
-                if (task.getEndTime() != null && task.getEndTime() > 0) {
-                    if (task.getEndTime() > System.currentTimeMillis()) {
+                if (StringUtils.equalsIgnoreCase(task.getRate(), ScheduleType.CRON.toString())) {
+                    if (StringUtils.equalsIgnoreCase(task.getEnd(), "1")) {
+                        if (task.getEndTime() != null && task.getEndTime() > 0) {
+                            if (task.getEndTime() > System.currentTimeMillis()) {
+                                scheduleService.addSchedule(task);
+                            }
+                        } else {
+                            scheduleService.addSchedule(task);
+                        }
+                    } else {
                         scheduleService.addSchedule(task);
                     }
                 } else {

frontend/src/components/canvas/components/Editor/ComponentWrapper.vue

@@ -9,6 +9,7 @@
       :is="config.component"
       v-if="config.type==='custom'"
       :id="'component' + config.id"
+      class="component-custom"
       :style="getComponentStyleDefault(config.style)"
       :out-style="config.style"
       :element="config"
@@ -99,4 +100,9 @@ export default {
 .gap_class{
   padding:3px;
 }
+.component-custom {
+  outline: none;
+  width: 100%;
+  height: 100%;
+}
 </style>

frontend/src/components/widget/DeWidget/DeDate.vue

@@ -8,6 +8,7 @@
     :start-placeholder="options.attrs.startPlaceholder"
     :end-placeholder="options.attrs.endPlaceholder"
     :placeholder="options.attrs.placeholder"
+    style="min-height: 36px;"
     @change="dateChange"
   />
 </template>

frontend/src/components/widget/DeWidget/DeInputSearch.vue

@@ -2,7 +2,7 @@
 
   <el-input
     v-if="options!== null && options.attrs!==null"
-    v-model="options.value"
+    v-model="values"
     resize="vertical"
     :placeholder="options.attrs.placeholder"
     @keyup.enter.native="search"
@@ -46,7 +46,7 @@ export default {
     setCondition() {
       const param = {
         component: this.element,
-        value: !this.options.value ? [] : Array.isArray(this.options.value) ? this.options.value : [this.options.value],
+        value: !this.values ? [] : Array.isArray(this.values) ? this.values : [this.values],
         operator: this.operator
       }
       this.inDraw && this.$store.commit('addViewFilter', param)

frontend/src/layout/components/Topbar.vue

@@ -3,7 +3,7 @@
     <div v-loading="!axiosFinished" class="log">
       <!--      <img      v-if="!logoUrl" src="@/assets/DataEase-color.png" width="140" alt="" style="padding-top: 10px;">-->
       <svg-icon v-if="!logoUrl && axiosFinished" icon-class="DataEase" custom-class="top-nav-logo-icon" />
-      <img v-else :src="logoUrl && axiosFinished" width="140" alt="" style="padding-top: 10px;">
+      <img v-if="logoUrl && axiosFinished" :src="logoUrl" width="140" alt="" style="padding-top: 10px;">
     </div>
     <el-menu
       :active-text-color="variables.topMenuActiveText"

frontend/src/views/panel/filter/filterDialog.vue

@@ -628,7 +628,7 @@ export default {
     min-width: 230px !important;
     max-width: 260px !important;
     height: 100%;
-    min-height: 390px;
+    min-height: 100px;
     padding: 5px;
     border: none;
     padding-bottom: 20px !important;