meixioacomponent 2.0.32 → 2.0.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (70) hide show
  1. package/lib/components/index.d.ts +4 -1
  2. package/lib/components/index.d.ts.map +1 -1
  3. package/lib/components/index.js +12 -2
  4. package/lib/config/componentConfig.js +1 -1
  5. package/lib/config/use/UseImg.d.ts.map +1 -1
  6. package/lib/config/use/UseImg.js +2 -0
  7. package/lib/config/use/{useWait.d.ts → UseWait.d.ts} +1 -1
  8. package/lib/config/use/UseWait.d.ts.map +1 -0
  9. package/lib/config/use/useConfirm/UseConfirm.d.ts +7 -0
  10. package/lib/config/use/useConfirm/UseConfirm.d.ts.map +1 -0
  11. package/lib/config/use/useConfirm/UseConfirm.js +33 -0
  12. package/lib/config/use/useConfirm/UseNotify.d.ts +7 -0
  13. package/lib/config/use/useConfirm/UseNotify.d.ts.map +1 -0
  14. package/lib/config/use/useConfirm/UseNotify.js +18 -0
  15. package/lib/config/use/useConfirm/executeConfirm.d.ts +3 -0
  16. package/lib/config/use/useConfirm/executeConfirm.d.ts.map +1 -0
  17. package/lib/config/use/useConfirm/executeConfirm.js +11 -0
  18. package/lib/config/use/useConfirm/registerConfirm.d.ts +5 -0
  19. package/lib/config/use/useConfirm/registerConfirm.d.ts.map +1 -0
  20. package/lib/config/use/useConfirm/registerConfirm.js +8 -0
  21. package/lib/meixioacomponent.common.js +703 -407
  22. package/lib/meixioacomponent.umd.js +701 -405
  23. package/lib/meixioacomponent.umd.min.js +2 -2
  24. package/lib/style/tableStyle.less +7 -14
  25. package/lib/style/tdesignStyle.less +5 -2
  26. package/lib/typings/type.d.ts +11 -0
  27. package/lib/typings/type.d.ts.map +1 -1
  28. package/package.json +1 -1
  29. package/packages/components/base/baseArea/baseArea.vue +17 -6
  30. package/packages/components/base/baseDialog/index.vue +37 -15
  31. package/packages/components/base/baseDrawer/index.vue +6 -1
  32. package/packages/components/base/baseNumberInput/index.vue +52 -18
  33. package/packages/components/base/basePlainTable/basePlainTable.vue +40 -21
  34. package/packages/components/base/basePopoverButton/index.vue +16 -14
  35. package/packages/components/base/baseSection/baseSection.vue +1 -1
  36. package/packages/components/base/baseText/index.vue +20 -2
  37. package/packages/components/base/baseTreeSelect/index.vue +25 -15
  38. package/packages/components/base/baseUploadTemplate/index.vue +6 -4
  39. package/packages/components/base/baseWait/index.vue +1 -1
  40. package/packages/components/index.js +13 -3
  41. package/packages/components/index.ts +12 -1
  42. package/packages/components/mixins/tableSectionMixins.js +6 -3
  43. package/packages/components/proForm/dialogForm/baseDialogForm.vue +19 -19
  44. package/packages/components/proForm/proForm/proFormItem/pro_form_item.vue +11 -6
  45. package/packages/components/proForm/proForm/pro_form.vue +13 -18
  46. package/packages/components/proPageTable/oaProTableSearch/oa_pro_screen_item.vue +2 -2
  47. package/packages/components/proPageTable/oa_pro_colum_config.vue +2 -4
  48. package/packages/components/proPageTable/oa_pro_table.vue +27 -9
  49. package/packages/components/searchHeader/searchHeader.vue +6 -7
  50. package/packages/components/style/tableStyle.less +7 -14
  51. package/packages/components/style/tdesignStyle.less +5 -2
  52. package/packages/config/componentConfig.js +1 -1
  53. package/packages/config/componentConfig.ts +1 -1
  54. package/packages/config/use/UseImg.js +3 -1
  55. package/packages/config/use/UseImg.ts +3 -1
  56. package/packages/config/use/useConfirm/UseConfirm.js +31 -0
  57. package/packages/config/use/useConfirm/UseConfirm.ts +35 -0
  58. package/packages/config/use/useConfirm/UseNotify.js +16 -0
  59. package/packages/config/use/useConfirm/UseNotify.ts +19 -0
  60. package/packages/config/use/useConfirm/executeConfirm.js +8 -0
  61. package/packages/config/use/useConfirm/executeConfirm.ts +6 -0
  62. package/packages/config/use/useConfirm/registerConfirm.js +8 -0
  63. package/packages/config/use/useConfirm/registerConfirm.ts +8 -0
  64. package/packages/typings/type.ts +361 -346
  65. package/lib/config/use/useWait.d.ts.map +0 -1
  66. package/packages/components/base/baseComment.zip +0 -0
  67. package/packages/config/useElement.js +0 -120
  68. /package/lib/config/use/{useWait.js → UseWait.js} +0 -0
  69. /package/packages/config/use/{useWait.js → UseWait.js} +0 -0
  70. /package/packages/config/use/{useWait.ts → UseWait.ts} +0 -0
@@ -1,9 +1,8 @@
1
1
 
2
-
3
-
4
2
  .cell-content-text {
5
3
  width: 100%;
6
4
  overflow: hidden;
5
+ display: block;
7
6
  white-space: nowrap;
8
7
  text-overflow: ellipsis;
9
8
  font-weight: var(--font-weight-m);
@@ -26,18 +25,14 @@
26
25
  color: var(--color-success) !important;
27
26
  }
28
27
 
29
- /deep/ .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
30
- background-color: var(--color-gray-s) !important;
31
- }
32
-
33
28
 
34
29
  .primary,
35
- .fun,.handle-primary {
30
+ .fun, .handle-primary {
36
31
  color: var(--color-primary) !important;
37
32
  font-size: var(--font-size-base) !important;
38
33
  }
39
34
 
40
- .fun,.handle-primary {
35
+ .fun, .handle-primary {
41
36
  cursor: pointer;
42
37
 
43
38
  &:hover {
@@ -47,11 +42,9 @@
47
42
 
48
43
 
49
44
  .wait {
50
- /deep/ .el-table__fixed-header-wrapper {
51
- z-index: 0 !important;
52
- }
53
45
 
54
- /deep/ .el-table__fixed-body-wrapper {
55
- z-index: 0 !important;
56
- }
57
46
  }
47
+
48
+ /deep/ .t-table__tree-leaf-node {
49
+ display: flex !important;
50
+ }
@@ -14,6 +14,9 @@
14
14
  height: 100% !important;
15
15
  }
16
16
 
17
- .t-form__label {
18
- padding-right: 0 !important;
17
+
18
+ .t-form__item {
19
+ .t-is-error {
20
+ margin-bottom: var(--td-line-height-body-small) !important;
21
+ }
19
22
  }
@@ -391,5 +391,16 @@ export declare interface TableProScreenInterFace {
391
391
  type: "timeRange" | "singleTime" | "text" | "select";
392
392
  formType: "text" | "textarea" | "select" | "date" | "number" | "floatnumber" | "mobile";
393
393
  }
394
+ export declare type TypeByTheme = "danger" | "warning" | "info" | "success";
395
+ export declare type TypeByConfirmOptions = {
396
+ confirmButtonText?: string;
397
+ cancelButtonText?: string;
398
+ type: TypeByTheme & "default" | undefined;
399
+ };
400
+ export declare type TypeByNotifyOptions = {
401
+ title?: string;
402
+ content?: string;
403
+ duration?: number;
404
+ };
394
405
  export {};
395
406
  //# sourceMappingURL=type.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../packages/typings/type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../packages/typings/type.ts"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,MAAM,aAAa,GAAG;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,CAAC,OAAO,MAAM,cAAc,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,sBAAsB;IAC3C,KAAK,EAAE,IAAI,GAAG,QAAQ,CAAC;IACvB,QAAQ,EAAE,IAAI,GAAG,QAAQ,CAAC;IAC1B,SAAS,EAAE,aAAa,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,IAAI,GAAG,cAAc,CAAC;IAClC,eAAe,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,cAAc,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,aAAa,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,aAAa,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,gBAAgB,EAAE,IAAI,GAAG,QAAQ,CAAC;IAClC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAA;CACxC;AAGD,MAAM,CAAC,OAAO,WAAW,4BAA4B;IACjD,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAA;CACjC;AAED,MAAM,CAAC,OAAO,MAAM,kBAAkB,GAAG;IACrC;;OAEG;IACH,UAAU,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B;;OAEG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAExB,eAAe,EAAE,MAAM,CAAA;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,qBAAqB;IAC1C,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,EAAE,EAAE,CAAC,IAAI,EAAE,SAAS,GAAG,WAAW,EAAE,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAC;CAC7D;AAED,MAAM,CAAC,OAAO,MAAM,mBAAmB,GAAG;IACtC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,QAAQ,EAAE,GAAG,CAAC;IACd;;OAEG;IACH,WAAW,EAAE,GAAG,CAAC;IACjB;;OAEG;IACH,aAAa,EAAE,GAAG,CAAC;IAEnB;;OAEG;IACH,uBAAuB,EAAE,QAAQ,GAAG,IAAI,CAAC;IAEzC,GAAG,EAAE,GAAG,CAAC;IACT;;OAEG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,eAAe,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,YAAY,EAAE,CACV,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,UAAU,EAAE,MAAM,GAAG,MAAM,KAC1B,IAAI,CAAC;IACV,0BAA0B,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IAEzD,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,2BAA2B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,qBAAqB,EAAE,MAAM,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,CAAC,OAAO,MAAM,iBAAiB,GAAG;IACpC,MAAM,EAAE,IAAI,GAAG,WAAW,GAAG,MAAM,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,cAAc,GAAG,MAAM,CAAC;CACrC,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,mBAAmB;IACxC,MAAM,CAAC,EAAE,IAAI,GAAG,WAAW,GAAG,MAAM,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,cAAc,GAAG,MAAM,CAAC;IAClC,iBAAiB,EAAE,IAAI,GAAG,qBAAqB,CAAC;IAChD,WAAW,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACnC,QAAQ,EAAE,WAAW,GAAG,IAAI,GAAG,MAAM,CAAC;IACtC,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAED,MAAM,CAAC,OAAO,WAAW,gBAAgB;IACrC,YAAY,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC3C,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC;AAED,MAAM,CAAC,OAAO,WAAW,qBAAqB;IAC1C,SAAS,EAAE,IAAI,GAAG,qBAAqB,CAAC;IACxC,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED;;;GAGG;AACH,OAAO,MAAM,OAAO,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,KAAK,EAAE,CAAC;AAE3D,MAAM,CAAC,OAAO,MAAM,cAAc,GAAG;IACjC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,SAAS,CAAC,EAAE,cAAc,GAAG,aAAa,GAAG,UAAU,CAAC;IACxD;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,qBAAqB;IAC1C,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,GAAG,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC/C,YAAY,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC5C,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,CAAC,OAAO,WAAW,iBAAiB;IACtC,cAAc,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC7C,UAAU,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACpD;AAED,MAAM,CAAC,OAAO,MAAM,kBAAkB,GAAG;IACrC;;OAEG;IACH,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;IACvB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;IAC5B;;OAEG;IACH,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB;;OAEG;IACH,eAAe,CAAC,EAAE,QAAQ,CAAC;IAC3B;;OAEG;IACH,eAAe,CAAC,EAAE,QAAQ,CAAC;IAE3B;;OAEG;IACH,WAAW,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,CAAC,OAAO,MAAM,gBAAgB,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAE7E,MAAM,CAAC,OAAO,WAAW,gBAAgB;IACrC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACxB;;OAEG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;CAC3B;AAED,MAAM,CAAC,OAAO,WAAW,kBAAmB,SAAQ,gBAAgB;IAChE,cAAc;IACd,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IAEf;;OAEG;IACH,aAAa,CAAC,EAAE,uBAAuB,CAAC;CAC3C;AAED,MAAM,CAAC,OAAO,WAAW,oBAAqB,SAAQ,gBAAgB;IAClE;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,WAAW,kBAAkB;IACvC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,KAAK,EAAE,GAAG,CAAC;IACX;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,CAAC,OAAO,WAAW,kBAAmB,SAAQ,kBAAkB;IAClE,IAAI,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,CAAC,OAAO,WAAW,qBAAsB,SAAQ,kBAAkB;IACrE,IAAI,EAAE,UAAU,CAAC;IACjB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,WAAW,mBAAoB,SAAQ,kBAAkB;IACnE,IAAI,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,CAAC,OAAO,WAAW,mBAAoB,SAAQ,kBAAkB;IACnE,IAAI,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,WAAW,iBAAkB,SAAQ,kBAAkB;IACjE;;;OAGG;IACH,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,eAAe,CAAC;IAE1D;;;OAGG;IACH,aAAa,CAAC,EAAE,EAAE,CAAC;IACnB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,MAAM,CAAC,OAAO,WAAW,kBAAmB,SAAQ,kBAAkB;IAClE,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE;QACF,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,GAAG,CAAC;KACd,EAAE,CAAC;CACP;AAED,MAAM,CAAC,OAAO,WAAW,yBAA0B,SAAQ,kBAAkB;IACzE,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,KAAK,GAAG,OAAO,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,WAAW,kBAAkB;IAEvC,MAAM,EAAE,GAAG,EAAE,CAAC;IAEd,YAAY,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAE3C,IAAI,EAAE,OAAO,CAAC;IAEd,QAAQ,EAAE,CACN,UAAU,EAAE,CAAC;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,CAAC,EAC5B,EAAE,EAAE,MAAM,GAAG,EACb,KAAK,EAAE,OAAO,KACb,IAAI,CAAC;IAEV,QAAQ,EAAE,MAAM,IAAI,CAAC;IAGrB,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,IAAI,CAAC;CACxC;AAED,MAAM,CAAC,OAAO,WAAW,uBAAuB;IAC5C,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,UAAU,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;IAC7C,IAAI,EAAE,WAAW,GAAG,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAC;IACrD,QAAQ,EACF,MAAM,GACN,UAAU,GACV,QAAQ,GACR,MAAM,GACN,QAAQ,GACR,aAAa,GACb,QAAQ,CAAC;CAClB;AAGD,MAAM,CAAC,OAAO,MAAM,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;AAE5E,MAAM,CAAC,OAAO,MAAO,oBAAoB,GAAG;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,WAAW,GAAG,SAAS,GAAG,SAAS,CAAC;CAC7C,CAAC;AAEF,MAAM,CAAC,OAAO,MAAM,mBAAmB,GAAG;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "meixioacomponent",
3
- "version": "2.0.32",
3
+ "version": "2.0.33",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
@@ -23,7 +23,7 @@
23
23
  <span>地区选择器</span>
24
24
  </div>
25
25
  <div class="title-right">
26
- <LocationIcon @click="backArea" v-show="activeIndex>1"></LocationIcon>
26
+ <arrow-left-icon @click="backArea" v-show="activeIndex>1"></arrow-left-icon>
27
27
  </div>
28
28
  </div>
29
29
  <div class="content-middle">
@@ -47,7 +47,8 @@
47
47
  class="area-item"
48
48
  >
49
49
 
50
- <t-button v-if="item.label == activeArea" shape="square" variant="outline" @click="deleteCheck">
50
+ <t-button class="delete-btn" v-if="item.label == activeArea" shape="square" variant="outline"
51
+ @click="deleteCheck">
51
52
  <template #icon>
52
53
  <CloseCircleIcon
53
54
  ></CloseCircleIcon>
@@ -80,7 +81,7 @@
80
81
  :readonly="true"
81
82
  placeholder="请选择地区">
82
83
  <template #suffix-icon>
83
- <arrow-down-icon v-if="isOpen"></arrow-down-icon>
84
+ <arrow-down-icon v-if="!isOpen"></arrow-down-icon>
84
85
  <arrow-up-icon v-else></arrow-up-icon>
85
86
  </template>
86
87
  </t-input>
@@ -94,7 +95,7 @@ import baseButtonHandleVue from '../baseButtonHandle/baseButtonHandle.vue'
94
95
  //
95
96
  import areaJson from './area'
96
97
  import areaConfig from './areaConfig'
97
- import {ArrowDownIcon, ArrowUpIcon, CloseCircleIcon, LocationIcon} from "tdesign-icons-vue"
98
+ import {ArrowDownIcon, ArrowLeftIcon, ArrowUpIcon, CloseCircleIcon, LocationIcon} from "tdesign-icons-vue"
98
99
  import {baseTimeTypeConfig} from "../baseTimeTypeSelect/config";
99
100
  import {TransomComponentSize} from "../../../utils/utils";
100
101
 
@@ -136,7 +137,8 @@ export default {
136
137
  CloseCircleIcon,
137
138
  baseButtonHandleVue,
138
139
  ArrowUpIcon,
139
- ArrowDownIcon
140
+ ArrowDownIcon,
141
+ ArrowLeftIcon
140
142
  },
141
143
  computed: {
142
144
  module: {
@@ -524,7 +526,9 @@ export default {
524
526
  border-bottom: 2px solid var(--color-gray-m);
525
527
 
526
528
  .area-item {
527
- height: 24px;
529
+ padding: 0 var(--padding-4);
530
+ box-sizing: border-box;
531
+ height: 40px;
528
532
  display: flex;
529
533
  cursor: pointer;
530
534
  position: relative;
@@ -537,6 +541,13 @@ export default {
537
541
  justify-content: flex-start;
538
542
  border-radius: calc(var(--radius) * 2);
539
543
 
544
+ .delete-btn {
545
+ position: absolute;
546
+ top: -16px;
547
+ right: -16px;
548
+ }
549
+
550
+
540
551
  span {
541
552
  max-width: 100%;
542
553
  line-height: 24px;
@@ -8,6 +8,7 @@
8
8
  :closeBtn="false"
9
9
  :attach="attach" :showOverlay="modal" :closeOnOverlayClick="false" :closeOnEscKeydown="false"
10
10
  :top="top"
11
+ :z-index="zIndex?zIndex:componentConfig.dynamicId+1"
11
12
  :destroy-on-close="destroyOnClose"
12
13
  :width="width" :visible.sync="centerDialogVisible">
13
14
 
@@ -24,7 +25,7 @@
24
25
  <span>{{ title }}</span>
25
26
  <div class="title-handle-wrap">
26
27
 
27
- <t-button shape="square" variant="outline" v-if="isCache" @click="handleCache"
28
+ <t-button shape="square" variant="text" v-if="isCache" @click="handleCache"
28
29
  style="margin-right: var(--margin-4)">
29
30
  <template #icon>
30
31
  <remove-icon
@@ -37,7 +38,7 @@
37
38
  <!-- ref="dragIcon"-->
38
39
  <!-- ></drag-move-icon>-->
39
40
 
40
- <t-button shape="square" variant="outline" v-if="hasCloseIcon" @click="onHandleClose">
41
+ <t-button shape="square" variant="text" v-if="hasCloseIcon" @click="onHandleClose">
41
42
  <template #icon>
42
43
  <close-icon
43
44
  ></close-icon>
@@ -80,6 +81,8 @@
80
81
  import DialogSkeleton from "./dialogSkeleton";
81
82
  import UseDrag from "../../../config/use/useDrag";
82
83
  import {CloseIcon, RemoveIcon} from "tdesign-icons-vue"
84
+ import componentConfig from "../../../config/componentConfig";
85
+ import UseConfirm from "../../../config/use/useConfirm/UseConfirm";
83
86
 
84
87
  export default {
85
88
  name: "baseDialog",
@@ -187,9 +190,16 @@ export default {
187
190
  type: Boolean,
188
191
  default: false,
189
192
  },
193
+ zIndex: {
194
+ type: Number,
195
+ default: 0
196
+ }
190
197
  },
191
198
 
192
199
  computed: {
200
+ componentConfig() {
201
+ return componentConfig
202
+ },
193
203
  dialogContentStyle() {
194
204
  return {
195
205
  height: this.$props.contentHeight,
@@ -311,19 +321,30 @@ export default {
311
321
  // .catch(() => {
312
322
  // });
313
323
 
314
- const confirmDia = this.$dialog.confirm({
315
- header: '关闭对话框',
316
- body: `${this.noticeText}`,
317
- confirmBtn: '确定',
318
- cancelBtn: '取消',
319
- onConfirm: ({e}) => {
320
- confirmDia.destroy();
321
- this.closeDialog();
322
- },
323
- onClose: ({e, trigger}) => {
324
- confirmDia.destroy();
325
- },
326
- });
324
+
325
+ new UseConfirm().toMountedConfirm(this.noticeText, '关闭对话框', {
326
+ cancelButtonText: '取消',
327
+ confirmButtonText: '确定'
328
+
329
+ }).then(() => {
330
+ this.closeDialog();
331
+ }).catch(() => {
332
+
333
+ })
334
+
335
+ // const confirmDia = this.$dialog.confirm({
336
+ // header: '关闭对话框',
337
+ // body: `${this.noticeText}`,
338
+ // confirmBtn: '确定',
339
+ // cancelBtn: '取消',
340
+ // onConfirm: ({e}) => {
341
+ // confirmDia.destroy();
342
+ // this.closeDialog();
343
+ // },
344
+ // onClose: ({e, trigger}) => {
345
+ //
346
+ // },
347
+ // });
327
348
 
328
349
 
329
350
  },
@@ -388,6 +409,7 @@ export default {
388
409
  }
389
410
 
390
411
  .dialog__footer__wrap {
412
+ margin-top: var(--td-comp-paddingTB-xxl);
391
413
  //padding-bottom: calc(var(--padding-4) * 2) ;
392
414
  }
393
415
  </style>
@@ -10,6 +10,7 @@
10
10
  :header="false"
11
11
  :footer="false"
12
12
  @close="close"
13
+ :z-index="componentConfig.dynamicId+=1"
13
14
  :close-on-esc-keydown="closeOnPressEscape"
14
15
  :close-on-overlay-click="wrapperClosable"
15
16
  >
@@ -64,6 +65,7 @@ import drawerController from "./drawerController";
64
65
  //
65
66
  import UseResize from "../../../config/use/UseResize";
66
67
  import {CloseIcon} from "tdesign-icons-vue"
68
+ import componentConfig from "../../../config/componentConfig";
67
69
 
68
70
  export default {
69
71
  name: "baseDrawer",
@@ -71,7 +73,7 @@ export default {
71
73
  return {
72
74
  open: false,
73
75
  useResize: null,
74
- ignoreList: ['t-select__list','t-popup'],
76
+ ignoreList: ['t-select__list', 't-popup','t-dialog__wrap'],
75
77
  showCloseButton: false
76
78
  };
77
79
  },
@@ -300,6 +302,9 @@ export default {
300
302
 
301
303
  },
302
304
  computed: {
305
+ componentConfig() {
306
+ return componentConfig
307
+ },
303
308
  drawerSize() {
304
309
  if (this.handleShow) {
305
310
  return this.$props.size + 44
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div :class="{ select: select, disabled: disabled }" class="pro-number-wrap">
3
3
  <t-input-number v-if="!useString" v-model.number="module" :theme=" controls?'row':'normal' " :disabled="disabled"
4
- :max="max" :min="min" :placeholder="placeholder" :decimal-places="precision" :size="size"
4
+ :max="max" :min="min" :placeholder="placeholder" :decimal-places="precision" :size="componentSize"
5
5
  @change="onChange" style="width: 100%; height: 100%;"
6
6
  @blur="onBlue"
7
7
  >
@@ -23,7 +23,7 @@
23
23
  </t-input-number>
24
24
 
25
25
  <t-input-number v-else v-model="module" :theme=" controls?'row':'normal' " :disabled="disabled"
26
- :max="max" :min="min" :placeholder="placeholder" :decimal-places="precision" :size="size"
26
+ :max="max" :min="min" :placeholder="placeholder" :decimal-places="precision" :size="componentSize"
27
27
  @blur="onBlue"
28
28
  @change="onChange" style="width: 100%; height: 100%;">
29
29
  <template #suffix>
@@ -46,11 +46,17 @@
46
46
 
47
47
  <script>
48
48
  import BaseStoreSelect from '../baseStoreSelect/index.vue'
49
+ import {TransomComponentSize} from "../../../utils/utils";
49
50
 
50
51
  export default {
51
52
  name: 'baseNumberInput',
52
53
  data() {
53
- return {}
54
+ return {
55
+ privateValue: null
56
+ }
57
+ },
58
+ created() {
59
+ this.privateValue = this.module;
54
60
  },
55
61
  props: {
56
62
  value: {},
@@ -105,33 +111,61 @@ export default {
105
111
  return this.$props.linkValue
106
112
  },
107
113
  },
114
+
115
+ componentSize() {
116
+ return TransomComponentSize(this.$props.size);
117
+ },
108
118
  },
109
119
  methods: {
110
120
  focus() {
111
121
  this.$refs.target.focus()
112
122
  },
113
123
 
114
- onChange(currentValue) {
115
- this.$nextTick(() => {
116
- if (currentValue === 0) {
117
- this.$nextTick(() => {
118
- this.module = this.$props.min;
119
- })
120
- } else if (!currentValue) {
121
- this.$nextTick(() => {
122
- this.module = this.$props.defaultValue;
123
- })
124
- }
125
- this.$emit('onChange', this.module)
126
- })
127
-
124
+ onChange(currentValue, ChangeSource) {
125
+ if (currentValue >= this.max) {
126
+ this.module = this.max;
127
+ return;
128
+ }
129
+ if (currentValue === 0) {
130
+ this.$nextTick(() => {
131
+ this.module = this.$props.min;
132
+ })
133
+ } else if (!currentValue) {
134
+ this.$nextTick(() => {
135
+ this.module = this.$props.defaultValue;
136
+ })
137
+ }
138
+ // this.$emit('onChange', this.module)
128
139
  },
129
140
 
130
141
  onBlue() {
131
- this.$emit('blur');
142
+ if (this.module !== this.privateValue) {
143
+ this.$emit('onChange', this.module)
144
+ this.privateValue = this.module;
145
+ } else {
146
+ this.$emit('blur');
147
+ }
132
148
  }
133
149
  },
134
150
  components: {BaseStoreSelect},
151
+ watch: {
152
+ min: {
153
+ handler(newVal){
154
+ if (this.module < newVal) {
155
+ this.onChange(newVal);
156
+ }
157
+ },
158
+ deep:true
159
+ },
160
+ max: {
161
+ handler (newVal) {
162
+ if (this.module > newVal) {
163
+ this.onChange(newVal);
164
+ }
165
+ },
166
+ deep:true
167
+ }
168
+ }
135
169
  }
136
170
  </script>
137
171
 
@@ -1,13 +1,17 @@
1
1
  <template>
2
2
  <div class="table-wrap">
3
-
4
- <t-table
5
- :row-key="rowKey"
6
- :columns="renderColumns"
3
+ <t-enhanced-table
4
+ ref="tTable"
5
+ :rowKey="rowKey"
7
6
  :data="tableData"
7
+ :bordered="bordered"
8
+ :max-height="maxHeight"
9
+ :columns="renderColumns"
10
+ :tree="tree"
8
11
  :default-selected-row-keys="preCheckValue"
9
12
  :selected-row-keys="preCheckValue"
10
- @select-change=""
13
+ :rowspan-and-colspan='rowspanAndColspan'
14
+ @select-change="onHandleSelectChange"
11
15
  >
12
16
  <template slot="empty">
13
17
  <baseDefaultSvgVue
@@ -40,7 +44,7 @@
40
44
  :type="item.type"></baseText>
41
45
 
42
46
  </template>
43
- </t-table>
47
+ </t-enhanced-table>
44
48
 
45
49
  </div>
46
50
  </template>
@@ -59,9 +63,7 @@ export default {
59
63
  return {
60
64
  id: null,
61
65
  checkValue: null,
62
- maxHeight: 'auto',
63
66
  tableColumns: []
64
-
65
67
  }
66
68
  },
67
69
  mixins: [tableSectionMixins],
@@ -71,9 +73,6 @@ export default {
71
73
  this.id = this.$props.tableId
72
74
  }
73
75
 
74
- if (this.$props.height === 'auto') {
75
- this.maxHeight = 9999999
76
- }
77
76
 
78
77
  this.checkValue = this.preCheckValue;
79
78
 
@@ -135,28 +134,44 @@ export default {
135
134
  type: Array,
136
135
  require: true,
137
136
  },
137
+ rowspanAndColspan: {
138
+ type: Function,
139
+ },
140
+ maxHeight: {
141
+ type: [String, Number],
142
+ default: ''
143
+ },
144
+ bordered: {
145
+ type: Boolean,
146
+ default: false
147
+ },
148
+ tree:{
149
+ type:Object,
150
+ default:()=>{
151
+ return null
152
+ }
153
+ }
138
154
 
139
155
  },
140
156
  computed: {
141
157
  renderColumns() {
142
158
 
143
-
144
- const config = this.tableColumns.map((item, index) => {
159
+ const config = this.tableColumns.map((item, index) => {
145
160
  item['key'] = item.value;
146
161
  item['colkey'] = item.key;
147
162
  TransomTableConfig(item, index)
148
163
  return item;
149
164
  });
150
-
151
-
165
+ console.log('checkType')
166
+ console.log(this.$props.checkType);
152
167
  if (this.$props.checkType) {
153
168
  const checkConfig = {
154
169
  colKey: 'row-select',
155
- type: 'multiple',
170
+ type: this.$props.checkType,
156
171
  label: 'row-select',
157
172
  disabled: (scope) => {
158
173
  if (this.$props.canSelected) {
159
- return !(this.$props.canSelected(scope))
174
+ return !(this.$props.canSelected(scope))
160
175
  } else {
161
176
  return false
162
177
  }
@@ -164,8 +179,8 @@ export default {
164
179
  }
165
180
  }
166
181
 
167
- return [checkConfig,...config]
168
- }else{
182
+ return [checkConfig, ...config]
183
+ } else {
169
184
  }
170
185
  return config
171
186
  }
@@ -202,8 +217,12 @@ export default {
202
217
  return value
203
218
  }
204
219
  },
205
-
206
-
220
+ onHandleSelectChange(value, event) {
221
+ this.$emit("selectChange", {
222
+ keys: value,
223
+ rowData: event,
224
+ });
225
+ }
207
226
  },
208
227
  watch: {
209
228
  tableData(newVal, oldVal) {
@@ -18,20 +18,22 @@
18
18
  @click="buttonClick">
19
19
 
20
20
  <template #icon v-if="buttonIcon">
21
- <base-icon
22
- :style="{
23
- marginRight:buttonText?'var(--margin-2)':'0'
24
- }"
25
- v-if="buttonIcon"
26
- :color="module ? 'var(--text-white)' : 'd'"
27
- :event="!disabled"
28
- :iconClass="iconClass"
29
- :name="buttonIcon"
30
- :plain="true"
31
- :size="`s`"
32
- class="button-icon"
33
- @iconClick="iconClick"
34
- ></base-icon>
21
+ <t-icon :name="buttonIcon"></t-icon>
22
+
23
+ <!-- <base-icon-->
24
+ <!-- :style="{-->
25
+ <!-- marginRight:buttonText?'var(&#45;&#45;margin-2)':'0'-->
26
+ <!-- }"-->
27
+ <!-- v-if="buttonIcon"-->
28
+ <!-- :color="module ? 'var(&#45;&#45;text-white)' : 'd'"-->
29
+ <!-- :event="!disabled"-->
30
+ <!-- :iconClass="iconClass"-->
31
+ <!-- :name="buttonIcon"-->
32
+ <!-- :plain="true"-->
33
+ <!-- :size="`s`"-->
34
+ <!-- class="button-icon"-->
35
+ <!-- @iconClick="iconClick"-->
36
+ <!-- ></base-icon>-->
35
37
  </template>
36
38
  <span v-if="buttonText" class="inner-span">{{ buttonText }}</span>
37
39
  </base-button>
@@ -15,7 +15,7 @@
15
15
  <div class="header-right">
16
16
  <slot name="section-header-right"></slot>
17
17
 
18
- <t-button shape="square" variant="outline" @click="iconClick">
18
+ <t-button shape="square" style="margin-left: var(--margin-4)" variant="text" @click="iconClick">
19
19
  <template #icon>
20
20
  <ArrowDownIcon
21
21
  v-if="!module"
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div :class="[ 'base-text-wrap' ]" v-if="content" :title="content" @click="onClick">
2
+ <div :class="[ 'base-text-wrap',type ]" v-if="content" :title="content" @click="onClick">
3
3
  <div v-if="type==='phone'" :class="['content-wrap',type]">
4
4
  <MobileIcon style="margin-right: var(--margin-2)"></MobileIcon>
5
5
  {{ content }}
@@ -9,7 +9,7 @@
9
9
  {{ filterContent() }}
10
10
  </div>
11
11
  <div v-else-if="type==='money'" :class="[type]">
12
- <t-statistic :value="content" prefix="¥" trend="increase"/>
12
+ <t-statistic :value="parseFloat(content)" prefix="¥" trend="increase"/>
13
13
  </div>
14
14
  <div v-else-if="type==='number'" :class="[type]">
15
15
  {{ filterContent() }}
@@ -136,6 +136,12 @@ export default {
136
136
  width: fit-content;
137
137
  font-size: var(--font-size-base);
138
138
 
139
+ .default{
140
+ overflow: hidden;
141
+ white-space: nowrap;
142
+ text-overflow: ellipsis;
143
+ }
144
+
139
145
  .content-wrap {
140
146
  display: flex;
141
147
  align-items: center;
@@ -163,6 +169,18 @@ export default {
163
169
 
164
170
  }
165
171
 
172
+ .handle {
173
+ color: var(--color-primary) !important;
174
+ font-size: var(--font-size-base) !important;
175
+ cursor: pointer;
176
+
177
+ &:hover {
178
+ text-decoration: underline;
179
+ }
180
+ }
181
+
182
+
183
+
166
184
  .empty {
167
185
  color: var(--font-color-ds);
168
186
  font-size: var(--font-size-s);