@netang/quasar 0.0.97 → 0.0.99

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.
@@ -1,13 +1,15 @@
1
1
  <template>
2
2
  <div class="full-width">
3
- <q-badge
3
+
4
+ <q-chip
5
+ square
4
6
  :label="label"
5
- color="grey-7"
6
- outline
7
+ :clickable="false"
8
+ :ripple="false"
7
9
  >
8
10
  <!-- 提示信息 -->
9
11
  <q-tooltip anchor="center right" self="center left" v-if="tooltip">{{tooltip}}</q-tooltip>
10
- </q-badge>
12
+ </q-chip>
11
13
 
12
14
  <!-- 插槽 -->
13
15
  <slot />
@@ -89,7 +89,11 @@
89
89
  @row-dblclick="currentTableRowDblclick"
90
90
  @request="tableRequest"
91
91
  flat
92
- virtual-scroll
92
+ :virtual-scroll="{
93
+ virtualScrollSliceRatioBefore: 20,
94
+ virtualScrollSliceSize: 50,
95
+ virtualScrollSliceRatioAfter: 20,
96
+ }"
93
97
  :dense="dense"
94
98
  v-bind="$attrs"
95
99
  >
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@netang/quasar",
3
- "version": "0.0.97",
3
+ "version": "0.0.99",
4
4
  "description": "netang-quasar",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
@@ -154,6 +154,22 @@
154
154
  &.q-textarea.q-field--labeled .q-field__control-container {
155
155
  padding-top: 5px;
156
156
  }
157
+
158
+ // 底部
159
+ .q-field__bottom {
160
+ position: absolute;
161
+ padding: 0;
162
+
163
+ .q-field__messages {
164
+ position: absolute;
165
+ top: -8px;
166
+ right: 5px;
167
+ line-height: 16px;
168
+ padding: 0 6px;
169
+ border-radius: 6px;
170
+ background-color: #ffffff;
171
+ }
172
+ }
157
173
  }
158
174
 
159
175
  &--labeled {
@@ -189,6 +205,11 @@
189
205
  .q-field__input {
190
206
  z-index: 2;
191
207
  }
208
+
209
+ // 底部
210
+ &--with-bottom {
211
+ padding-bottom: 0;
212
+ }
192
213
  }
193
214
 
194
215
  &.q-field--auto-height.q-field--labeled .q-field__control-container {
package/utils/getTime.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import $n_isValidString from '@netang/utils/isValidString'
2
2
  import $n_toDate from '@netang/utils/toDate'
3
+ import $n_indexOf from '@netang/utils/indexOf'
3
4
 
4
5
  import $n_timestamp from './timestamp'
5
6
 
@@ -91,7 +92,13 @@ export default function getTime(time, options, defaultValue = '') {
91
92
  }
92
93
 
93
94
  // 如果是今年是否显示
94
- if (! hideCurrentYear || quasarDate.formatDate(date, 'YYYY') !== quasarDate.formatDate(now, 'YYYY')) {
95
+ if (
96
+ $n_indexOf(format, 'YYYY') === -1
97
+ && (
98
+ ! hideCurrentYear
99
+ || quasarDate.formatDate(date, 'YYYY') !== quasarDate.formatDate(now, 'YYYY')
100
+ )
101
+ ) {
95
102
  format = 'YYYY-' + format
96
103
  }
97
104