Merge branch 'dev-v2' into pr@dev-v2_dzz

core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java

@@ -6,6 +6,7 @@ import io.dataease.api.dataset.dto.PreviewSqlDTO;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.dataset.manage.DatasetDataManage;
 import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.utils.LogUtil;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -43,8 +44,15 @@ public class DatasetDataServer implements DatasetDataApi {
     }
 
     @Override
-    public List<String> getFieldEnum(List<Long> ids) throws Exception {
-        return datasetDataManage.getFieldEnum(ids);
+    public List<String> getFieldEnum(List<Long> ids) {
+        try{
+           return datasetDataManage.getFieldEnum(ids);
+        }catch (Exception e){
+            e.printStackTrace();
+            LogUtil.error(e);
+            return null;
+        }
+
     }
 
     @Override

core/core-frontend/src/custom-component/de-tabs/Component.vue

@@ -1,5 +1,10 @@
 <template>
-  <div style="width: 100%; height: 100%" :class="headClass" ref="tabComponentRef">
+  <div
+    v-if="state.tabShow"
+    style="width: 100%; height: 100%"
+    :class="headClass"
+    ref="tabComponentRef"
+  >
     <de-custom-tab
       v-model="editableTabsValue"
       @tab-add="addTab"
@@ -153,7 +158,8 @@ const state = reactive({
   activeTabName: '',
   curItem: {},
   textarea: '',
-  dialogVisible: false
+  dialogVisible: false,
+  tabShow: true
 })
 const tabsAreaScroll = ref(false)
 const editableTabsValue = ref(null)
@@ -214,6 +220,10 @@ function deleteCur(param) {
       const activeIndex =
         (len - 1 + element.value.propValue.length) % element.value.propValue.length
       editableTabsValue.value = element.value.propValue[activeIndex].name
+      state.tabShow = false
+      nextTick(() => {
+        state.tabShow = true
+      })
     }
   }
 }

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

@@ -171,11 +171,11 @@ const update = (licKey: string) => {
       </div>
       <div class="item">
         <div class="label">{{ $t('about.serial_no') }}</div>
-        <div class="value">{{ license.serialNo }}</div>
+        <div class="value">{{ license.serialNo || '-' }}</div>
       </div>
       <div class="item">
         <div class="label">{{ $t('about.remark') }}</div>
-        <div class="value ellipsis">{{ license.remark }}</div>
+        <div class="value ellipsis">{{ license.remark || '-' }}</div>
       </div>
 
       <div v-if="isAdmin" style="margin-top: 24px" class="lic_rooter">

core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue

@@ -44,6 +44,20 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate(valid => {
     if (valid) {
+      if (
+        state.form.dsExecuteTime === 'minute' &&
+        (Number(state.form.dsIntervalTime) < 1 || Number(state.form.dsIntervalTime) > 59)
+      ) {
+        ElMessage.error('分钟超出范围【1-59】')
+        return
+      }
+      if (
+        state.form.dsExecuteTime === 'hour' &&
+        (Number(state.form.dsIntervalTime) < 1 || Number(state.form.dsIntervalTime) > 23)
+      ) {
+        ElMessage.error('小时超出范围【1-23】')
+        return
+      }
       const param = buildSettingList()
       if (param.length < 2) {
         return

de-xpack

@@ -1 +1 @@
-Subproject commit 51a402bb2a1da18dd34a98f0de398f1be0c22682
+Subproject commit 0352814e63af722b8811159704d36d9ca2244c0d

installer/dataease/bin/apisix/init.sh

@@ -67,7 +67,8 @@ curl http://127.0.0.1:9180/apisix/admin/services/10 -X PUT -H "X-API-KEY: $DE_AP
         "X-DE-LINK-TOKEN",
         "X-EMBEDDED-TOKEN",
         "X-DE-ASK-TOKEN",
-        "Content-Type"
+        "Content-Type",
+        "Origin"
       ],
       "request_method": "POST",
       "upstream_headers": [

installer/install.sh

@@ -61,7 +61,7 @@ cd $DE_RUN_BASE
 env | grep DE_ >.env
 
 mkdir -p ${DE_RUN_BASE}/{cache,logs,conf}
-mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data}
+mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data,geo}
 mkdir -p ${DE_RUN_BASE}/apisix/logs
 chmod 777 ${DE_RUN_BASE}/apisix/logs ${DE_RUN_BASE}/data/etcd_data
 

sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java

@@ -14,4 +14,6 @@ public class LarkSettingCreator implements Serializable {
     private String callBack;
 
     private Boolean enable;
+
+    private Boolean valid;
 }

sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java

@@ -16,4 +16,6 @@ public class LarkInfoVO implements Serializable {
     private String callBack;
 
     private Boolean enable = false;
+
+    private Boolean valid = false;
 }