lex 9 месяцев назад
Родитель
Сommit
dd2d20cc62
1 измененных файлов с 58 добавлено и 38 удалено
  1. 58 38
      src/components/CCascader/index.tsx

+ 58 - 38
src/components/CCascader/index.tsx

@@ -136,13 +136,17 @@ export default defineComponent({
       const values = getValues(id);
       const names: any = [];
       audioPlayTypeList.value.forEach((item: any) => {
-        if (item.id === state.tempAudioPlayTypes && state.tempAudioPlayTypes) {
+        if (item.id === state.tempAudioPlayTypes && props.showAudioPlayType) {
           names.push(item.name);
         }
       });
-      values.forEach((item: any) => {
-        names.push(item.name);
-      });
+      if (state.tempAudioPlayTypes !== 'SING') {
+        values.forEach((item: any) => {
+          names.push(item.name);
+        });
+      }
+
+      console.log(values, names, 'names', props.value);
       if (props.showPath) {
         return names.join(' / ');
       } else {
@@ -206,12 +210,24 @@ export default defineComponent({
 
     // 提交
     const onConfirm = () => {
-      emit('update:value', state.childSelectId || state.tagActiveId);
-      emit('moreId', {
-        childId: state.childSelectId,
-        parentId: state.tagActiveId,
-        audioPlayTypes: state.audioPlayTypes
-      });
+      if (state.audioPlayTypes !== 'SING') {
+        emit('update:value', state.childSelectId || state.tagActiveId);
+        emit('moreId', {
+          childId: state.childSelectId,
+          parentId: state.tagActiveId,
+          audioPlayTypes: state.audioPlayTypes
+        });
+      } else {
+        emit('update:value', '');
+        emit('moreId', {
+          childId: '',
+          parentId: '',
+          audioPlayTypes: state.audioPlayTypes
+        });
+        state.tagActiveId = '';
+        state.childSelectId = null;
+      }
+
       state.tempAudioPlayTypes = state.audioPlayTypes;
       state.popoverShow = false;
     };
@@ -319,35 +335,39 @@ export default defineComponent({
                     </>
                   )}
 
-                  <div class={styles.baseContentTitle}>
-                    {props.options[0].columnName}
-                  </div>
-                  <div class={styles.baseContentWrap}>
-                    {props.options.map((subject: any) => (
-                      <span
-                        class={[
-                          styles.tag,
-                          (state.tagActiveId || '') == subject.id &&
-                            styles.tagActive
-                        ]}
-                        onClick={() => {
-                          if (state.tagActiveId !== subject.id) {
-                            state.childSelectId = null;
-                          }
-                          state.tagActiveId = subject.id;
+                  {state.audioPlayTypes !== 'SING' && (
+                    <>
+                      <div class={styles.baseContentTitle}>
+                        {props.options[0].columnName}
+                      </div>
+                      <div class={styles.baseContentWrap}>
+                        {props.options.map((subject: any) => (
+                          <span
+                            class={[
+                              styles.tag,
+                              (state.tagActiveId || '') == subject.id &&
+                                styles.tagActive
+                            ]}
+                            onClick={() => {
+                              if (state.tagActiveId !== subject.id) {
+                                state.childSelectId = null;
+                              }
+                              state.tagActiveId = subject.id;
 
-                          initParentSelect(subject);
-                        }}>
-                        {subject.name}
-                      </span>
-                    ))}
-                  </div>
-                  <ChildNodeSearch
-                    activeRow={state.selectParents}
-                    onSelectChildTag={(val: any) => {
-                      state.childSelectId = val;
-                    }}
-                  />
+                              initParentSelect(subject);
+                            }}>
+                            {subject.name}
+                          </span>
+                        ))}
+                      </div>
+                      <ChildNodeSearch
+                        activeRow={state.selectParents}
+                        onSelectChildTag={(val: any) => {
+                          state.childSelectId = val;
+                        }}
+                      />
+                    </>
+                  )}
                 </NScrollbar>
                 <div class={styles.btnGroup}>
                   <div class={[styles.btn, styles.btnCancel]} onClick={onReset}>