bri-components 1.2.99 → 1.2.101

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/controls/base/DshInput/BriInputs.vue +1 -1
  3. package/src/components/list/BriFlatTable.vue +25 -17
  4. package/src/components/list/DshCascaderTable.vue +3 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bri-components",
3
- "version": "1.2.99",
3
+ "version": "1.2.101",
4
4
  "author": "dengshanghui",
5
5
  "description": "a component lib for vue project",
6
6
  "main": "src/index.js",
package/src/components/controls/base/DshInput/BriInputs.vue CHANGED
@@ -159,7 +159,7 @@
159
159
  &-add {
160
160
  flex: 1;
161
161
  height: 34px;
162
- line-height: 34px;
162
+ line-height: 34px!important;
163
163
  }
164
164
  }
165
165
  }
package/src/components/list/BriFlatTable.vue CHANGED
@@ -241,29 +241,37 @@
241
241
  ];
242
242
  },
243
243
  renderHeaderCell: ({ column }, h) => {
244
- return h("span", [
244
+ return h("span", {
245
+ style: {
246
+ position: "relative"
247
+ }
248
+ }, [
245
249
  column._required && h("i", {
246
250
  style: {
251
+ position: "absolute",
252
+ top: "2px",
253
+ left: "-10px",
247
254
  color: "#ed4014"
248
255
  }
249
256
  }, "*"),
257
+
250
258
  h("span", column.title),
251
- column._description &&
252
- h("Tooltip", {
253
- style: {
254
- display: "inline-block"
255
- },
256
- props: {
257
- content: column._description,
258
- transfer: true,
259
- maxWidth: 200
260
- },
261
- scopedSlots: {
262
- default: props => h("i", {
263
- class: "table-head-description ivu-icon bico-font bico-explain"
264
- })
265
- }
266
- })
259
+
260
+ column._description && h("Tooltip", {
261
+ style: {
262
+ display: "inline-block"
263
+ },
264
+ props: {
265
+ content: column._description,
266
+ transfer: true,
267
+ maxWidth: 200
268
+ },
269
+ scopedSlots: {
270
+ default: props => h("i", {
271
+ class: "table-head-description ivu-icon bico-font bico-explain"
272
+ })
273
+ }
274
+ })
267
275
  ]);
268
276
  },
269
277
  ...item
package/src/components/list/DshCascaderTable.vue CHANGED
@@ -545,7 +545,9 @@
545
545
  .replace(/\n/g, "")
546
546
  .split(";")
547
547
  .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex];
548
- col._regMessage = (col._regMessage || "")
548
+ }
549
+ if (col._regMessage && [";", "；"].some(symbol => col._regMessage.includes(symbol))) {
550
+ col._regMessage = col._regMessage
549
551
  .replace(/\n/g, "")
550
552
  .split(";")
551
553
  .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex];