feat: 完善联动组件下的disabled

Qymh · Dec 26, 2019 · 35954aa · 35954aa
1 parent 268bfdc
commit 35954aa
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 17 deletions.
diff --git a/demo/js/index.js b/demo/js/index.js
@@ -318,6 +318,7 @@ const data5 = [
     children: [
       {
         value: '猪肉',
+        disabled: true,
         children: [
           {
             value: '前腿肉'

diff --git a/packages/@qymh/q-select/src/layer.ts b/packages/@qymh/q-select/src/layer.ts
@@ -310,6 +310,30 @@ class Layer {
     );
   }
 
+  /**
+   * 获取disabled后的索引
+   * @param data 当前转换值
+   * @param index 索引
+   */
+  getDisabledAfterIndex(data: DataTrans[], index: number) {
+    if (!data || !data[index]) {
+      return index;
+    }
+    while (data[index].disabled) {
+      index++;
+      if (index === this.data.length) {
+        index--;
+        break;
+      }
+    }
+    if (index === this.data.length - 1) {
+      while (data[index].disabled) {
+        index--;
+      }
+    }
+    return index;
+  }
+
   /**
    * 格式化index
    * @param dataTransLater 之后的数据
@@ -329,22 +353,10 @@ class Layer {
           this.index[i] = len - 1;
         }
       }
-      let index = this.index[i];
-      if (this.dataTrans[i]) {
-        while (this.dataTrans[i][index].disabled) {
-          index++;
-          if (index === this.dataTrans[i].length) {
-            index--;
-            break;
-          }
-        }
-        if (index === this.dataTrans[i].length - 1) {
-          while (this.dataTrans[i][index].disabled) {
-            index--;
-          }
-        }
-      }
-      this.index[i] = index;
+      this.index[i] = this.getDisabledAfterIndex(
+        this.dataTrans[i],
+        this.index[i]
+      );
       return v;
     });
     const lenDiff = this.index.length - dataTransLater.length;
@@ -898,7 +910,8 @@ class Layer {
         delete obj.children;
         dataTrans[index].push(obj as DataTrans);
       }
-      const curIndex = (preciseIndex || [])[index] || 0;
+      let curIndex = (preciseIndex || [])[index] || 0;
+      curIndex = this.getDisabledAfterIndex(dataTrans[index], curIndex);
       index++;
       if (child[curIndex]) {
         if (child[curIndex].children.length) {

diff --git a/packages/@qymh/q-select/types/options.d.ts b/packages/@qymh/q-select/types/options.d.ts
@@ -5,17 +5,20 @@ export type NotGangedData<K, V> =
 export type NotGangedDataObj<K, V> = {
   key?: K;
   value: V;
+  disabled?: boolean;
 };
 
 export type GangedData<K, V> = {
   key?: K;
   value: V;
+  disabled?: boolean;
   children: GangedData<K, V>[] | Array<string | number>;
 };
 
 export type DataCallBack<K, V> = {
   key: K;
   value: V;
+  disabled?: boolean;
   index: number;
 };
 

diff --git a/packages/@qymh/vue-q-select/types/component.d.ts b/packages/@qymh/vue-q-select/types/component.d.ts
@@ -7,17 +7,20 @@ export type NotGangedData<K, V> =
 export type NotGangedDataObj<K, V> = {
   key?: K;
   value: V;
+  disabled?: boolean;
 };
 
 export type GangedData<K, V> = {
   key?: K;
   value: V;
+  disabled?: boolean;
   children: GangedData<K, V>[] | Array<string | number>;
 };
 
 export type DataCallBack<K, V> = {
   key: K;
   value: V;
+  disabled?: boolean;
   index: number;
 };
 

diff --git a/typings/index.d.ts b/typings/index.d.ts
@@ -19,6 +19,7 @@ declare interface DataCallback extends DataTrans {
 
 declare type GangedData = {
   key?: any;
+  disabled?: boolean;
   value: any;
   children: GangedData[];
 };