Merge branch 'master' into luxiaobei-selection

CHANGELOG.md

@@ -1,3 +1,144 @@
+## [7.6.16](https://github.com/worktile/ngx-tethys/compare/7.6.14...7.6.16) (2019-12-24)
+
+
+### Bug Fixes
+
+* **layout:** fix can't scroll to bottom in chrom 79.0.x #INF-262 ([c70e380](https://github.com/worktile/ngx-tethys/commit/c70e380)), closes [#INF-262](https://github.com/worktile/ngx-tethys/issues/INF-262)
+
+
+### Features
+
+* **checbox:** add thyIndeterminate in checkbox #INF-269 ([20daea8](https://github.com/worktile/ngx-tethys/commit/20daea8)), closes [#INF-269](https://github.com/worktile/ngx-tethys/issues/INF-269)
+* **vote:** add vote component #INF-169 ([#458](https://github.com/worktile/ngx-tethys/issues/458)) ([62d77b3](https://github.com/worktile/ngx-tethys/commit/62d77b3)), closes [#INF-169](https://github.com/worktile/ngx-tethys/issues/INF-169) [#INF-169](https://github.com/worktile/ngx-tethys/issues/INF-169)
+
+
+
+## [7.6.14](https://github.com/worktile/ngx-tethys/compare/7.6.12...7.6.14) (2019-12-16)
+
+
+### Bug Fixes
+
+* **dialog:** change dialog header title font-weight to 400 #INF-254 ([#453](https://github.com/worktile/ngx-tethys/issues/453)) ([8868a3c](https://github.com/worktile/ngx-tethys/commit/8868a3c)), closes [#INF-254](https://github.com/worktile/ngx-tethys/issues/INF-254) [#INF-254](https://github.com/worktile/ngx-tethys/issues/INF-254) [#INF-254](https://github.com/worktile/ngx-tethys/issues/INF-254)
+* **list:** change grid list option styles ([e0e6d33](https://github.com/worktile/ngx-tethys/commit/e0e6d33))
+* **markdown:** fix markdown new line#CMN-801 ([#455](https://github.com/worktile/ngx-tethys/issues/455)) ([eacab2d](https://github.com/worktile/ngx-tethys/commit/eacab2d)), closes [line#CMN-801](https://github.com/line/issues/CMN-801)
+* **stepper:** change step header line style ([23f58ac](https://github.com/worktile/ngx-tethys/commit/23f58ac))
+* default thyCopyText ([adaf5db](https://github.com/worktile/ngx-tethys/commit/adaf5db))
+* **stepper:** change step line color #CMN-810 ([176ae72](https://github.com/worktile/ngx-tethys/commit/176ae72)), closes [#CMN-810](https://github.com/worktile/ngx-tethys/issues/CMN-810)
+
+
+
+### Features
+
+* **result:** add result component ([#451](https://github.com/worktile/ngx-tethys/issues/451)) ([811c2b2](https://github.com/worktile/ngx-tethys/commit/811c2b2))
+
+
+
+## [7.6.13](https://github.com/worktile/ngx-tethys/compare/7.6.12...7.6.13) (2019-12-11)
+
+
+### Bug Fixes
+
+* add thycopy event ThyCopyEvent ([996d3d9](https://github.com/worktile/ngx-tethys/commit/996d3d9))
+* add thyCopyNotifyText to show notify ([aecaa65](https://github.com/worktile/ngx-tethys/commit/aecaa65))
+* add ThyNotifyService provider ([bcf583f](https://github.com/worktile/ngx-tethys/commit/bcf583f))
+* add ThyNotifyService provider ([e26c3bd](https://github.com/worktile/ngx-tethys/commit/e26c3bd))
+* copy input() name ([22d428d](https://github.com/worktile/ngx-tethys/commit/22d428d))
+* copy menu and input() name ([9b09891](https://github.com/worktile/ngx-tethys/commit/9b09891))
+* copy test tick 4500 wait notify ([60aeb26](https://github.com/worktile/ngx-tethys/commit/60aeb26))
+* copy test tick 4500 wait notify ([6063788](https://github.com/worktile/ngx-tethys/commit/6063788))
+* copy tooltips  click to hover ([107a7dc](https://github.com/worktile/ngx-tethys/commit/107a7dc))
+* default thyCopyText ([adaf5db](https://github.com/worktile/ngx-tethys/commit/adaf5db))
+* fix test ts ([972185c](https://github.com/worktile/ngx-tethys/commit/972185c))
+* remove parameter ([5a15c9f](https://github.com/worktile/ngx-tethys/commit/5a15c9f))
+* remove vote ([81ff6db](https://github.com/worktile/ngx-tethys/commit/81ff6db))
+* thy-copy test add ThyNotifyModule ([2564d65](https://github.com/worktile/ngx-tethys/commit/2564d65))
+* thyCopyNotifyText to thyCopySuccessText ([adce370](https://github.com/worktile/ngx-tethys/commit/adce370))
+* **action-menu:** add action menu variables in variables scss ([cf1aebc](https://github.com/worktile/ngx-tethys/commit/cf1aebc))
+* **action-menu:** add group api parameters ([71b6b3e](https://github.com/worktile/ngx-tethys/commit/71b6b3e))
+* **action-menu:** change styxName to styxTitle ([732059a](https://github.com/worktile/ngx-tethys/commit/732059a))
+
+
+### Features
+
+* copy ([f3f7ba3](https://github.com/worktile/ngx-tethys/commit/f3f7ba3))
+* **action-menu:** add group type and divider type #INF-194 ([57ede21](https://github.com/worktile/ngx-tethys/commit/57ede21)), closes [#INF-194](https://github.com/worktile/ngx-tethys/issues/INF-194)
+* **action-menu:** add thy-action-menu-group component ([9232118](https://github.com/worktile/ngx-tethys/commit/9232118))
+* **copy:** add ThyCopyDirective ([ecf3c71](https://github.com/worktile/ngx-tethys/commit/ecf3c71))
+* **thy-copy:** copy text when click ([e2b26bb](https://github.com/worktile/ngx-tethys/commit/e2b26bb))
+
+
+
+## [7.6.12](https://github.com/worktile/ngx-tethys/compare/7.6.10...7.6.12) (2019-11-29)
+
+
+### Bug Fixes
+
+* **list:** change size varible ([1639836](https://github.com/worktile/ngx-tethys/commit/1639836))
+
+
+### Features
+
+* **list:** selection-list support thySize ([12e88d2](https://github.com/worktile/ngx-tethys/commit/12e88d2))
+* **list:** support list sm size#INF-178 ([01b02a6](https://github.com/worktile/ngx-tethys/commit/01b02a6)), closes [size#INF-178](https://github.com/size/issues/INF-178)
+
+
+
+## [7.6.11](https://github.com/worktile/ngx-tethys/compare/7.6.10...7.6.11) (2019-11-28)
+
+
+### Bug Fixes
+
+* **list:** change size varible ([1639836](https://github.com/worktile/ngx-tethys/commit/1639836))
+
+
+### Features
+
+* **list:** support list sm size#INF-178 ([01b02a6](https://github.com/worktile/ngx-tethys/commit/01b02a6)), closes [size#INF-178](https://github.com/size/issues/INF-178)
+
+
+
+## [7.6.10](https://github.com/worktile/ngx-tethys/compare/7.6.7...7.6.10) (2019-11-28)
+
+
+### Bug Fixes
+
+* **gride-section:** remove () ([88c8cec](https://github.com/worktile/ngx-tethys/commit/88c8cec))
+* **util:** fix util  match dom error when IE ([2972cc9](https://github.com/worktile/ngx-tethys/commit/2972cc9))
+
+
+### Features
+
+* **alert:** add type, success-week and warning-week and danger-week ([9a8319e](https://github.com/worktile/ngx-tethys/commit/9a8319e))
+* **datepicker:** datepicker support default select value ([e0a4a1b](https://github.com/worktile/ngx-tethys/commit/e0a4a1b))
+* **grid:** add thyShowHeader to control thread show or hide ([64bea19](https://github.com/worktile/ngx-tethys/commit/64bea19))
+* **grid:** add thyShowHeader to control thread show or hide ([bbd1f85](https://github.com/worktile/ngx-tethys/commit/bbd1f85))
+* **popover:** popover config add scroll stragety ([1776ed3](https://github.com/worktile/ngx-tethys/commit/1776ed3))
+
+
+
+## [7.6.9](https://github.com/worktile/ngx-tethys/compare/7.6.7...7.6.9) (2019-11-20)
+
+
+### Bug Fixes
+
+* **util:** fix util  match dom error when IE ([2972cc9](https://github.com/worktile/ngx-tethys/commit/2972cc9))
+
+
+### Features
+
+* **popover:** popover config add scroll stragety ([1776ed3](https://github.com/worktile/ngx-tethys/commit/1776ed3))
+
+
+
+## [7.6.8](https://github.com/worktile/ngx-tethys/compare/7.6.7...7.6.8) (2019-11-20)
+
+
+### Features
+
+* **popover:** popover config add scroll stragety ([1776ed3](https://github.com/worktile/ngx-tethys/commit/1776ed3))
+
+
+
 ## [7.6.7](https://github.com/worktile/ngx-tethys/compare/7.6.2...7.6.7) (2019-11-15)
 
 

README.md

@@ -56,7 +56,7 @@ $ npm run start
 ## Release & Publish
 
 1. 获取主仓储 `ngx-tethys` 最新代码（如果是自己fork的项目，需要 `fetch` 远程仓储并且合并到本地分支 ）
-1. 执行 `npm run release` 输入新的版本号（`release` 命令会根据tag自动生成 `changelog`, 并且自动生成新的版本对应的分支）
+1. 执行 `npm run release-next` 输入新的版本号（`release-next` 命令会根据tag自动生成 `changelog`, 并且自动生成新的版本对应的分支）
 1. 提交 `Pull Request` 到主仓储 `ngx-tethys` `master` 分支，测试通过后合并 `Pull Request`，并且删除临时分支
 1. 本地切换到主仓储 `ngx-tethys/master` 分支，（如果是自己fork项目，则 `git checkout upstream/master`）
 1. 本地执行 `git pull` or `git fetch upstream` 同步远程更新

demo/src/app/app.component.html

@@ -31,7 +31,7 @@
   <thy-sidebar>
     <demo-sidebar></demo-sidebar>
   </thy-sidebar>
-  <thy-content cdkScrollable id="demo-content">
+  <thy-content class="demo-main-layout-content" cdkScrollable id="demo-content">
     <div class="demo-main-content">
       <router-outlet></router-outlet>
     </div>

demo/src/app/app.component.scss

@@ -100,11 +100,12 @@ body {
             background: #eee;
         }
     }
-    .thy-layout-content {
+    .demo-main-layout-content {
         // margin-left: 240px;
         background: $white;
         padding: 30px 0px;
     }
+
     .demo-main-content {
         position: relative;
         border-radius: 10px;

demo/src/app/app.routes.ts

@@ -34,7 +34,7 @@ import { DemoPropertyOperationSectionComponent } from './components/+property-op
 import { DemoUploaderSectionComponent } from './components/+uploader/uploader-section.component';
 import { DemoDateRangeSectionComponent } from './components/+date-range/date-range-section.component';
 import { DemoKeySelectSectionComponent } from './components/+key-select/key-select-section.component';
-import { DemoListComponent } from './components/+list/list-section.component';
+import { DemoListSectionComponent } from './components/+list/list-section.component';
 import { DemoDatepickerNextSectionComponent } from './components/+datepicker-next/datepicker-next-section.component';
 import { DemoTreeSelectSectionComponent } from './components/+tree-select/tree-select-section.component';
 import { DemoStrengthComponent } from './components/+strength/strength-section.component';
@@ -52,12 +52,15 @@ import { DemoTooltipSectionComponent } from './components/+tooltip/tooltip-secti
 import { DemoOverlaySectionComponent } from './components/+overlay/overlay-section.component';
 import { DemoIconSectionComponent } from './components/+icon/icon-section.component';
 import { DemoFlexibleTextComponent } from './components/+flexible-text/flexible-text-section.component';
+import { DemoCopySectionComponent } from './components/+copy/copy-section.component';
 import { DemoPopoverSectionComponent } from './components/+popover/popover-section.component';
 import { DemoVariablesSectionComponent } from './global/+variables';
 import { DemoLinkSectionComponent } from './global/+link';
 import { DemoRebootSectionComponent } from './global/+reboot';
 import { DemoTypographyComponent } from './components/+typography/typography.component';
 import { DemoSkeletonSectionComponent } from './components/+skeleton';
+import { DemoVoteComponent } from './components/+vote/vote.component';
+import { DemoResultSectionComponent } from './components/+result/result-section.component';
 
 const appRoutes = [
     {
@@ -263,7 +266,7 @@ const appRoutes = [
     },
     {
         path: 'components/list',
-        component: DemoListComponent
+        component: DemoListSectionComponent
     },
     {
         path: 'components/tree-select',
@@ -289,6 +292,10 @@ const appRoutes = [
         path: 'components/arrow-switcher',
         component: DemoArrowSwitcherSectionComponent
     },
+    {
+        path: 'components/copy',
+        component: DemoCopySectionComponent
+    },
     {
         path: 'components/markdown',
         component: DemoMarkdownSectionComponent
@@ -300,6 +307,14 @@ const appRoutes = [
     {
         path: 'components/skeleton',
         component: DemoSkeletonSectionComponent
+    },
+    {
+        path: 'components/vote',
+        component: DemoVoteComponent
+    },
+    {
+        path: 'components/result',
+        component: DemoResultSectionComponent
     }
 ];
 

demo/src/app/components/+action-menu/action-menu-section.component.html

@@ -5,3 +5,5 @@
 <api-parameters title="thyActionMenuToggle 参数列表" [parameters]="toggleApiParameters"></api-parameters>
 <api-parameters title="thy-action-menu 参数列表" [parameters]="menuApiParameters"></api-parameters>
 <api-parameters title="thyActionMenuItem 参数列表" [parameters]="itemApiParameters"></api-parameters>
+<api-parameters title="thyActionMenuDivider 参数列表" [parameters]="dividerApiParameters"></api-parameters>
+<api-parameters title="thyActionMenuGroup 参数列表" [parameters]="actionMenuGroupApiParameters"></api-parameters>

demo/src/app/components/+action-menu/action-menu-section.component.ts

@@ -84,6 +84,30 @@ export class DemoActionMenuSectionComponent {
         }
     ];
 
+    dividerApiParameters = [
+        {
+            property: 'thyTitle',
+            description: '分割线标题',
+            type: 'string',
+            default: ''
+        },
+        {
+            property: 'thyType',
+            description: '分割线类型',
+            type: '"default" | "crossing"',
+            default: 'default'
+        }
+    ];
+
+    actionMenuGroupApiParameters = [
+        {
+            property: 'thyTitle',
+            description: '分组名称',
+            type: 'string',
+            default: ''
+        }
+    ];
+
     liveDemos: LiveDemoCodeExample[] = [
         {
             title: '基本使用',

demo/src/app/components/+action-menu/basic/basic.component.html

@@ -32,6 +32,7 @@
       <span thyActionMenuItemMeta>(默认排序)</span>
       <div thyActionMenuItemInfo>默认排序下可拖拽移动任务；其他排序下只能显示，不可拖拽</div>
     </a>
+    <thy-action-menu-divider thyType="crossing"></thy-action-menu-divider>
     <a thyActionMenuItem href="javascript:;">
       <span thyActionMenuItemIcon>
         <thy-icon thyIconName="task"></thy-icon>
@@ -72,6 +73,7 @@
         </a>
       </div>
     </a>
+
     <a thyActionMenuItem href="javascript:;">
       <span thyActionMenuItemName>无图标元素无图标元素无图标元素无图标元素无图标元素无图标元素</span>
     </a>

demo/src/app/components/+action-menu/group/group.component.html

@@ -1,4 +1,5 @@
-<button [thyButton]="'primary'" [thyActionMenuToggle]="menu">分组下拉菜单</button>
+<button [thyButton]="'primary'" [thyActionMenuToggle]="menu" class="mr-2">分组下拉菜单</button>
+<button [thyButton]="'primary'" [thyActionMenuToggle]="menu2">分组下拉菜单(New)</button>
 <ng-template #menu>
   <thy-action-menu thyTheme="group">
     <thy-action-menu-divider thyTitle="分组"></thy-action-menu-divider>
@@ -36,6 +37,7 @@
       </span>
       <span thyActionMenuItemName>有图标5</span>
     </a>
+    <thy-action-menu-divider thyTitle="分组" thyType="label"></thy-action-menu-divider>
     <a thyActionMenuItem href="javascript:;">
       <span thyActionMenuItemIcon>
         <thy-icon thyIconName="task"></thy-icon>
@@ -44,3 +46,55 @@
     </a>
   </thy-action-menu>
 </ng-template>
+
+<ng-template #menu2>
+  <thy-action-menu>
+    <thy-action-menu-group thyTitle="分组">
+      <a thyActionMenuItem href="javascript:;">
+        <span thyActionMenuItemIcon>
+          <thy-icon thyIconName="task"></thy-icon>
+        </span>
+        <span thyActionMenuItemName>有图标1</span>
+      </a>
+      <a thyActionMenuItem href="javascript:;">
+        <span thyActionMenuItemIcon>
+          <thy-icon thyIconName="task"></thy-icon>
+        </span>
+        <span thyActionMenuItemName>有图标2</span>
+        <span thyActionMenuItemExtendIcon class="text-primary">
+          <thy-icon thyIconName="check"></thy-icon>
+        </span>
+      </a>
+      <a thyActionMenuItem href="javascript:;">
+        <span thyActionMenuItemIcon>
+          <thy-icon thyIconName="task"></thy-icon>
+        </span>
+        <span thyActionMenuItemName>有图标3</span>
+      </a>
+    </thy-action-menu-group>
+
+    <thy-action-menu-group thyTitle="分组">
+      <a thyActionMenuItem href="javascript:;">
+        <span thyActionMenuItemIcon>
+          <thy-icon thyIconName="task"></thy-icon>
+        </span>
+        <span thyActionMenuItemName>有图标4</span>
+      </a>
+      <a thyActionMenuItem href="javascript:;">
+        <span thyActionMenuItemIcon>
+          <thy-icon thyIconName="task"></thy-icon>
+        </span>
+        <span thyActionMenuItemName>有图标5</span>
+      </a>
+    </thy-action-menu-group>
+
+    <thy-action-menu-group thyTitle="分组"
+      ><span thyActionMenuItem href="javascript:;">
+        <span thyActionMenuItemIcon>
+          <thy-icon thyIconName="task"></thy-icon>
+        </span>
+        <span thyActionMenuItemName>有图标6</span>
+      </span></thy-action-menu-group
+    >
+  </thy-action-menu>
+</ng-template>

demo/src/app/components/+alert/weak/weak.component.html

@@ -1 +1,4 @@
-<thy-alert thyType="primary-week" thyMessage="提示内容提示内容提示内容提示内容"></thy-alert>
+<thy-alert thyType="primary-week" thyMessage="提示内容"></thy-alert>
+<thy-alert thyType="success-week" thyMessage="提示内容"></thy-alert>
+<thy-alert thyType="warning-week" thyMessage="提示内容"></thy-alert>
+<thy-alert thyType="danger-week" thyMessage="提示内容"></thy-alert>

demo/src/app/components/+copy/copy-section.component.html

@@ -0,0 +1,25 @@
+<section class="mb-3">
+  <h3>1复制传入标签文字</h3>
+  <button thyButton="primary-square" (thyCopy)="copy($event)" [thyCopyContent]="target1">复制</button>
+  <p #target1>我是p标签，点击button复制的是我的文本</p>
+</section>
+
+<section class="mb-3">
+  <h3>2复制标签thyCopyContent传入文字</h3>
+  <button thyButton="primary-square" (thyCopy)="copy($event)" [thyCopyContent]="'我是一只猪猪'">
+    复制button中thyCopyContent传入文字，thyCopyContent传入文字的优先级大于标签文本
+  </button>
+</section>
+
+<section class="mb-3">
+  <h3>3复制当前标签文字</h3>
+  <p thyCopy thyCopySuccessText="复制文字复制成功">我是带有thyCopy的p标签，点击我，复制这段文字</p>
+</section>
+
+<section class="mb-3">
+  <h3>4复制input输入的文字</h3>
+  <button thyButton="primary-square" (thyCopy)="copy($event)" [thyCopyContent]="target2">复制</button>
+  <p>
+    <input #target2 />
+  </p>
+</section>