添加搜索条件和搜索权限

components.d.ts

@@ -15,7 +15,6 @@ declare module '@vue/runtime-core' {
     NBreadcrumb: typeof import('naive-ui')['NBreadcrumb']
     NBreadcrumbItem: typeof import('naive-ui')['NBreadcrumbItem']
     NButton: typeof import('naive-ui')['NButton']
-    NCheckbox: typeof import('naive-ui')['NCheckbox']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
     NCountdown: typeof import('naive-ui')['NCountdown']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
@@ -37,7 +36,6 @@ declare module '@vue/runtime-core' {
     NRadio: typeof import('naive-ui')['NRadio']
     NRadioGroup: typeof import('naive-ui')['NRadioGroup']
     NSpace: typeof import('naive-ui')['NSpace']
-    NSpin: typeof import('naive-ui')['NSpin']
     NTooltip: typeof import('naive-ui')['NTooltip']
     Recharge: typeof import('./src/components/Lockscreen/Recharge.vue')['default']
     RouterError: typeof import('./src/components/RouterError/RouterError.vue')['default']

src/views/music-library/music-sheet/component/music-list.tsx

@@ -12,6 +12,7 @@ import {
   NIcon,
   NImage,
   NInput,
+  NInputNumber,
   NModal,
   NSelect,
   NSpace,
@@ -76,7 +77,7 @@ export default defineComponent({
         musicCategoryId: null, //曲目分类
         musicalInstrumentId: null, // 乐器ID
         dataCorrect: null, // 数据修复
-        generateFirst: null, // 妙级课需要针对生成节拍器音频
+        generateFirst: null, // 妙级课需要针对生成节拍器音频(暂时不用)
         audioPlayTypes: null, // 场景
         generateMetronomeAudio: null // 是否生成节拍器音频
       },
@@ -468,13 +469,14 @@ export default defineComponent({
         const sourceType = state.searchForm.sourceType
         const userId = state.searchForm.userId
         const audioPlayTypes = state.searchForm.audioPlayTypes
-
+        const { generateFirst, musicCategoryId, ...res } = state.searchForm
         let search = {
-          ...state.searchForm,
+          ...res,
           useAppId: state.searchForm.useAppId
             ? state.searchForm.useAppId.join(',')
             : state.searchForm.useAppId,
-          audioPlayTypes: [] as any
+          audioPlayTypes: [] as any,
+          musicCategoryId: musicCategoryId || generateFirst
         } as any
         if (audioPlayTypes) {
           if (audioPlayTypes === 'PLAY_SING') {
@@ -635,6 +637,7 @@ export default defineComponent({
             <NSelect
               placeholder="请选择总谱渲染"
               v-model:value={state.searchForm.isScoreRender}
+              filterable
               options={
                 [
                   {
@@ -652,6 +655,7 @@ export default defineComponent({
           </NFormItem>
           <NFormItem label="曲目分类" path="musicCategoryId">
             <NCascader
+              filterable
               valueField="id"
               labelField="name"
               children-field="musicSheetCategoriesList"
@@ -673,9 +677,9 @@ export default defineComponent({
           <NFormItem label="可用乐器" path="musicalInstrumentId">
             <NSelect
               placeholder="请选择可用乐器"
+              filterable
               v-model:value={state.searchForm.musicalInstrumentId}
               options={state.instrumentList}
-              filterable
               clearable
             />
           </NFormItem>
@@ -689,6 +693,7 @@ export default defineComponent({
           <NFormItem label="作者属性" path="sourceType">
             <NSelect
               placeholder="请选择作者属性"
+              filterable
               v-model:value={state.searchForm.sourceType}
               options={getSelectDataFromObj(musicSheetSourceType)}
               onUpdateValue={async (value: any) => {
@@ -710,6 +715,7 @@ export default defineComponent({
               v-model:value={state.searchForm.applicationId}
               options={state.useProjectData}
               clearable
+              filterable
               onUpdateValue={async (value: any) => {
                 state.searchForm.applicationId = value
                 if (value) {
@@ -765,6 +771,7 @@ export default defineComponent({
               v-model:value={state.searchForm.useAppId}
               options={state.useProjectData}
               multiple
+              filterable
               maxTagCount={1}
             />
           </NFormItem>
@@ -773,6 +780,7 @@ export default defineComponent({
               v-model={[state.searchForm.status, 'value']}
               placeholder="请选择状态"
               clearable
+              filterable
               options={
                 [
                   {
@@ -792,6 +800,7 @@ export default defineComponent({
               v-model={[state.searchForm.appAuditFlag, 'value']}
               placeholder="请选择审核版本"
               clearable
+              filterable
               options={
                 [
                   {
@@ -806,11 +815,21 @@ export default defineComponent({
               }
             />
           </NFormItem>
-          <NFormItem label="数据修复" path="dataCorrect">
+          <NFormItem label="场景" path="audioPlayTypes">
+            <NSelect
+              v-model:value={state.searchForm.audioPlayTypes}
+              placeholder="请选择场景"
+              filterable
+              options={audioPlayTypeArray}
+              clearable
+            />
+          </NFormItem>
+          <NFormItem label="图片修复" path="dataCorrect" v-auth="music-list/search/data1836581471828160514">
             <NSelect
               v-model={[state.searchForm.dataCorrect, 'value']}
-              placeholder="请选择数据修复"
+              placeholder="请选择图片修复"
               clearable
+              filterable
               options={
                 [
                   {
@@ -825,11 +844,12 @@ export default defineComponent({
               }
             />
           </NFormItem>
-          <NFormItem label="节拍器音频" path="generateMetronomeAudio">
+          <NFormItem label="节拍器修复" path="generateMetronomeAudio" v-auth="music-list/search/data1836581471828160514">
             <NSelect
               v-model={[state.searchForm.generateMetronomeAudio, 'value']}
-              placeholder="请选择是否生成节拍器音频"
+              placeholder="请选择节拍器修复"
               clearable
+              filterable
               options={
                 [
                   {
@@ -844,33 +864,11 @@ export default defineComponent({
               }
             />
           </NFormItem>
-          <NFormItem label="妙极客节拍器" path="generateFirst">
-            <NSelect
-              v-model={[state.searchForm.generateFirst, 'value']}
-              placeholder="请选择妙极客节拍器"
-              clearable
-              options={
-                [
-                  {
-                    label: '是',
-                    value: true
-                  },
-                  {
-                    label: '否',
-                    value: false
-                  }
-                ] as any
-              }
-            />
-          </NFormItem>
-          <NFormItem label="场景" path="audioPlayTypes">
-            <NSelect
-              v-model:value={state.searchForm.audioPlayTypes}
-              placeholder="请选择场景"
-              options={audioPlayTypeArray}
-              clearable
-            />
+          <NFormItem label="修复数据分类" path="generateFirst" v-auth="music-list/search/data1836581471828160514">
+            <NInputNumber showButton={false} placeholder="请输入修复数据分类" clearable v-model:value={state.searchForm.generateFirst} />
+
           </NFormItem>
+          
           <NFormItem>
             <NSpace>
               <NButton type="primary" onClick={onSearch}>