n20-common-lib 2.5.0-beta.8 → 2.5.0

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 (78) hide show
  1. package/package.json +3 -4
  2. package/src/assets/css/cl-dialog.scss +5 -0
  3. package/src/assets/css/cl-form-item.scss +7 -0
  4. package/src/assets/css/cl-layout-content.scss +2 -2
  5. package/src/assets/css/cl-layout-tabs.scss +1 -1
  6. package/src/assets/css/el-table.scss +4 -0
  7. package/src/assets/css/font-icon.scss +3 -3
  8. package/src/assets/iconFont/demo_index.html +1155 -1677
  9. package/src/assets/iconFont/iconfont.css +68 -130
  10. package/src/assets/iconFont/iconfont.js +66 -1
  11. package/src/assets/iconFont/iconfont.json +0 -105
  12. package/src/assets/iconFont/iconfont.ttf +0 -0
  13. package/src/assets/iconFont/iconfont.woff +0 -0
  14. package/src/assets/iconFont/iconfont.woff2 +0 -0
  15. package/src/assets/iconFont2/demo.css +539 -0
  16. package/src/assets/iconFont2/demo_index.html +363 -0
  17. package/src/assets/iconFont2/iconfont.css +47 -0
  18. package/src/assets/iconFont2/iconfont.js +66 -0
  19. package/src/assets/iconFont2/iconfont.json +65 -0
  20. package/src/assets/iconFont2/iconfont.ttf +0 -0
  21. package/src/assets/iconFont2/iconfont.woff +0 -0
  22. package/src/assets/iconFont2/iconfont.woff2 +0 -0
  23. package/src/assets/iconFont3/demo.css +539 -0
  24. package/src/assets/iconFont3/demo_index.html +1936 -0
  25. package/src/assets/iconFont3/iconfont.css +319 -0
  26. package/src/assets/iconFont3/iconfont.js +1 -0
  27. package/src/assets/iconFont3/iconfont.json +541 -0
  28. package/{theme/fonts/iconfont.0b83701a.ttf → src/assets/iconFont3/iconfont.ttf} +0 -0
  29. package/src/assets/iconFont3/iconfont.woff +0 -0
  30. package/src/assets/iconFont3/iconfont.woff2 +0 -0
  31. package/src/assets/iconFont4/demo.css +539 -0
  32. package/src/assets/iconFont4/demo_index.html +2005 -0
  33. package/src/assets/iconFont4/iconfont.css +331 -0
  34. package/src/assets/iconFont4/iconfont.js +1 -0
  35. package/src/assets/iconFont4/iconfont.json +562 -0
  36. package/src/assets/iconFont4/iconfont.ttf +0 -0
  37. package/src/assets/iconFont4/iconfont.woff +0 -0
  38. package/src/assets/iconFont4/iconfont.woff2 +0 -0
  39. package/src/assets/realUrl.js +3 -1
  40. package/src/components/AdvancedFilter/filterList.vue +3 -2
  41. package/src/components/AdvancedFilter/index.vue +26 -3
  42. package/src/components/ApprovalButtons/getDCloumn.js +14 -0
  43. package/src/components/ApprovalButtons/index.vue +87 -18
  44. package/src/components/ApprovalButtons/specialHandle.js +157 -0
  45. package/src/components/DatePicker/por.vue +54 -54
  46. package/src/components/FileImport/index.vue +4 -0
  47. package/src/components/FileUploadTable/index.vue +18 -9
  48. package/src/components/Filters/index.vue +1 -1
  49. package/src/components/InputSearch/index.vue +1 -1
  50. package/src/components/Layout/HeaderWrap/index.vue +3 -3
  51. package/src/components/Layout/HeaderWrap/indexN.vue +3 -3
  52. package/src/components/Pagination/index.vue +2 -2
  53. package/src/components/SelectTree/index.vue +5 -3
  54. package/src/components/TablePro/index.vue +1 -1
  55. package/src/components/Upload/index.vue +4 -0
  56. package/src/components/Upload/uploadMsg.vue +10 -11
  57. package/src/plugins/Sign/InfosecNetSignCNGAgent.min.js +2 -2
  58. package/style/fonts/iconfont.6ad948fe.woff +0 -0
  59. package/style/fonts/iconfont.76d19005.woff2 +0 -0
  60. package/style/fonts/iconfont.85c70ef9.ttf +0 -0
  61. package/style/fonts/iconfont.e6bdbf43.woff2 +0 -0
  62. package/style/fonts/iconfont.f1777a50.woff +0 -0
  63. package/style/fonts/iconfont.f4c32765.ttf +0 -0
  64. package/{theme/fonts/iconfont.a9febaa2.ttf → style/fonts/iconfont.fbdd69b3.ttf} +0 -0
  65. package/style/index.css +2 -2
  66. package/style/index.css.map +1 -1
  67. package/theme/blue.css +2 -2
  68. package/theme/cctcRed.css +2 -2
  69. package/theme/green.css +2 -2
  70. package/theme/lightBlue.css +2 -2
  71. package/theme/orange.css +2 -2
  72. package/theme/purple.css +2 -2
  73. package/theme/red.css +2 -2
  74. package/theme/yellow.css +2 -2
  75. package/theme/fonts/iconfont.022f36c4.woff2 +0 -0
  76. package/theme/fonts/iconfont.10bb0e80.woff +0 -0
  77. package/theme/fonts/iconfont.3074c7f7.woff2 +0 -0
  78. package/theme/fonts/iconfont.4a1b2c93.woff +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.5.0-beta.8",
3
+ "version": "2.5.0",
4
4
  "private": false,
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -54,7 +54,6 @@
54
54
  "lz-string": "^1.4.4",
55
55
  "normalize.css": "^8.0.1",
56
56
  "numerify": "*",
57
- "ofd.js": "^1.4.1",
58
57
  "panzoom": "*",
59
58
  "qrcode": "*",
60
59
  "resize-detector": "*",
@@ -63,6 +62,7 @@
63
62
  "vuedraggable": "*"
64
63
  },
65
64
  "devDependencies": {
65
+ "element-ui": "^2.15.14",
66
66
  "@babel/plugin-proposal-optional-chaining": "^7.14.5",
67
67
  "@babel/plugin-transform-flow-comments": "^7.14.5",
68
68
  "@vue/cli-plugin-babel": "~4.5.0",
@@ -76,7 +76,6 @@
76
76
  "copy-webpack-plugin": "^6.4.1",
77
77
  "core-js": "^3.6.5",
78
78
  "echarts": "^5.3.3",
79
- "element-ui": "^2.15.14",
80
79
  "eslint": "^6.7.2",
81
80
  "eslint-plugin-vue": "^6.2.2",
82
81
  "exceljs": "^4.3.0",
@@ -109,7 +108,7 @@
109
108
  "vxe-table": "^3.6.17",
110
109
  "webpack-bundle-analyzer": "^3.9.0",
111
110
  "xe-utils": "^3.5.11",
112
- "xlsx": "0.18.5",
111
+ "xlsx": "0.14.1",
113
112
  "xlsx-style": "^0.8.13"
114
113
  },
115
114
  "browserslist": [
package/src/assets/css/cl-dialog.scss CHANGED
@@ -111,4 +111,9 @@
111
111
  line-height: 28px;
112
112
  border-bottom: none;
113
113
  }
114
+ }
115
+
116
+ .el-loading-mask {
117
+ z-index: 99999;
118
+ /* 自定义层级值 */
114
119
  }
package/src/assets/css/cl-form-item.scss CHANGED
@@ -748,3 +748,10 @@ $--input-max: 300px;
748
748
  .el-form-item__label {
749
749
  color: $--color-text-primary;
750
750
  }
751
+
752
+ .n20-approval-Button {
753
+ .el-form-item--small .el-form-item__content,
754
+ .el-form-item--small .el-form-item__label {
755
+ line-height: 1.5;
756
+ }
757
+ }
package/src/assets/css/cl-layout-content.scss CHANGED
@@ -1,6 +1,6 @@
1
1
  .content-box {
2
2
  box-sizing: border-box;
3
- margin: 0 4px 4px 4px;
3
+ margin: 0 8px 8px 8px;
4
4
  padding: 8px;
5
5
  border-radius: 0 0 6px 6px;
6
6
  height: var(--client-height);
@@ -8,7 +8,7 @@
8
8
  overflow: auto;
9
9
 
10
10
  &.element-doc {
11
- margin: 0 4px 4px 4px;
11
+ margin: 0 8px 8px 8px;
12
12
  padding: 8px;
13
13
  height: var(--client-height);
14
14
  overflow: auto;
package/src/assets/css/cl-layout-tabs.scss CHANGED
@@ -2,7 +2,7 @@ $--item-margin: 0;
2
2
  $--item-radius: 4px;
3
3
  $--layout-margin-top: 1px;
4
4
  $--item-hover-padding: 12px;
5
- $--tabs-item-margin: 4px;
5
+ $--tabs-item-margin: 8px;
6
6
 
7
7
  .tabs-nav-wrap {
8
8
  &.el-tabs--card > .el-tabs__header {
package/src/assets/css/el-table.scss CHANGED
@@ -163,6 +163,10 @@ th.vxe-header--column {
163
163
  .cell-default-set-- .vxe-table--body-wrapper .vxe-body--row .vxe-body--column .vxe-cell .vxe-cell--label:empty::before {
164
164
  content: '--';
165
165
  }
166
+ .vxe-table--render-default {
167
+ font-family: PingFang SC, Microsoft YaHei, Arial, sans-serif !important;
168
+ color: #333;
169
+ }
166
170
  @import '../../components/TableSetSize/style.scss';
167
171
  .el-table-set-size-item {
168
172
  .icon-mini {
package/src/assets/css/font-icon.scss CHANGED
@@ -27,9 +27,9 @@
27
27
 
28
28
  // @import url('//at.alicdn.com/t/c/font_3862271_abu3srabchf.css');
29
29
  // @import url('../iconFont2/iconfont.css');
30
-
31
- // @import url('../iconFont3/iconfont.css');
32
- // @import url('../iconFont4/iconfont.css');
30
+ @import url('../iconFont2/iconfont.css');
31
+ @import url('../iconFont3/iconfont.css');
32
+ @import url('../iconFont4/iconfont.css');
33
33
 
34
34
  .iconfont {
35
35
  font-family: 'iconfont' !important;