iov-design 2.15.42 → 2.15.44

package/lib/iov-design.common.js

@@ -14813,11 +14813,12 @@ function defaultRenderCell(h, _ref7) {
       $index = _ref7.$index;
 
   var property = column.property;
+  var emptyValuePlaceholder = column.emptyValuePlaceholder;
   var value = property && Object(util_["getPropByPath"])(row, property).v;
   if (column && column.formatter) {
     return column.formatter(row, column, value, $index);
   }
-  return value;
+  return emptyValuePlaceholder && ['', undefined, null].includes(value) ? emptyValuePlaceholder : value;
 }
 
 function treeCellPrefix(h, _ref8) {
@@ -14917,7 +14918,8 @@ var columnIdSeed = 1;
           return ['ascending', 'descending', null].indexOf(order) > -1;
         });
       }
-    }
+    },
+    emptyValuePlaceholder: String
   },
 
   data: function data() {
@@ -15141,7 +15143,8 @@ var columnIdSeed = 1;
       // sort 相关属性
       sortable: sortable,
       // index 列
-      index: this.index
+      index: this.index,
+      emptyValuePlaceholder: this.emptyValuePlaceholder || ''
     });
 
     var basicProps = ['columnKey', 'label', 'className', 'labelClassName', 'type', 'renderHeader', 'formatter', 'fixed', 'resizable'];
@@ -22565,153 +22568,150 @@ var mainvue_type_template_id_6b29b012_render = function() {
           },
           [
             _vm.title !== null
-              ? _c(
-                  "div",
-                  {
-                    staticClass: "el-message-box__header",
-                    class: [
-                      _vm.showTitleBorder && "el-message-box__header-border"
-                    ]
-                  },
-                  [
-                    _c("div", { staticClass: "el-message-box__title" }, [
-                      _vm.icon && _vm.showTitleIcon
-                        ? _c("div", {
-                            class: ["el-message-box__status", _vm.icon]
-                          })
-                        : _vm._e(),
-                      _c("span", [_vm._v(_vm._s(_vm.title))])
-                    ]),
-                    _vm.showClose
-                      ? _c(
-                          "span",
-                          {
-                            staticClass: "el-message-box__headerbtn",
-                            attrs: { type: "button", "aria-label": "Close" },
-                            on: {
-                              click: function($event) {
-                                _vm.handleAction(
-                                  _vm.distinguishCancelAndClose
-                                    ? "close"
-                                    : "cancel"
-                                )
-                              },
-                              keydown: function($event) {
-                                if (
-                                  !("button" in $event) &&
-                                  _vm._k(
-                                    $event.keyCode,
-                                    "enter",
-                                    13,
-                                    $event.key,
-                                    "Enter"
-                                  )
-                                ) {
-                                  return null
-                                }
-                                _vm.handleAction(
-                                  _vm.distinguishCancelAndClose
-                                    ? "close"
-                                    : "cancel"
+              ? _c("div", { staticClass: "el-message-box__header" }, [
+                  _c("div", { staticClass: "el-message-box__title" }, [
+                    _vm.icon && _vm.showTitleIcon
+                      ? _c("div", {
+                          class: ["el-message-box__status", _vm.icon]
+                        })
+                      : _vm._e(),
+                    _c("span", [_vm._v(_vm._s(_vm.title))])
+                  ]),
+                  _vm.showClose
+                    ? _c(
+                        "span",
+                        {
+                          staticClass: "el-message-box__headerbtn",
+                          attrs: { type: "button", "aria-label": "Close" },
+                          on: {
+                            click: function($event) {
+                              _vm.handleAction(
+                                _vm.distinguishCancelAndClose
+                                  ? "close"
+                                  : "cancel"
+                              )
+                            },
+                            keydown: function($event) {
+                              if (
+                                !("button" in $event) &&
+                                _vm._k(
+                                  $event.keyCode,
+                                  "enter",
+                                  13,
+                                  $event.key,
+                                  "Enter"
                                 )
+                              ) {
+                                return null
                               }
+                              _vm.handleAction(
+                                _vm.distinguishCancelAndClose
+                                  ? "close"
+                                  : "cancel"
+                              )
                             }
+                          }
+                        },
+                        [
+                          _c("i", {
+                            staticClass: "el-message-box__close iov-icon-close"
+                          })
+                        ]
+                      )
+                    : _vm._e()
+                ])
+              : _vm._e(),
+            _vm.message !== ""
+              ? _c("div", { staticClass: "el-message-box__content" }, [
+                  _c("div", { staticClass: "el-message-box__container" }, [
+                    _vm.icon && !_vm.showTitleIcon && _vm.message !== ""
+                      ? _c("div", {
+                          class: ["el-message-box__status", _vm.icon]
+                        })
+                      : _vm._e(),
+                    _vm.message !== ""
+                      ? _c(
+                          "div",
+                          {
+                            staticClass: "el-message-box__message",
+                            class: [!_vm.icon && "no-type"]
                           },
                           [
-                            _c("i", {
-                              staticClass:
-                                "el-message-box__close iov-icon-close"
-                            })
-                          ]
+                            _vm._t("default", [
+                              !_vm.dangerouslyUseHTMLString
+                                ? _c("p", [_vm._v(_vm._s(_vm.message))])
+                                : _c("p", {
+                                    domProps: { innerHTML: _vm._s(_vm.message) }
+                                  })
+                            ])
+                          ],
+                          2
                         )
                       : _vm._e()
-                  ]
-                )
-              : _vm._e(),
-            _c("div", { staticClass: "el-message-box__content" }, [
-              _c("div", { staticClass: "el-message-box__container" }, [
-                _vm.icon && !_vm.showTitleIcon && _vm.message !== ""
-                  ? _c("div", { class: ["el-message-box__status", _vm.icon] })
-                  : _vm._e(),
-                _vm.message !== ""
-                  ? _c(
-                      "div",
-                      { staticClass: "el-message-box__message" },
-                      [
-                        _vm._t("default", [
-                          !_vm.dangerouslyUseHTMLString
-                            ? _c("p", [_vm._v(_vm._s(_vm.message))])
-                            : _c("p", {
-                                domProps: { innerHTML: _vm._s(_vm.message) }
-                              })
-                        ])
-                      ],
-                      2
-                    )
-                  : _vm._e()
-              ]),
-              _c(
-                "div",
-                {
-                  directives: [
-                    {
-                      name: "show",
-                      rawName: "v-show",
-                      value: _vm.showInput,
-                      expression: "showInput"
-                    }
-                  ],
-                  staticClass: "el-message-box__input"
-                },
-                [
-                  _c("el-input", {
-                    ref: "input",
-                    attrs: {
-                      size: "small",
-                      type: _vm.inputType,
-                      placeholder: _vm.inputPlaceholder
-                    },
-                    nativeOn: {
-                      keydown: function($event) {
-                        if (
-                          !("button" in $event) &&
-                          _vm._k(
-                            $event.keyCode,
-                            "enter",
-                            13,
-                            $event.key,
-                            "Enter"
-                          )
-                        ) {
-                          return null
-                        }
-                        return _vm.handleInputEnter($event)
-                      }
-                    },
-                    model: {
-                      value: _vm.inputValue,
-                      callback: function($$v) {
-                        _vm.inputValue = $$v
-                      },
-                      expression: "inputValue"
-                    }
-                  }),
+                  ]),
                   _c(
                     "div",
                     {
-                      staticClass: "el-message-box__errormsg",
-                      style: {
-                        visibility: !!_vm.editorErrorMessage
-                          ? "visible"
-                          : "hidden"
-                      }
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.showInput,
+                          expression: "showInput"
+                        }
+                      ],
+                      staticClass: "el-message-box__input"
                     },
-                    [_vm._v(_vm._s(_vm.editorErrorMessage))]
+                    [
+                      _c("el-input", {
+                        ref: "input",
+                        attrs: {
+                          size: "small",
+                          type: _vm.inputType,
+                          placeholder: _vm.inputPlaceholder
+                        },
+                        nativeOn: {
+                          keydown: function($event) {
+                            if (
+                              !("button" in $event) &&
+                              _vm._k(
+                                $event.keyCode,
+                                "enter",
+                                13,
+                                $event.key,
+                                "Enter"
+                              )
+                            ) {
+                              return null
+                            }
+                            return _vm.handleInputEnter($event)
+                          }
+                        },
+                        model: {
+                          value: _vm.inputValue,
+                          callback: function($$v) {
+                            _vm.inputValue = $$v
+                          },
+                          expression: "inputValue"
+                        }
+                      }),
+                      _c(
+                        "div",
+                        {
+                          staticClass: "el-message-box__errormsg",
+                          style: {
+                            visibility: !!_vm.editorErrorMessage
+                              ? "visible"
+                              : "hidden"
+                          }
+                        },
+                        [_vm._v(_vm._s(_vm.editorErrorMessage))]
+                      )
+                    ],
+                    1
                   )
-                ],
-                1
-              )
-            ]),
+                ])
+              : _vm._e(),
             _c(
               "div",
               { staticClass: "el-message-box__btns" },
@@ -22958,10 +22958,6 @@ var typeMap = {
     closeOnHashChange: {
       default: true
     },
-    showTitleBorder: {
-      default: true,
-      type: Boolean
-    },
     showTitleIcon: {
       default: false,
       type: Boolean
@@ -23239,7 +23235,6 @@ var main_defaults = {
   customClass: '',
   beforeClose: null,
   dangerouslyUseHTMLString: false,
-  showTitleBorder: true,
   showTitleIcon: false,
   roundButton: true,
   distinguishCancelAndClose: false
@@ -44041,7 +44036,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '2.15.42',
+  version: '2.15.44',
   locale: lib_locale_default.a.use,
   i18n: lib_locale_default.a.i18n,
   install: src_install,

package/lib/message-box.js

@@ -300,153 +300,150 @@ var render = function() {
           },
           [
             _vm.title !== null
-              ? _c(
-                  "div",
-                  {
-                    staticClass: "el-message-box__header",
-                    class: [
-                      _vm.showTitleBorder && "el-message-box__header-border"
-                    ]
-                  },
-                  [
-                    _c("div", { staticClass: "el-message-box__title" }, [
-                      _vm.icon && _vm.showTitleIcon
-                        ? _c("div", {
-                            class: ["el-message-box__status", _vm.icon]
-                          })
-                        : _vm._e(),
-                      _c("span", [_vm._v(_vm._s(_vm.title))])
-                    ]),
-                    _vm.showClose
-                      ? _c(
-                          "span",
-                          {
-                            staticClass: "el-message-box__headerbtn",
-                            attrs: { type: "button", "aria-label": "Close" },
-                            on: {
-                              click: function($event) {
-                                _vm.handleAction(
-                                  _vm.distinguishCancelAndClose
-                                    ? "close"
-                                    : "cancel"
-                                )
-                              },
-                              keydown: function($event) {
-                                if (
-                                  !("button" in $event) &&
-                                  _vm._k(
-                                    $event.keyCode,
-                                    "enter",
-                                    13,
-                                    $event.key,
-                                    "Enter"
-                                  )
-                                ) {
-                                  return null
-                                }
-                                _vm.handleAction(
-                                  _vm.distinguishCancelAndClose
-                                    ? "close"
-                                    : "cancel"
+              ? _c("div", { staticClass: "el-message-box__header" }, [
+                  _c("div", { staticClass: "el-message-box__title" }, [
+                    _vm.icon && _vm.showTitleIcon
+                      ? _c("div", {
+                          class: ["el-message-box__status", _vm.icon]
+                        })
+                      : _vm._e(),
+                    _c("span", [_vm._v(_vm._s(_vm.title))])
+                  ]),
+                  _vm.showClose
+                    ? _c(
+                        "span",
+                        {
+                          staticClass: "el-message-box__headerbtn",
+                          attrs: { type: "button", "aria-label": "Close" },
+                          on: {
+                            click: function($event) {
+                              _vm.handleAction(
+                                _vm.distinguishCancelAndClose
+                                  ? "close"
+                                  : "cancel"
+                              )
+                            },
+                            keydown: function($event) {
+                              if (
+                                !("button" in $event) &&
+                                _vm._k(
+                                  $event.keyCode,
+                                  "enter",
+                                  13,
+                                  $event.key,
+                                  "Enter"
                                 )
+                              ) {
+                                return null
                               }
+                              _vm.handleAction(
+                                _vm.distinguishCancelAndClose
+                                  ? "close"
+                                  : "cancel"
+                              )
                             }
+                          }
+                        },
+                        [
+                          _c("i", {
+                            staticClass: "el-message-box__close iov-icon-close"
+                          })
+                        ]
+                      )
+                    : _vm._e()
+                ])
+              : _vm._e(),
+            _vm.message !== ""
+              ? _c("div", { staticClass: "el-message-box__content" }, [
+                  _c("div", { staticClass: "el-message-box__container" }, [
+                    _vm.icon && !_vm.showTitleIcon && _vm.message !== ""
+                      ? _c("div", {
+                          class: ["el-message-box__status", _vm.icon]
+                        })
+                      : _vm._e(),
+                    _vm.message !== ""
+                      ? _c(
+                          "div",
+                          {
+                            staticClass: "el-message-box__message",
+                            class: [!_vm.icon && "no-type"]
                           },
                           [
-                            _c("i", {
-                              staticClass:
-                                "el-message-box__close iov-icon-close"
-                            })
-                          ]
+                            _vm._t("default", [
+                              !_vm.dangerouslyUseHTMLString
+                                ? _c("p", [_vm._v(_vm._s(_vm.message))])
+                                : _c("p", {
+                                    domProps: { innerHTML: _vm._s(_vm.message) }
+                                  })
+                            ])
+                          ],
+                          2
                         )
                       : _vm._e()
-                  ]
-                )
-              : _vm._e(),
-            _c("div", { staticClass: "el-message-box__content" }, [
-              _c("div", { staticClass: "el-message-box__container" }, [
-                _vm.icon && !_vm.showTitleIcon && _vm.message !== ""
-                  ? _c("div", { class: ["el-message-box__status", _vm.icon] })
-                  : _vm._e(),
-                _vm.message !== ""
-                  ? _c(
-                      "div",
-                      { staticClass: "el-message-box__message" },
-                      [
-                        _vm._t("default", [
-                          !_vm.dangerouslyUseHTMLString
-                            ? _c("p", [_vm._v(_vm._s(_vm.message))])
-                            : _c("p", {
-                                domProps: { innerHTML: _vm._s(_vm.message) }
-                              })
-                        ])
-                      ],
-                      2
-                    )
-                  : _vm._e()
-              ]),
-              _c(
-                "div",
-                {
-                  directives: [
-                    {
-                      name: "show",
-                      rawName: "v-show",
-                      value: _vm.showInput,
-                      expression: "showInput"
-                    }
-                  ],
-                  staticClass: "el-message-box__input"
-                },
-                [
-                  _c("el-input", {
-                    ref: "input",
-                    attrs: {
-                      size: "small",
-                      type: _vm.inputType,
-                      placeholder: _vm.inputPlaceholder
-                    },
-                    nativeOn: {
-                      keydown: function($event) {
-                        if (
-                          !("button" in $event) &&
-                          _vm._k(
-                            $event.keyCode,
-                            "enter",
-                            13,
-                            $event.key,
-                            "Enter"
-                          )
-                        ) {
-                          return null
-                        }
-                        return _vm.handleInputEnter($event)
-                      }
-                    },
-                    model: {
-                      value: _vm.inputValue,
-                      callback: function($$v) {
-                        _vm.inputValue = $$v
-                      },
-                      expression: "inputValue"
-                    }
-                  }),
+                  ]),
                   _c(
                     "div",
                     {
-                      staticClass: "el-message-box__errormsg",
-                      style: {
-                        visibility: !!_vm.editorErrorMessage
-                          ? "visible"
-                          : "hidden"
-                      }
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.showInput,
+                          expression: "showInput"
+                        }
+                      ],
+                      staticClass: "el-message-box__input"
                     },
-                    [_vm._v(_vm._s(_vm.editorErrorMessage))]
+                    [
+                      _c("el-input", {
+                        ref: "input",
+                        attrs: {
+                          size: "small",
+                          type: _vm.inputType,
+                          placeholder: _vm.inputPlaceholder
+                        },
+                        nativeOn: {
+                          keydown: function($event) {
+                            if (
+                              !("button" in $event) &&
+                              _vm._k(
+                                $event.keyCode,
+                                "enter",
+                                13,
+                                $event.key,
+                                "Enter"
+                              )
+                            ) {
+                              return null
+                            }
+                            return _vm.handleInputEnter($event)
+                          }
+                        },
+                        model: {
+                          value: _vm.inputValue,
+                          callback: function($$v) {
+                            _vm.inputValue = $$v
+                          },
+                          expression: "inputValue"
+                        }
+                      }),
+                      _c(
+                        "div",
+                        {
+                          staticClass: "el-message-box__errormsg",
+                          style: {
+                            visibility: !!_vm.editorErrorMessage
+                              ? "visible"
+                              : "hidden"
+                          }
+                        },
+                        [_vm._v(_vm._s(_vm.editorErrorMessage))]
+                      )
+                    ],
+                    1
                   )
-                ],
-                1
-              )
-            ]),
+                ])
+              : _vm._e(),
             _c(
               "div",
               { staticClass: "el-message-box__btns" },
@@ -711,10 +708,6 @@ var typeMap = {
     closeOnHashChange: {
       default: true
     },
-    showTitleBorder: {
-      default: true,
-      type: Boolean
-    },
     showTitleIcon: {
       default: false,
       type: Boolean
@@ -999,7 +992,6 @@ var defaults = {
   customClass: '',
   beforeClose: null,
   dangerouslyUseHTMLString: false,
-  showTitleBorder: true,
   showTitleIcon: false,
   roundButton: true,
   distinguishCancelAndClose: false