fixes little mistakes of tree checkbox setting

rdkmaster · Aug 24, 2018 · 2675c0b · 2675c0b
1 parent 0e135be
commit 2675c0b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/app/demo/tree/editable/demo.component.ts b/src/app/demo/tree/editable/demo.component.ts
@@ -20,6 +20,11 @@ export class ZtreeDemoEditableComponent {
         },
         edit: {
             enable: true
+        },
+        check: {
+            enable: true,
+            chkStyle: "checkbox",
+            chkboxType: { "Y": "ps", "N": "ps" }
         }
     };
 

diff --git a/src/jigsaw/assets/scss/index.scss b/src/jigsaw/assets/scss/index.scss
@@ -159,6 +159,12 @@
                 content: "\f00c";
             }
         }
+        &.checkbox_true_part, &.checkbox_true_part_focus {
+            background: $border-color-split;
+            &:before {
+                content: "\f00c";
+            }
+        }
     }
     &.edit {
         margin-left: 5px;

diff --git a/src/jigsaw/component/tree/ztree-types.ts b/src/jigsaw/component/tree/ztree-types.ts
@@ -55,19 +55,14 @@ export class ZTreeSettingData {
     keep?: ZTreeSettingDataKeep;
 }
 
-
-export enum ZTreeSettingCheckStyle {
-    checkbox, radio
-}
-
 export enum ZTreeSettingCheckRadioType {
     level, all
 }
 
 export class ZTreeSettingCheck {
     autoCheckTrigger?: boolean;
-    chkBoxType?: JSON;
-    chkStyle?: ZTreeSettingCheckStyle;
+    chkboxType?: {"Y"?: string, "N"?: string};
+    chkStyle?: "checkbox" | "radio";
     enable?: boolean;
     nocheckInherit?: boolean;
     chkDisabledInherit?: boolean;