Merge branch 'master' of gitcode.com:hk_openRepo/OpenRepo_Portal

 Conflicts:

	src/views/Jyh/Search/Components/OssQuery.vue

src/components/AdvanceSearch/index.vue

@@ -13,18 +13,13 @@
             <d-input placeholder="请输入软件/组件名称" v-model="formData.searchWord"/>
           </d-form-item>
         </d-col>
-        <d-col :span="8">
-          <d-form-item field="licenseRisk" label="license集成风险" help-tips="license集成风险说明">
-            <d-select :options="licenseRiskList" v-model="formData.licenseStrengths"></d-select>
-          </d-form-item>
-        </d-col>
-      </d-row>
-      <d-row :gutter="16">
         <d-col :span="8">
           <d-form-item field="version" label="软件版本">
             <d-input v-model="formData.softwareVersion"/>
           </d-form-item>
         </d-col>
+      </d-row>
+      <d-row :gutter="16">
         <d-col :span="8">
           <d-form-item field="dependency" label="依赖软件">
             <d-input v-model="formData.dependentSoftware"/>
@@ -35,19 +30,17 @@
             <d-select :options="languageList" v-model="formData.programmingLanguage"></d-select>
           </d-form-item>
         </d-col>
-      </d-row>
-      <d-row :gutter="16">
         <d-col :span="8">
           <d-form-item field="date" label="版本发布日期">
-            <d-range-date-picker-pro v-model="formData.dateRange"  style="width: 100%;"/>
+            <d-range-date-picker-pro v-model="formData.dateRange"  style="width: 100%;"
+            :placeholder="['开始日期', '结束日期']"/>
           </d-form-item>
         </d-col>
       </d-row>
-
       <slot name="operation">
         <gc-form-operation style="display: flex; justify-content: center; gap: 8px;">
-          <d-button variant="solid" @click="submitForm">搜索</d-button>
-          <d-button @click="cancel">取消</d-button>
+          <d-button style="width: 96px; height: 32px;" variant="solid" @click="submitForm">搜索</d-button>
+          <d-button style="width: 96px; height: 32px;" @click="cancel">取消</d-button>
         </gc-form-operation>
       </slot>
     </d-form>
@@ -66,7 +59,6 @@ const props = defineProps({
     default: () => ({
       licenseName: '',
       searchWord: '',
-      licenseStrengths: '',
       softwareVersion: '',
       dependentSoftware: '',
       programmingLanguage: '',
@@ -76,20 +68,6 @@ const props = defineProps({
 })
 const emit = defineEmits(['submit', 'cancel', 'update:modelValue']);
 const languageList = ref([]);
-const licenseRiskList = ref([
-  {
-    name: '高',
-    value: 'high'
-  },
-  {
-    name: '中',
-    value: 'medium'
-  },
-  {
-    name: '低',
-    value: 'low'
-  }
-])
 
 const formData = ref({...props.modelValue});
 
@@ -113,7 +91,6 @@ const cancel = () => {
   formData.value = {
     licenseName: '',
     searchWord: '',
-    licenseStrengths: '',
     softwareVersion: '',
     dependentSoftware: '',
     programmingLanguage: '',