@jiaozhiye/qm-design-react 1.4.0-beta.2 → 1.4.0-beta.21

package/lib/locale/index.js

@@ -1,8 +1,8 @@
-/*
- * @Author: 焦质晔
- * @Date: 2021-02-08 16:48:18
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2021-08-14 13:42:21
+/*
+ * @Author: 焦质晔
+ * @Date: 2021-02-08 16:48:18
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2021-08-14 13:42:21
  */
 import dayjs from 'dayjs';
 import defaultLang from './lang/zh-cn';

package/lib/locale/lang/en.d.ts

@@ -36,6 +36,7 @@ declare const _default: {
             timePlaceholder: string;
             weekPlaceholder: string;
             monthPlaceholder: string;
+            quarterPlaceholder: string;
             yearPlaceholder: string;
             daterangePlaceholder: string[];
             timerangePlaceholder: string[];
@@ -45,6 +46,7 @@ declare const _default: {
             dateRangePickers: string[];
             citySelectType: string[];
             regionSelectLabel: string[];
+            validatePrompt: string;
         };
         clipboard: {
             success: string;
@@ -171,6 +173,7 @@ declare const _default: {
                 eqPlaceholder: string;
                 neqPlaceholder: string;
                 text: string;
+                nullValue: string;
             };
             screen: {
                 full: string;
@@ -206,6 +209,7 @@ declare const _default: {
             clipboard: {
                 text: string;
                 textNoSpace: string;
+                success: string;
                 settingTitle: string;
                 rowIndex: string;
                 colIndex: string;

package/lib/locale/lang/en.js

@@ -42,6 +42,7 @@ export default {
       timePlaceholder: 'Select time',
       weekPlaceholder: 'Select week',
       monthPlaceholder: 'Select month',
+      quarterPlaceholder: 'Select quarter',
       yearPlaceholder: 'Select year',
       daterangePlaceholder: ['Start date', 'End date'],
       timerangePlaceholder: ['Start time', 'End time'],
@@ -50,7 +51,8 @@ export default {
       datePickers: ['Today', 'Yesterday', 'A Week Ago', 'A Month Ago'],
       dateRangePickers: ['Nearly A Week', 'Nearly A Month', 'Nearly Three Months', 'Nearly Six Months'],
       citySelectType: ['Province', 'City'],
-      regionSelectLabel: ['Province', 'City', 'Region', 'Street']
+      regionSelectLabel: ['Province', 'City', 'Region', 'Street'],
+      validatePrompt: 'Form validation tips'
     },
     clipboard: {
       success: 'Copy successful',
@@ -176,7 +178,8 @@ export default {
         ltPlaceholder: 'is lesser than',
         eqPlaceholder: 'is equal to',
         neqPlaceholder: 'is not equal to',
-        text: 'Filter'
+        text: 'Filter',
+        nullValue: 'Null Value'
       },
       screen: {
         full: 'Full Screen',
@@ -212,6 +215,7 @@ export default {
       clipboard: {
         text: 'Paste',
         textNoSpace: 'Paste',
+        success: 'Successfully paste {total} records',
         settingTitle: 'Paste setting',
         rowIndex: 'Start row index',
         colIndex: 'Start col index',

package/lib/locale/lang/zh-cn.d.ts

@@ -36,6 +36,7 @@ declare const _default: {
             timePlaceholder: string;
             weekPlaceholder: string;
             monthPlaceholder: string;
+            quarterPlaceholder: string;
             yearPlaceholder: string;
             daterangePlaceholder: string[];
             timerangePlaceholder: string[];
@@ -45,6 +46,7 @@ declare const _default: {
             dateRangePickers: string[];
             citySelectType: string[];
             regionSelectLabel: string[];
+            validatePrompt: string;
         };
         clipboard: {
             success: string;
@@ -171,6 +173,7 @@ declare const _default: {
                 eqPlaceholder: string;
                 neqPlaceholder: string;
                 text: string;
+                nullValue: string;
             };
             screen: {
                 full: string;
@@ -206,6 +209,7 @@ declare const _default: {
             clipboard: {
                 text: string;
                 textNoSpace: string;
+                success: string;
                 settingTitle: string;
                 rowIndex: string;
                 colIndex: string;

package/lib/locale/lang/zh-cn.js

@@ -42,6 +42,7 @@ export default {
       timePlaceholder: '选择时间',
       weekPlaceholder: '选择周',
       monthPlaceholder: '选择月',
+      quarterPlaceholder: '选择季度',
       yearPlaceholder: '选择年',
       daterangePlaceholder: ['开始日期', '结束日期'],
       timerangePlaceholder: ['开始时间', '结束时间'],
@@ -50,7 +51,8 @@ export default {
       datePickers: ['今天', '昨天', '一周前', '一个月前'],
       dateRangePickers: ['最近一周', '最近一个月', '最近三个月', '最近六个月'],
       citySelectType: ['按省份', '按城市'],
-      regionSelectLabel: ['省', '市', '区', '街道']
+      regionSelectLabel: ['省', '市', '区', '街道'],
+      validatePrompt: '表单校验提示'
     },
     clipboard: {
       success: '复制成功',
@@ -176,7 +178,8 @@ export default {
         ltPlaceholder: '小于',
         eqPlaceholder: '等于',
         neqPlaceholder: '不等于',
-        text: '筛选'
+        text: '筛选',
+        nullValue: '空值'
       },
       screen: {
         full: '全屏',
@@ -212,6 +215,7 @@ export default {
       clipboard: {
         text: '粘 贴',
         textNoSpace: '粘贴',
+        success: '成功粘贴 {total} 条记录',
         settingTitle: '粘贴设置',
         rowIndex: '粘贴起始行',
         colIndex: '粘贴起始列',

package/lib/modal/style/index.less

@@ -77,7 +77,7 @@
     .ant-modal-close {
       top: 5px;
     }
-    .qm-modal-spin {
+    .@{qm-prefix}-modal-spin {
       top: 48px;
     }
   }
@@ -88,7 +88,7 @@
     .ant-modal-close {
       top: 1px;
     }
-    .qm-modal-spin {
+    .@{qm-prefix}-modal-spin {
       top: 40px;
     }
   }

package/lib/print/src/LodopFuncs.d.ts

@@ -1 +1 @@
-export function getLodop(oOBJECT: any, oEMBED: any, LICENSES?: any[]): any;
+export function getLodop(oOBJECT: any, oEMBED: any): any;

package/lib/print/src/preview.d.ts

@@ -5,7 +5,7 @@ declare type IProps = {
     uniqueKey?: string;
     defaultConfig?: Record<string, any>;
     preview?: boolean;
-    closeOnPrinted?: boolean;
+    closeAfterPrint?: boolean;
     onClose?: () => void;
 };
 declare type IState = {

package/lib/print/src/print.d.ts

@@ -8,7 +8,7 @@ declare type IProps = ButtonProps & {
     uniqueKey?: string;
     defaultConfig?: Record<string, any>;
     preview?: boolean;
-    closeOnPrinted?: boolean;
+    closeAfterPrint?: boolean;
     click?: () => void;
 };
 declare type IState = {

package/lib/print/style/index.less

@@ -1,175 +1,175 @@
-/*
- * @Author: 焦质晔
- * @Date: 2021-07-23 19:05:57
- * @Last Modified by: 焦质晔
- * @Last Modified time: 2022-03-01 14:06:41
- */
-@import '../../style/common';
-
-@prefix-print-preview: ~'@{qm-prefix}-print-preview';
-@prefix-print-container: ~'@{qm-prefix}-print-container';
-
-.@{prefix-print-preview} {
-  .reset-component();
-  margin: -@--padding-md;
-  height: calc(100% + 20px);
-  min-height: calc(80vh - 48px);
-  .outer {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    min-height: inherit;
-    .header,
-    .footer {
-      padding: 2px 10px;
-      background-color: @--background-color;
-      display: flex;
-      align-items: center;
-      & > span {
-        display: flex;
-        align-items: center;
-      }
-      & > span + span {
-        margin-left: 10px;
-      }
-    }
-    .main {
-      flex: 1;
-      position: relative;
-    }
-    .header {
-      border-bottom: 1px solid @--border-color-base;
-      .text-btn {
-        padding-left: 0;
-        padding-right: 0;
-      }
-    }
-    .footer {
-      border-top: 1px solid @--border-color-base;
-      .ant-slider {
-        width: 150px;
-      }
-      .scale-text {
-        width: 40px;
-        font-style: normal;
-        margin-left: 10px;
-      }
-    }
-    // size
-  }
-}
-
-.@{prefix-print-container} {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background-color: #dadce0;
-  &.no-visible {
-    opacity: 0;
-    height: 0 !important;
-    overflow: hidden;
-    z-index: -1;
-  }
-  .spin {
-    height: 100%;
-    .ant-spin-container {
-      height: 100%;
-    }
-  }
-  .preview {
-    position: relative;
-    height: 100%;
-    overflow-x: auto;
-    overflow-y: auto;
-    .origin-template {
-      position: absolute;
-      left: 50%;
-      top: 0;
-      height: 0;
-      z-index: -1;
-      overflow: hidden;
-      visibility: hidden;
-    }
-    .workspace {
-      margin: 0 auto;
-      background-color: #fff;
-      transform-origin: left top;
-      box-sizing: content-box;
-    }
-    /* 打印模板公共样式 */
-    table {
-      width: 100%;
-      border-spacing: 0;
-      border-collapse: collapse;
-      table-layout: fixed;
-    }
-    table tr td {
-      padding: 2px;
-      word-wrap: break-word;
-    }
-    .fs12 {
-      font-size: 12px;
-    }
-    .fs13 {
-      font-size: 13px;
-    }
-    .fs14 {
-      font-size: 14px;
-    }
-    .fw500 {
-      font-weight: 500;
-    }
-    .fw700 {
-      font-weight: 700;
-    }
-    .fl {
-      float: left;
-    }
-    .fr {
-      float: right;
-    }
-    .tc {
-      text-align: center;
-    }
-    .tr {
-      text-align: right;
-    }
-    .bor {
-      border: 1px solid #000;
-    }
-    .bor-t {
-      border-top: 1px solid #000;
-    }
-    .bor-b {
-      border-bottom: 1px solid #000;
-    }
-    .bor-l {
-      border-left: 1px solid #000;
-    }
-    .bor-r {
-      border-right: 1px solid #000;
-    }
-    .no-bor {
-      border: none !important;
-    }
-    /* 打印模板公共样式 END */
-  }
-}
-
-/* IE11 hack */
-@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-  .@{prefix-print-preview} {
-    .outer {
-      height: 0;
-    }
-  }
-  .is-fullscreen {
-    .@{prefix-print-preview} {
-      .outer {
-        height: 100%;
-      }
-    }
-  }
-}
+/*
+ * @Author: 焦质晔
+ * @Date: 2021-07-23 19:05:57
+ * @Last Modified by: 焦质晔
+ * @Last Modified time: 2022-03-01 14:06:41
+ */
+@import '../../style/common';
+
+@prefix-print-preview: ~'@{qm-prefix}-print-preview';
+@prefix-print-container: ~'@{qm-prefix}-print-container';
+
+.@{prefix-print-preview} {
+  .reset-container();
+  margin: -@--padding-md;
+  height: calc(100% + 20px);
+  min-height: calc(80vh - 48px);
+  .outer {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    min-height: inherit;
+    .header,
+    .footer {
+      padding: 2px 10px;
+      background-color: @--background-color;
+      display: flex;
+      align-items: center;
+      & > span {
+        display: flex;
+        align-items: center;
+      }
+      & > span + span {
+        margin-left: 10px;
+      }
+    }
+    .main {
+      flex: 1;
+      position: relative;
+    }
+    .header {
+      border-bottom: 1px solid @--border-color-base;
+      .text-btn {
+        padding-left: 0;
+        padding-right: 0;
+      }
+    }
+    .footer {
+      border-top: 1px solid @--border-color-base;
+      .ant-slider {
+        width: 150px;
+      }
+      .scale-text {
+        width: 40px;
+        font-style: normal;
+        margin-left: 10px;
+      }
+    }
+    // size
+  }
+}
+
+.@{prefix-print-container} {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background-color: #dadce0;
+  &.no-visible {
+    opacity: 0;
+    height: 0 !important;
+    overflow: hidden;
+    z-index: -1;
+  }
+  .spin {
+    height: 100%;
+    .ant-spin-container {
+      height: 100%;
+    }
+  }
+  .preview {
+    position: relative;
+    height: 100%;
+    overflow-x: auto;
+    overflow-y: auto;
+    .origin-template {
+      position: absolute;
+      left: 50%;
+      top: 0;
+      height: 0;
+      z-index: -1;
+      overflow: hidden;
+      visibility: hidden;
+    }
+    .workspace {
+      margin: 0 auto;
+      background-color: #fff;
+      transform-origin: left top;
+      box-sizing: content-box;
+    }
+    /* 打印模板公共样式 */
+    table {
+      width: 100%;
+      border-spacing: 0;
+      border-collapse: collapse;
+      table-layout: fixed;
+    }
+    table tr td {
+      padding: 2px;
+      word-wrap: break-word;
+    }
+    .fs12 {
+      font-size: 12px;
+    }
+    .fs13 {
+      font-size: 13px;
+    }
+    .fs14 {
+      font-size: 14px;
+    }
+    .fw500 {
+      font-weight: 500;
+    }
+    .fw700 {
+      font-weight: 700;
+    }
+    .fl {
+      float: left;
+    }
+    .fr {
+      float: right;
+    }
+    .tc {
+      text-align: center;
+    }
+    .tr {
+      text-align: right;
+    }
+    .bor {
+      border: 1px solid #000;
+    }
+    .bor-t {
+      border-top: 1px solid #000;
+    }
+    .bor-b {
+      border-bottom: 1px solid #000;
+    }
+    .bor-l {
+      border-left: 1px solid #000;
+    }
+    .bor-r {
+      border-right: 1px solid #000;
+    }
+    .no-bor {
+      border: none !important;
+    }
+    /* 打印模板公共样式 END */
+  }
+}
+
+/* IE11 hack */
+@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+  .@{prefix-print-preview} {
+    .outer {
+      height: 0;
+    }
+  }
+  .is-fullscreen {
+    .@{prefix-print-preview} {
+      .outer {
+        height: 100%;
+      }
+    }
+  }
+}

package/lib/range-table-helper/style/index.less

@@ -9,6 +9,10 @@
 @prefix-range-helper: ~'@{qm-prefix}-range-helper';
 
 .@{prefix-range-helper}--wrapper {
-  .reset-component();
+  .reset-container();
   height: 100%;
+  .icon-sign {
+    font-size: 18px;
+    line-height: 1;
+  }
 }

package/lib/search-helper/style/index.less

@@ -9,6 +9,6 @@
 @prefix-search-helper: ~'@{qm-prefix}-search-helper';
 
 .@{prefix-search-helper}--wrapper {
-  .reset-component();
+  .reset-container();
   height: 100%;
 }

package/lib/search-tree/src/search-tree.d.ts

@@ -15,9 +15,12 @@ declare type IProps = TreeProps & {
         children?: string;
     };
     value?: React.Key[];
+    placeholder?: string;
     asyncLoad?: boolean;
     checkStrictly?: boolean;
     checkStrategy?: ICheckStrategy;
+    showSearchBar?: boolean;
+    showCollapse?: boolean;
     onSelectChange?: (records: IRecord[] | IRecord) => void;
     onCheckChange?: (records: IRecord[] | IRecord) => void;
     onDragChange?: (info: any, data: IRecord) => void;
@@ -41,9 +44,12 @@ declare const SearchTree: React.ForwardRefExoticComponent<TreeProps<import("rc-t
         children?: string | undefined;
     } | undefined;
     value?: React.Key[] | undefined;
+    placeholder?: string | undefined;
     asyncLoad?: boolean | undefined;
     checkStrictly?: boolean | undefined;
     checkStrategy?: ICheckStrategy | undefined;
+    showSearchBar?: boolean | undefined;
+    showCollapse?: boolean | undefined;
     onSelectChange?: ((records: IRecord[] | IRecord) => void) | undefined;
     onCheckChange?: ((records: IRecord[] | IRecord) => void) | undefined;
     onDragChange?: ((info: any, data: IRecord) => void) | undefined;

package/lib/search-tree/style/index.less

@@ -9,8 +9,21 @@
 @prefix-search-tree: ~'@{qm-prefix}-search-tree';
 
 .@{prefix-search-tree} {
-  .reset-component();
+  .reset-container();
   height: 100%;
+  .topper {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .ant-input-search {
+      flex: 1 0;
+      margin-bottom: 8px;
+    }
+    .trigger {
+      margin-left: 8px;
+      margin-bottom: 8px;
+    }
+  }
   .ant-tree {
     .filter-node {
       & > span:last-of-type {

package/lib/spin/style/index.less

@@ -8,11 +8,9 @@
 
 @prefix-spin: ~'@{qm-prefix}-spin';
 
-.@{prefix-spin} {
-  &.full-height {
+.@{prefix-spin}-full-height {
+  height: 100%;
+  .ant-spin-container {
     height: 100%;
-    .ant-spin-container {
-      height: 100%;
-    }
   }
 }

package/lib/split/style/index.less

@@ -10,7 +10,7 @@
 @prefix-split-pane: ~'@{qm-prefix}-split-pane';
 
 .@{prefix-split} {
-  .reset-component();
+  .reset-container();
   display: flex;
   &.vertical {
     flex-direction: column;