Merge remote-tracking branch 'origin/dev-v2' into dev-v2

.github/workflows/llm-code-review.yml

@@ -14,12 +14,12 @@ jobs:
     steps:
       - uses: fit2cloud/LLM-CodeReview-Action@main
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.FIT2CLOUDRD_LLM_CODE_REVIEW_TOKEN }}
           OPENAI_API_KEY: ${{ secrets.ALIYUN_LLM_API_KEY }}
           LANGUAGE: Chinese
           OPENAI_API_ENDPOINT: https://dashscope.aliyuncs.com/compatible-mode/v1
           MODEL: qwen2-1.5b-instruct
-          PROMPT: "请检查下面的代码差异是否有不规范、潜在的问题或者优化建议"
+          PROMPT: "请检查下面的代码差异是否有不规范、潜在的问题或者优化建议，用中文回答。"
           top_p: 1
           temperature: 1
           # max_tokens: 10000

core/core-frontend/src/custom-component/v-query/Component.vue

@@ -488,6 +488,9 @@ const clearData = () => {
     })
   })
   ;(list.value || []).reduce((pre, next) => {
+    if (!next.visible) {
+      return pre
+    }
     next.selectValue = next.multiple || +next.displayType === 7 ? [] : undefined
     if (next.optionValueSource === 1 && next.defaultMapValue?.length) {
       next.mapValue = next.multiple ? [] : undefined
@@ -564,6 +567,15 @@ const queryData = () => {
         requiredName = next.name
       }
     }
+
+    if (next.displayType === '22') {
+      if (
+        [next.numValueEnd, next.numValueStart].filter(itx => ![null, undefined, ''].includes(itx))
+          .length === 1
+      ) {
+        requiredName = next.name
+      }
+    }
     const keyList = Object.entries(next.checkedFieldsMap)
       .filter(ele => next.checkedFields.includes(ele[0]))
       .filter(ele => !!ele[1])

core/core-frontend/src/hooks/web/useFilter.ts

@@ -246,13 +246,8 @@ const duplicateRemoval = arr => {
 export const searchQuery = (queryComponentList, filter, curComponentId, firstLoad) => {
   queryComponentList.forEach(ele => {
     if (!!ele.propValue?.length) {
-      ele.propValue
+      ele.propValue.forEach(item => {
-        .filter(itx => itx.visible)
+        if (item.checkedFields.includes(curComponentId) && item.checkedFieldsMap[curComponentId]) {
-        .forEach(item => {
-          if (
-            item.checkedFields.includes(curComponentId) &&
-            item.checkedFieldsMap[curComponentId]
-          ) {
           let selectValue
           const {
             selectValue: value,

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

@@ -228,6 +228,7 @@ watch(
 
 <style scoped lang="less">
 .mobile-background-selector {
+  padding-left: 16px;
   :deep(.ed-form-item) {
     display: block;
     margin-bottom: 8px;

de-xpack

@@ -1 +1 @@
-Subproject commit 9b96136877d95f5e02477002cdbe513c9fecfc59
+Subproject commit 15fd94f9b316a6956be8eddaf4ba6196dcccb7a2