更新

src/components/CCascader/index.module.less

@@ -120,7 +120,7 @@
   background: #FFFFFF !important;
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.12) !important;
   border-radius: 10px !important;
-  padding: 13px 0 !important;
+  padding: 13px 0 0 !important;
 }
 
 .baseScrollBar {
@@ -161,7 +161,7 @@
 
 .btnGroup {
   border-top: 1px solid #F2F2F2;
-  padding: 10px 25px;
+  padding: 14px 25px 16px;
   display: flex;
   align-items: center;
   width: 100%;

src/components/CCascader/index.tsx

@@ -127,7 +127,7 @@ export default defineComponent({
         return names.join(' / ');
       } else {
         const lastName = names[names.length - 1];
-        console.log(lastName, 'last names');
+        // console.log(lastName, 'last names');
         return lastName;
       }
     });
@@ -184,95 +184,6 @@ export default defineComponent({
     };
     return () => (
       <>
-        {/* <div
-          class={[
-            styles.nBaseCascaser,
-            state.popoverShow ? styles.nBaseCascaserActive : ''
-          ]}
-          onClick={(e: MouseEvent) => {
-            console.log(e.target);
-            if (state.popoverShow) {
-              state.popoverShow = false;
-            } else {
-              state.popoverShow = true;
-              state.x = e.clientX;
-              state.y = e.clientY;
-            }
-          }}>
-          <div class={styles['n-base-selection-tags']}>
-            <div class={styles['n-base-selection-input']}>
-              <div class={styles['n-base-selection-input__content']}>
-                {valueText.value}
-              </div>
-            </div>
-
-            <div class={[styles['n-base-suffix']]}>
-              <div class={[styles.arrow]}>
-                <img src={state.popoverShow ? arrowUp : arrowDown} />
-              </div>
-            </div>
-          </div>
-          <div
-            class={[
-              styles['n-base-selection-placeholder'],
-              styles['n-base-selection-overlay']
-            ]}>
-            {!valueText.value && (
-              <div class={styles.inner}>{props.placeholder}</div>
-            )}
-          </div>
-          <div class={styles['n-base-selection__border']}></div>
-          <div class={styles['n-base-selection__state-border']}></div>
-        </div>
-        <NPopover
-          placement={props.placement as any}
-          v-model:show={state.popoverShow}
-          showArrow={false}
-          trigger="manual"
-          x={state.x}
-          y={state.y}
-          displayDirective="show"
-          class={[styles.cascaderPopover, 'c-cascaderPopover']}>
-          <div class={styles.baseContent}>
-            <NScrollbar
-              class={styles.baseScrollBar}
-              style={{ maxHeight: '400px' }}>
-              <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={() => {
-                      state.tagActiveId = subject.id;
-                      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}>
-                重置
-              </div>
-              <div class={[styles.btn, styles.btnConfirm]} onClick={onConfirm}>
-                确认
-              </div>
-            </div>
-          </div>
-        </NPopover> */}
         <NPopover
           placement={props.placement as any}
           v-model:show={state.popoverShow}
@@ -331,7 +242,11 @@ export default defineComponent({
                             styles.tagActive
                         ]}
                         onClick={() => {
+                          if (state.tagActiveId !== subject.id) {
+                            state.childSelectId = null;
+                          }
                           state.tagActiveId = subject.id;
+
                           initParentSelect(subject);
                         }}>
                         {subject.name}