mooho-base-admin-plus 0.4.37 → 0.4.39

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 (6) hide show
  1. package/dist/mooho-base-admin-plus.min.esm.js +16 -16
  2. package/dist/mooho-base-admin-plus.min.js +3 -3
  3. package/dist/style.css +1 -1
  4. package/package.json +1 -1
  5. package/src/components/view/view-table.vue +13 -13
  6. package/src/styles/css/default.css +5 -0
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "mooho-base-admin-plus",
3
3
  "description": "MOOHO basic framework for admin by Vue3",
4
- "version": "0.4.37",
4
+ "version": "0.4.39",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "dotnetVersion": "1.4.0",
7
7
  "license": "MIT",
package/src/components/view/view-table.vue CHANGED
@@ -138,7 +138,7 @@
138
138
  :model-value="parseData(rowData(row, index), column.code)"
139
139
  @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
140
140
  :readonly="isReadonly(rowData(row, index), column)"
141
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
141
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
142
142
  :maxlength="column.maxLength"
143
143
  :pattern="column.pattern"
144
144
  :placeholder="column.description"
@@ -153,7 +153,7 @@
153
153
  :model-value="parseData(rowData(row, index), column.code)"
154
154
  @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
155
155
  :readonly="isReadonly(rowData(row, index), column)"
156
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
156
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
157
157
  :rows="column.controlHeight / 20"
158
158
  :maxlength="column.maxLength"
159
159
  :placeholder="column.description"
@@ -167,7 +167,7 @@
167
167
  :model-value="parseData(rowData(row, index), column.code)"
168
168
  @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
169
169
  :readonly="isReadonly(rowData(row, index), column)"
170
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
170
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
171
171
  :placeholder="column.description"
172
172
  @on-change="onDataChange(rowData(row, index), column)"
173
173
  @on-blur="onBlur(rowData(row, index), column)"
@@ -180,7 +180,7 @@
180
180
  @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
181
181
  :disabled="isReadonly(rowData(row, index), column)"
182
182
  clearable
183
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
183
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
184
184
  :placeholder="column.description"
185
185
  :transfer="true"
186
186
  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
@@ -196,7 +196,7 @@
196
196
  :disabled="isReadonly(rowData(row, index), column)"
197
197
  :multiple="true"
198
198
  clearable
199
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
199
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
200
200
  :placeholder="column.description"
201
201
  :transfer="true"
202
202
  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
@@ -212,7 +212,7 @@
212
212
  :disabled="isReadonly(rowData(row, index), column)"
213
213
  clearable
214
214
  filterable
215
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
215
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
216
216
  :placeholder="column.description"
217
217
  :transfer="true"
218
218
  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
@@ -230,7 +230,7 @@
230
230
  :source-data-code="column.sourceDataCode"
231
231
  :source-display-code="column.sourceDisplayCode"
232
232
  :param="getParam(rowData(row, index), column)"
233
- :controlWidth="column.controlWidth"
233
+ :controlWidth="column.controlWidth == null ? null : column.controlWidth - 8"
234
234
  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
235
235
  ></dialog-select>
236
236
  </template>
@@ -245,7 +245,7 @@
245
245
  :source-data-code="column.sourceDataCode"
246
246
  :source-display-code="column.sourceDisplayCode"
247
247
  :param="getParam(rowData(row, index), column)"
248
- :controlWidth="column.controlWidth"
248
+ :controlWidth="column.controlWidth == null ? null : column.controlWidth - 8"
249
249
  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
250
250
  ></dialog-select>
251
251
  </template>
@@ -257,7 +257,7 @@
257
257
  @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
258
258
  :readonly="isReadonly(rowData(row, index), column)"
259
259
  :placeholder="column.description"
260
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
260
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
261
261
  :transfer="true"
262
262
  @on-change="onDataChange(rowData(row, index), column)"
263
263
  ></DatePicker>
@@ -270,7 +270,7 @@
270
270
  @update:model-value="$event => setArrayData(rowData(row, index), column.code, $event)"
271
271
  :readonly="isReadonly(rowData(row, index), column)"
272
272
  :placeholder="column.description"
273
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
273
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
274
274
  :transfer="true"
275
275
  @on-change="onDataChange(rowData(row, index), column)"
276
276
  ></DatePicker>
@@ -283,7 +283,7 @@
283
283
  @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
284
284
  :readonly="isReadonly(rowData(row, index), column)"
285
285
  :placeholder="column.description"
286
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
286
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
287
287
  :transfer="true"
288
288
  @on-change="onDataChange(rowData(row, index), column)"
289
289
  ></TimePicker>
@@ -357,7 +357,7 @@
357
357
  :model-value="parseData(rowData(row, index), column.code)"
358
358
  @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
359
359
  show-input
360
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
360
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
361
361
  :max="column.MaxValue"
362
362
  :min="column.MinValue"
363
363
  />
@@ -366,7 +366,7 @@
366
366
  :model-value="parseData(rowData(row, index), column.code)"
367
367
  @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
368
368
  show-input
369
- :style="{ width: column.controlWidth == null ? null : column.controlWidth - (tableView.borderEnable ? 0 : 8) + 'px' }"
369
+ :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
370
370
  :max="column.maxValue"
371
371
  :min="column.minValue"
372
372
  />
package/src/styles/css/default.css CHANGED
@@ -251,6 +251,11 @@
251
251
  margin-right: 4px;
252
252
  }
253
253
 
254
+ .filter .ivu-upload {
255
+ margin-left: 2px !important;
256
+ margin-right: 2px !important;
257
+ }
258
+
254
259
  /* 表格内部按钮 */
255
260
  .ivu-table-cell button + button {
256
261
  margin-left: 4px;