浏览代码

问题修改

zouxuan 1 年之前
父节点
当前提交
016d9f2981

+ 0 - 28
components.d.ts

@@ -10,35 +10,7 @@ declare module '@vue/runtime-core' {
     Application: typeof import('./src/components/Application/Application.vue')['default']
     CountTo: typeof import('./src/components/CountTo/CountTo.vue')['default']
     Lockscreen: typeof import('./src/components/Lockscreen/Lockscreen.vue')['default']
-    NAvatar: typeof import('naive-ui')['NAvatar']
-    NBackTop: typeof import('naive-ui')['NBackTop']
-    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']
-    NDrawer: typeof import('naive-ui')['NDrawer']
-    NDropdown: typeof import('naive-ui')['NDropdown']
-    NForm: typeof import('naive-ui')['NForm']
-    NFormItem: typeof import('naive-ui')['NFormItem']
-    NIcon: typeof import('naive-ui')['NIcon']
-    NInput: typeof import('naive-ui')['NInput']
-    NInputGroup: typeof import('naive-ui')['NInputGroup']
-    NLayout: typeof import('naive-ui')['NLayout']
-    NLayoutContent: typeof import('naive-ui')['NLayoutContent']
-    NLayoutHeader: typeof import('naive-ui')['NLayoutHeader']
-    NLayoutSider: typeof import('naive-ui')['NLayoutSider']
-    NMenu: typeof import('naive-ui')['NMenu']
-    NMessageProvider: typeof import('naive-ui')['NMessageProvider']
-    NModal: typeof import('naive-ui')['NModal']
-    NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
-    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']
     RouterLink: typeof import('vue-router')['RouterLink']

+ 2 - 1
src/views/music-library/music-sheet/modal/music-operation.tsx

@@ -696,6 +696,7 @@ export default defineComponent({
           forms.subjectIds = data.subjectIds?.split(',') || []
           forms.sourceType = data.sourceType
           forms.musicSheetExtend = data.musicSheetExtend
+          forms.repeatedBeats = data.repeatedBeats
 
 
           // 获取渐变 和 是否多声部
@@ -1200,7 +1201,7 @@ export default defineComponent({
                       path="multiTracksSelection"
                       rule={[
                         {
-                          required: true,
+                          required: false,
                           message: `请选择${forms.musicSheetType === 'SINGLE' ? '页面渲染声轨' : '用户可切换声轨'}`
                         }
                       ]}

+ 11 - 1
src/views/music-library/project-music-sheet/module/gym/music-sheet-gym.tsx

@@ -450,7 +450,17 @@ export default defineComponent({
                 <NSelect
                     placeholder="请选择收费方式"
                     v-model:value={state.searchForm.paymentType}
-                    options={getSelectDataFromObj(musicSheetPaymentType)}
+                    // options={getSelectDataFromObj(musicSheetPaymentType)}
+                    options={[
+                      {
+                        label: '免费',
+                        value: 'FREE',
+                      },
+                      {
+                        label: '收费',
+                        value: 'CHARGE',
+                      }
+                    ] as any}
                     clearable
                 >
                 </NSelect>