sh-view 2.0.8 → 2.1.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 (13) hide show
  1. package/package.json +2 -2
  2. package/packages/assets/css/main.scss +2 -50
  3. package/packages/assets/css/theme.scss +35 -16
  4. package/packages/components/global-components/sh-drawer/index.vue +7 -1
  5. package/packages/components/other-components/sh-cron-modal/components/cron-content.vue +283 -287
  6. package/packages/components/other-components/sh-menu/index.vue +2 -0
  7. package/packages/components/other-components/sh-menu/menu-item-content.vue +61 -61
  8. package/packages/components/other-components/sh-menu-card/index.vue +19 -3
  9. package/packages/components/other-components/sh-menu-card/menu-box.vue +81 -68
  10. package/packages/components/other-components/sh-system-tip/index.vue +111 -113
  11. package/packages/vxeTable/css/index.scss +3 -0
  12. package/packages/vxeTable/render/cell/vxe-render-input.vue +13 -1
  13. package/packages/vxeTable/render/mixin/cell-mixin.js +0 -11
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sh-view",
3
- "version": "2.0.8",
3
+ "version": "2.1.0",
4
4
  "description": "基于vxe-table二次封装",
5
5
  "main": "packages/index.js",
6
6
  "scripts": {
@@ -37,7 +37,7 @@
37
37
  "vue-masonry": "^0.16.0",
38
38
  "vue-router": "^4.2.2",
39
39
  "vuex": "^4.1.0",
40
- "vxe-table": "^4.5.7",
40
+ "vxe-table": "^4.5.8",
41
41
  "vxe-table-plugin-export-pdf": "^3.0.4",
42
42
  "vxe-table-plugin-export-xlsx": "^3.0.5",
43
43
  "xe-clipboard": "^1.10.2",
package/packages/assets/css/main.scss CHANGED
@@ -158,11 +158,6 @@ input::-webkit-outer-spin-button, input::-webkit-inner-spin-button { -webkit-ap
158
158
  input[type="number"]{ -moz-appearance: textfield; }
159
159
  .disabled-gray{ filter: grayscale(1); -webkit-filter: grayscale(1); -moz-filter: grayscale(1); -o-filter: grayscale(1); filter:progid:DXImageTransform.Microsoft.BasicImage(grayscale=1);}
160
160
 
161
-
162
- // iview 样式调整
163
- .ivu-layout{ background: transparent }
164
- .ivu-drawer-content{ background-color: var(--vxe-table-body-background-color) }
165
-
166
161
  .sh-prevent--disabled{
167
162
  background-color: #ddd !important;
168
163
  border-color: #ddd !important;
@@ -188,39 +183,6 @@ input[type="number"]{ -moz-appearance: textfield; }
188
183
  margin-right: 5px;
189
184
  }
190
185
 
191
- // 布局样式
192
- .sh-layout-wrap {
193
- background-color: var(--main-background);
194
- .header-item{
195
- padding: 0 8px;
196
- cursor: pointer;
197
- &:hover{
198
- background-color: rgba(0, 0, 0, .1);
199
- }
200
- }
201
- .sh-layout-layout-sider{
202
- height: 100%;
203
- flex-direction: row;
204
- }
205
- .sh-layout-layout-content{
206
- overflow-x: hidden;
207
- position: relative;
208
- margin: 9px;
209
- }
210
- .sh-layout-layout-content-inner{
211
- width: 100%;
212
- height: 100%;
213
- overflow-x: hidden;
214
- overflow-y: auto;
215
- position: absolute;
216
- }
217
- }
218
- .sh-layout-drawer-sider{
219
- .sh-sys-logo{
220
- height: auto;
221
- max-height: 100px;
222
- }
223
- }
224
186
 
225
187
  //sh空数据风格
226
188
  .sh-empty{
@@ -229,10 +191,6 @@ input[type="number"]{ -moz-appearance: textfield; }
229
191
  padding: 10px;
230
192
  }
231
193
 
232
- //sh列表list风格
233
- .sh-list{
234
- }
235
-
236
194
  // sh-vxeform无底部提交按钮，做公共样式
237
195
  .sh-common-footer{
238
196
  padding: 10px;
@@ -240,16 +198,10 @@ input[type="number"]{ -moz-appearance: textfield; }
240
198
  display: flex;
241
199
  align-items: center;
242
200
  justify-content: space-between;
243
- .vxe-button + .vxe-button,
244
- .vxe-button + .vxe-button--dropdown,
245
- .vxe-input + .vxe-button,
246
- .vxe-input + .vxe-button--dropdown{
247
- margin-left: 5px;
248
- }
249
- .sh-table-form-buttons-left{
201
+ &-left{
250
202
  flex: 1;
251
203
  }
252
- .sh-table-form-buttons-right{
204
+ &-right{
253
205
  }
254
206
  }
255
207
 
package/packages/assets/css/theme.scss CHANGED
@@ -72,24 +72,43 @@
72
72
  --vxe-primary-darken-color: #e03554;
73
73
  --primary-weak-color: #ffccd6;
74
74
  }
75
+
75
76
  // 暗黑
76
77
  .sh-dark-mode{
77
- --vxe-font-color: #999999;
78
- --vxe-icon-background-color: #999999;
79
- --vxe-table-font-color: #999999;
80
- --vxe-table-header-background-color: #222222;
81
- --vxe-table-body-background-color: #141414;
82
- --vxe-table-footer-background-color: #141414;
83
- --vxe-input-background-color: #0a0a0a;
84
- --vxe-textarea-background-color: #0a0a0a;
85
- --vxe-textarea-count-background-color: #0a0a0a;
86
- --vxe-table-border-color: #454545;
87
- --vxe-input-border-color: #454545;
88
- --vxe-pager-background-color: #141414;
78
+ --vxe-font-color: #dddddd;
79
+ --vxe-icon-background-color: #dddddd;
80
+ --vxe-table-font-color: #dddddd;
81
+ --vxe-table-header-font-color: #dddddd;
82
+ --vxe-table-header-background-color: #444444;
83
+ --vxe-table-body-background-color: #141414;
84
+ --vxe-table-footer-background-color: #141414;
85
+ --vxe-table-row-hover-background-color: #454545;
86
+ --vxe-table-row-striped-background-color: #111111;
87
+ --vxe-table-row-hover-striped-background-color: #555555;
88
+ --vxe-table-row-radio-checked-background-color: #090909;
89
+ --vxe-table-row-hover-radio-checked-background-color: #000000;
90
+ --vxe-table-row-checkbox-checked-background-color: #090909;
91
+ --vxe-table-row-hover-checkbox-checked-background-color: #000000;
92
+ --vxe-table-row-current-background-color: #090909;
93
+ --vxe-table-row-hover-current-background-color: #000000;
94
+ --vxe-table-column-hover-background-color: #454545;
95
+ --vxe-table-column-current-background-color: #090909;
96
+ --vxe-input-date-picker-hover-background-color: #666666;
97
+ --vxe-input-background-color: #0a0a0a;
98
+ --vxe-input-panel-background-color: #0a0a0a;
99
+ --vxe-textarea-background-color: #0a0a0a;
100
+ --vxe-textarea-count-background-color: #0a0a0a;
101
+ --vxe-pulldown-panel-background-color: #141414;
102
+ --vxe-pager-background-color: #141414;
89
103
  --vxe-pager-perfect-background-color: #141414;
90
104
  --vxe-pager-perfect-button-background-color: #454545;
91
- --vxe-button-default-background-color: #454545;
92
- --vxe-switch-close-background-color: #454545;
93
- --main-background: #0a0a0a;
94
- --primary-weak-color: #222222;
105
+ --vxe-button-default-background-color: #454545;
106
+ --vxe-switch-close-background-color: #454545;
107
+ --vxe-select-panel-background-color: #141414;
108
+ --vxe-select-option-hover-background-color: #454545;
109
+ --vxe-table-border-color: #666666;
110
+ --vxe-input-border-color: #666666;
111
+ --vxe-table-popup-border-color: #666666;
112
+ --primary-weak-color: #222222;
113
+ --main-background: #0a0a0a;
95
114
  }
package/packages/components/global-components/sh-drawer/index.vue CHANGED
@@ -18,7 +18,9 @@
18
18
  <div class="sh-drawer-header-inner">{{ title }}</div>
19
19
  </slot>
20
20
  </div>
21
- <div class="sh-drawer-body" :style="styles"><slot></slot></div>
21
+ <div class="sh-drawer-body" :style="styles">
22
+ <slot v-if="modelValue || !destroyOnClose"></slot>
23
+ </div>
22
24
  </div>
23
25
  <div v-if="draggable && (placement === 'left' || placement === 'right')" class="sh-drawer-drag" :class="'sh-drawer-drag-' + placement" @mousedown="handleTriggerMousedown">
24
26
  <slot name="trigger">
@@ -99,6 +101,10 @@ export default {
99
101
  type: Boolean,
100
102
  default: false
101
103
  },
104
+ destroyOnClose: {
105
+ type: Boolean,
106
+ default: false
107
+ },
102
108
  beforeClose: Function
103
109
  },
104
110
  emits: ['update:modelValue', 'close', 'resize-width', 'visible-change', 'drag'],