ngx-tethys 18.0.0 → 18.0.2

package/form/styles/form-check.scss

@@ -89,7 +89,7 @@ input[type='checkbox'] {
     }
 
     &:disabled {
-        background-color: rgba($color: #000000, $alpha: 0.03);
+        background-color: rgba($color: variables.$black, $alpha: 0.03);
         cursor: variables.$disabled-cursor;
     }
 }
@@ -188,11 +188,10 @@ input[type='radio'] {
     color: variables.$input-label-color;
     transition: color variables.$transition-duration-normal;
     user-select: none;
+    margin-bottom: 0;
     .form-check-inline & {
         margin-left: variables.$form-check-label-margin-l;
     }
-
-    margin-bottom: 0;
 }
 
 // checked style

package/form/styles/mixin.scss

@@ -62,7 +62,7 @@
         margin-top: 0.1rem;
         font-size: 0.875rem;
         line-height: 1;
-        color: #fff;
+        color: variables.$white;
         background-color: rgba($color, 0.8);
         border-radius: 0.2rem;
     }

package/grid/examples/basic/basic.component.scss

@@ -1,15 +1,17 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .blue,
     .light-blue {
         text-align: center;
         height: 56px;
         line-height: 56px;
-        color: white;
+        color: variables2.$white;
     }
     .blue {
-        background: #6698ff;
+        background: variables2.$primary;
     }
     .light-blue {
-        background: rgba(#6698ff, 70%);
+        background: rgba(variables2.$primary, 70%);
     }
 }

package/grid/examples/flex/flex.component.scss

@@ -1,3 +1,5 @@
+@use 'variables.scss' as variables2;
+
 :host {
     display: block;
     overflow: auto;
@@ -15,12 +17,12 @@
         text-align: center;
         height: 56px;
         line-height: 56px;
-        color: white;
+        color: variables2.$white;
     }
     .blue {
-        background: #6698ff;
+        background: variables2.$primary;
     }
     .light-blue {
-        background: rgba(#6698ff, 70%);
+        background: rgba(variables2.$primary, 70%);
     }
 }

package/grid/examples/gap/gap.component.scss

@@ -1,15 +1,17 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .blue,
     .light-blue {
         text-align: center;
         height: 56px;
         line-height: 56px;
-        color: white;
+        color: variables2.$white;
     }
     .blue {
-        background: #6698ff;
+        background: variables2.$primary;
     }
     .light-blue {
-        background: rgba(#6698ff, 70%);
+        background: rgba(variables2.$primary, 70%);
     }
 }

package/grid/examples/offset/offset.component.scss

@@ -1,15 +1,17 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .blue,
     .light-blue {
         text-align: center;
         height: 56px;
         line-height: 56px;
-        color: white;
+        color: variables2.$white;
     }
     .blue {
-        background: #6698ff;
+        background: variables2.$primary;
     }
     .light-blue {
-        background: rgba(#6698ff, 70%);
+        background: rgba(variables2.$primary, 70%);
     }
 }

package/grid/examples/responsive/responsive.component.scss

@@ -1,9 +1,11 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .demo-desc {
         display: inline-block;
         margin: 16px 0;
         padding: 0 8px;
-        color: #999;
+        color: variables2.$gray-600;
     }
 
     .blue,
@@ -11,12 +13,12 @@
         text-align: center;
         height: 56px;
         line-height: 56px;
-        color: white;
+        color: variables2.$white;
     }
     .blue {
-        background: #6698ff;
+        background: variables2.$primary;
     }
     .light-blue {
-        background: rgba(#6698ff, 70%);
+        background: rgba(variables2.$primary, 70%);
     }
 }

package/grid/examples/row-col/row-col.component.scss

@@ -1,3 +1,5 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .thy-row + .thy-row {
         margin-top: 16px;
@@ -6,14 +8,14 @@
         min-height: 56px;
         line-height: 56px;
         padding: 5px 0;
-        color: #fff;
+        color: variables2.$white;
         text-align: center;
         border-radius: 0;
-        background: #6698ff;
+        background: variables2.$primary;
     }
     .thy-col:nth-child(2n + 1) {
         .demo-col {
-            background: rgba(#6698ff, 70%);
+            background: rgba(variables2.$primary, 70%);
         }
     }
 }

package/grid/examples/span/span.component.scss

@@ -1,15 +1,17 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .blue,
     .light-blue {
         text-align: center;
         height: 56px;
         line-height: 56px;
-        color: white;
+        color: variables2.$white;
     }
     .blue {
-        background: #6698ff;
+        background: variables2.$primary;
     }
     .light-blue {
-        background: rgba(#6698ff, 70%);
+        background: rgba(variables2.$primary, 70%);
     }
 }

package/guider/styles/guider-tip.scss

@@ -1,4 +1,4 @@
-@use "../../styles/variables";
+@use '../../styles/variables';
 
 .thy-guider-tip-container {
     width: 310px;
@@ -34,15 +34,15 @@
         box-sizing: border-box;
         flex-direction: column;
         display: flex;
+        font-size: 14px;
+        color: variables.$gray-700;
+        letter-spacing: 0;
+        line-height: 26px;
         &-title {
             font-size: 16px;
             color: variables.$gray-800;
             margin-bottom: 12px;
         }
-        font-size: 14px;
-        color: variables.$gray-700;
-        letter-spacing: 0;
-        line-height: 26px;
         &-description {
             flex: 1;
             overflow-y: auto;
@@ -71,7 +71,7 @@
                     box-sizing: border-box;
                     &.active {
                         border: 2px solid variables.$primary;
-                        background-color: #fff;
+                        background-color: variables.$white;
                         width: 7px;
                         height: 7px;
                         margin: 0 4px;

package/loading/styles/loading.scss

@@ -15,14 +15,14 @@
 }
 
 .thy-loading-indicator {
+    margin-bottom: 20px;
+    width: 100%;
+    text-align: center;
     h4 {
         padding-top: 20px;
         font-size: variables.$font-size-base;
         font-weight: normal;
     }
-    margin-bottom: 20px;
-    width: 100%;
-    text-align: center;
 }
 
 .thy-loading-ellipsis {

package/menu/examples/basic/basic.component.scss

@@ -1,4 +1,6 @@
+@use 'variables.scss' as variables2;
+
 .demo-menu-container {
     max-width: 260px;
-    border: 1px solid #eee;
+    border: 1px solid variables2.$gray-200;
 }

package/menu/examples/divider/divider.component.scss

@@ -1,4 +1,6 @@
+@use 'variables.scss' as variables2;
+
 .demo-menu-container {
     max-width: 240px;
-    border: 1px solid #d2d2d2;
+    border: 1px solid variables2.$gray-200;
 }

package/menu/examples/group/group.component.scss

@@ -1,5 +1,7 @@
+@use 'variables.scss' as variables2;
+
 .demo-menu-container {
     max-width: 300px;
     padding-top: 12px;
-    border: 1px solid #eee;
+    border: 1px solid variables2.$gray-200;
 }

package/menu/examples/theme/theme.component.scss

@@ -8,8 +8,8 @@
             padding: 10px 0;
             width: 240px;
             margin-right: 30px;
-            border-radius: 1px solid #eee;
-            border: 1px solid #eee;
+            border-radius: 1px solid variables2.$gray-200;
+            border: 1px solid variables2.$gray-200;
             .group-action {
                 margin-right: 15px;
             }

package/nav/examples/basic/basic.component.scss

@@ -1,8 +1,6 @@
+@use 'variables.scss' as variables2;
+
 :host {
     display: block;
-    background: #fff;
-    // padding: 16px 8px;
-    // .thy-nav {
-    //     background: #fff;
-    // }
+    background: variables2.$white;
 }

package/nav/examples/extra/extra.component.scss

@@ -1,5 +1,7 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .thy-nav {
-        background: #fff;
+        background: variables2.$white;
     }
 }

package/nav/examples/fill/fill.component.scss

@@ -1,5 +1,7 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .thy-nav {
-        background: #fff;
+        background: variables2.$white;
     }
 }

package/nav/examples/lite/lite.component.scss

@@ -1,4 +1,6 @@
+@use 'variables.scss' as variables2;
+
 :host {
     display: block;
-    background: #fff;
+    background: variables2.$white;
 }

package/nav/examples/pills/pills.component.scss

@@ -1,5 +1,7 @@
+@use 'variables.scss' as variables2;
+
 :host {
     display: block;
-    background: #fff;
+    background: variables2.$white;
     padding: 8px;
 }

package/nav/examples/responsive/responsive.component.scss

@@ -1,5 +1,7 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .thy-nav {
-        background: #fff;
+        background: variables2.$white;
     }
 }

package/nav/examples/size/size.component.scss

@@ -1,7 +1,9 @@
+@use 'variables.scss' as variables2;
+
 .bg-example {
     padding: 12px;
     .thy-nav {
-        background: #fff;
+        background: variables2.$white;
         margin-bottom: 12px;
 
         &.thy-nav-pills {

package/nav/examples/tabs/tabs.component.scss

@@ -1,5 +1,7 @@
+@use 'variables.scss' as variables2;
+
 :host {
     display: block;
-    background: #fff;
+    background: variables2.$white;
     padding-bottom: 12px;
 }

package/nav/examples/type/type.component.scss

@@ -1,9 +1,8 @@
+@use 'variables.scss' as variables2;
+
 :host {
-    // display: block;
-    // background: #ddd;
-    // padding: 16px 8px;
     .thy-nav {
-        background: #fff;
+        background: variables2.$white;
         &:not(:last-child) {
             margin-bottom: 20px;
         }

package/nav/examples/vertical/vertical.component.scss

@@ -1,5 +1,7 @@
+@use 'variables.scss' as variables2;
+
 :host {
     .thy-nav {
-        background: #fff;
+        background: variables2.$white;
     }
 }

package/nav/nav.component.d.ts

@@ -113,7 +113,7 @@ export declare class ThyNav implements OnInit, AfterViewInit, AfterContentInit,
     ngAfterContentInit(): void;
     ngAfterContentChecked(): void;
     private setMoreBtnOffset;
-    createResizeObserver(element: HTMLElement): Observable<any>;
+    createResizeObserver(element: HTMLElement): Observable<unknown>;
     private calculateMoreIsActive;
     private setHiddenItems;
     private getShowItemsEndIndexWhenHorizontal;

package/nav/styles/mixin.scss

@@ -4,7 +4,10 @@
 @use "../../styles/variables";
 
 @mixin nav-item-variant($color, $hover-color, $border-bottom) {
-    color: $color;
+    & {
+        color: $color;
+    }
+
     > i,
     > .thy-icon {
         color: variables.$nav-item-icon-color;
@@ -38,9 +41,12 @@
 }
 
 @mixin nav-item-pills-variant($color, $hover-color, $background: variables.$gray-100, $border-radius: 18px) {
-    background: $background;
-    color: $color;
-    border-radius: $border-radius;
+    & {
+        background: $background;
+        color: $color;
+        border-radius: $border-radius;
+    }
+
 
     &.thy-nav-origin-active {
         text-decoration: none;
@@ -59,11 +65,15 @@
 }
 
 @mixin nav-item-size($padding, $margin-right, $font-size: variables.$nav-item-font-size) {
-    font-size: $font-size;
-    @if $padding {
-        padding: $padding;
+    & {
+        font-size: $font-size;
+        margin-right: $margin-right;
+
+        @if $padding {
+            padding: $padding;
+        }
     }
-    margin-right: $margin-right;
+
     &:last-child {
         margin-right: 0;
     }
@@ -109,7 +119,10 @@
 }
 
 @mixin nav-item-divider-variant($nav-item-hover-color, $divider-height, $nav-item-padding-right) {
-    position: relative;
+    & {
+        position: relative;
+    }
+
     &:after {
         display: block;
         position: absolute;
@@ -136,7 +149,10 @@
 }
 
 @mixin clear-nav-item-bottom {
-    border-bottom: none;
+    & {
+        border-bottom: none;
+    }
+
     &.active {
         border-bottom: none;
     }

package/notify/styles/notify.scss

@@ -54,11 +54,11 @@
             .thy-notify-content {
                 margin-top: 4px;
                 .link-secondary {
+                    font-size: variables.$font-size-base;
+                    color: variables.$primary;
                     &:hover {
                         text-decoration: underline;
                     }
-                    font-size: variables.$font-size-base;
-                    color: variables.$primary;
                 }
             }
             .thy-notify-content,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-tethys",
-  "version": "18.0.0",
+  "version": "18.0.2",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/atinc/ngx-tethys.git"

package/pagination/pagination.component.d.ts

@@ -1,7 +1,7 @@
-import { OnInit, EventEmitter, ChangeDetectorRef, TemplateRef } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, OnInit, TemplateRef } from '@angular/core';
+import { isTemplateRef } from 'ngx-tethys/util';
 import { ThyPaginationConfigModel } from './pagination.class';
 import { ThyPaginationConfig } from './pagination.config';
-import { isTemplateRef } from 'ngx-tethys/util';
 import * as i0 from "@angular/core";
 /**
  * 分页组件，当数据量过多时，使用分页分解数据。
@@ -64,7 +64,7 @@ export declare class ThyPagination implements OnInit {
     marginalCount: number;
     /**
      * 设置中间区域显示数量
-     * @default 7
+     * @default 5
      */
     set thyRangeCount(value: number);
     set showSizeChanger(value: boolean);

package/pagination/styles/pagination.scss

@@ -84,6 +84,7 @@
             border: variables.$pagination-border-width solid variables.$pagination-border-color;
             @include border-radius.border-radius(variables.$border-radius);
             color: variables.$pagination-jumper-input-color;
+            background: variables.$white;
             width: calc(#{variables.$font-size-base} * 3);
             text-align: center;
             margin: 0 6px;

package/progress/styles/progress-strip.scss

@@ -39,8 +39,8 @@
     justify-content: center;
     color: bootstrap-variables.$progress-bar-color;
     text-align: center;
-    @include transition.transition(bootstrap-variables.$progress-bar-transition);
     position: relative;
+    @include transition.transition(bootstrap-variables.$progress-bar-transition);
     &[aria-valuenow='0'] {
         &:before {
             display: none;

package/property-operation/styles/property-operation.scss

@@ -8,9 +8,6 @@
     position: relative;
     padding-right: 20px;
 
-    // .thy-operation-icon {
-    //     display: inline-flex;
-    // }
     &.thy-property-operation-disabled {
         cursor: variables.$disabled-cursor;
         pointer-events: none;
@@ -104,6 +101,7 @@
 
     .thy-property-operation {
         flex-grow: 1;
+        position: relative;
 
         &:not(:first-child) {
             padding-left: 35px;
@@ -112,17 +110,5 @@
         &:not(:last-child) {
             padding-right: 40px;
         }
-        position: relative;
-
-        // &:not(:last-child):after {
-        //   content: " ";
-        //   display: block;
-        //   position: absolute;
-        //   top: 4px;
-        //   right: 0;
-        //   height: 90%;
-        //   width: 1px;
-        //   background: #eee;
-        // }
     }
 }

package/resizable/examples/layout/layout.style.scss

@@ -1,12 +1,14 @@
+@use 'variables.scss' as variables2;
+
 .thy-layout .thy-layout-header {
     background: #7dbcea;
 }
 :host ::ng-deep .thy-layout-header .layout-header-title {
-    color: #fff;
+    color: variables2.$white;
 }
 .thy-layout-sidebar {
     background: #3ba0e9;
-    color: #fff;
+    color: variables2.$white;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -21,7 +23,7 @@
     flex-direction: column;
     background: rgba(16, 142, 233, 1);
     height: 350px;
-    color: #fff;
+    color: variables2.$white;
 }
 
 .thy-layout-content > div {
@@ -47,13 +49,13 @@
 .sidebar-resize-line {
     height: 100%;
     width: 5px;
-    border-right: 1px solid #e8e8e8;
+    border-right: 1px solid variables2.$gray-200;
 }
 
 .content-resize-line {
     width: 100%;
     height: 5px;
-    border-bottom: 1px solid #e8e8e8;
+    border-bottom: 1px solid  variables2.$gray-200;
 }
 
 .thy-layout-content {

package/resizable/examples/table/table.style.scss

@@ -1,3 +1,5 @@
+@use 'variables.scss' as variables2;
+
 :host ::ng-deep .table-default thead th {
     padding: 0;
 }
@@ -11,7 +13,7 @@
     width: 1px;
     height: 30px;
     margin-top: 12px;
-    background: #e8e8e8;
+    background: variables2.$gray-200;
 }
 .thy-resizable-preview {
     border-width: 0;

package/resizable/resize-handle.component.d.ts

@@ -34,5 +34,8 @@ export declare class ThyResizeHandle implements OnInit {
     ngOnInit(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<ThyResizeHandle, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ThyResizeHandle, "thy-resize-handle, [thy-resize-handle]", ["thyResizeHandle"], { "thyDirection": { "alias": "thyDirection"; "required": false; }; "thyLine": { "alias": "thyLine"; "required": false; }; }, { "thyMouseDown": "thyMouseDown"; }, never, ["*"], true, never>;
-    static ngAcceptInputType_thyLine: boolean | string | number;
+    static ngAcceptInputType_thyLine: /**
+     * 调整方向
+     * @type top | right | bottom | left | topRight | bottomRight | bottomLeft | topLeft
+     */ boolean | string | number;
 }

package/schematics/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "18.0.0";
+export declare const VERSION = "18.0.2";

package/schematics/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = '18.0.0';
+exports.VERSION = '18.0.2';