@newview/ui 1.1.43 → 1.1.44

package/dist/newview-ui.js

@@ -31054,7 +31054,7 @@ class IconSelectInstance extends BaseInstance {
 }
 const IconSelect_vue_vue_type_style_index_0_lang = "";
 const _hoisted_1$g = { class: "icon-select" };
-const _hoisted_2$c = { class: "icon-select-search" };
+const _hoisted_2$d = { class: "icon-select-search" };
 const _hoisted_3$a = { class: "icon-select-list" };
 const _hoisted_4$7 = ["onClick", "title"];
 function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
@@ -31077,7 +31077,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
         createElementVNode("div", {
           style: normalizeStyle({ width: _ctx.poptipWidth + "px" })
         }, [
-          createElementVNode("div", _hoisted_2$c, [
+          createElementVNode("div", _hoisted_2$d, [
             createVNode(_component_Input, {
               modelValue: _ctx.iconSearch,
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.iconSearch = $event),
@@ -31279,9 +31279,9 @@ let ComFormInstance$1 = class ComFormInstance2 extends BaseInstance {
   }
   //#endregion 公开Api End
 };
-const ComForm_vue_vue_type_style_index_0_scoped_ce727065_lang = "";
+const ComForm_vue_vue_type_style_index_0_scoped_c0789c35_lang = "";
 const _hoisted_1$f = { class: "comForm" };
-const _hoisted_2$b = { key: 1 };
+const _hoisted_2$c = { key: 1 };
 const _hoisted_3$9 = ["onClick"];
 function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_com_form = resolveComponent("com-form", true);
@@ -31315,7 +31315,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
     createElementVNode("div", {
       class: normalizeClass({ onlyViewForm: _ctx.onlyView })
     }, [
-      createVNode(_component_Row, { gutter: 16 }, {
+      createVNode(_component_Row, { gutter: 40 }, {
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.formItems, (item2, index2) => {
             return withDirectives((openBlock(), createBlock(_component_Col, {
@@ -31371,7 +31371,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
                       loading: _ctx.getPropValue(item2.switchProp, "loading"),
                       onOnChange: ($event) => _ctx.getPropEvent(item2.switchProp, "onChange")($event, item2)
                     }, null, 8, ["modelValue", "onUpdate:modelValue", "size", "disabled", "true-value", "false-value", "true-color", "false-color", "before-change", "loading", "onOnChange"])) : createCommentVNode("", true),
-                    item2.type == "Label" ? (openBlock(), createElementBlock("span", _hoisted_2$b, toDisplayString(_ctx.formModel[item2.model]), 1)) : createCommentVNode("", true),
+                    item2.type == "Label" ? (openBlock(), createElementBlock("span", _hoisted_2$c, toDisplayString(_ctx.formModel[item2.model]), 1)) : createCommentVNode("", true),
                     item2.type == "Button" ? (openBlock(), createBlock(_component_Button, {
                       key: 2,
                       type: _ctx.getPropValue(item2.buttonProp, "type"),
@@ -31808,7 +31808,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)
   ]);
 }
-const ComForm = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-ce727065"]]);
+const ComForm = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-c0789c35"]]);
 const style = "";
 const propDefine$s = {
   options: {
@@ -32293,7 +32293,7 @@ let ToolbarInstance$1 = class ToolbarInstance2 extends BaseInstance {
 };
 const Toolbar_vue_vue_type_style_index_0_scoped_69337cbe_lang = "";
 const _hoisted_1$e = { class: "toolbar" };
-const _hoisted_2$a = { style: { "display": "none" } };
+const _hoisted_2$b = { style: { "display": "none" } };
 const _hoisted_3$8 = { key: 0 };
 function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Button = resolveComponent("Button");
@@ -32306,7 +32306,7 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Space = resolveComponent("Space");
   return openBlock(), createElementBlock("div", _hoisted_1$e, [
     (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.mainOptions, (item2, index2) => {
-      return openBlock(), createElementBlock("div", _hoisted_2$a, [
+      return openBlock(), createElementBlock("div", _hoisted_2$b, [
         _ctx.getIsShow(item2) ? (openBlock(), createElementBlock("span", _hoisted_3$8)) : createCommentVNode("", true)
       ]);
     }), 256)),
@@ -32679,6 +32679,16 @@ class GridColumnInstance extends BaseInstance {
       }
       return column.visible;
     });
+    __publicField2(this, "getHeaderAlign", (column) => {
+      return column.headerAlign ? column.headerAlign : this.getAlign(column);
+    });
+    __publicField2(this, "getAlign", (column) => {
+      let defaultAlign = "left";
+      if (column.colType == "num") {
+        defaultAlign = "right";
+      }
+      return column.align ? column.align : defaultAlign;
+    });
     //#endregion Ch 列 属性获取  END
     //#region switchConfig 列 属性获取
     __publicField2(this, "getIsEnableSw", (row) => {
@@ -32914,8 +32924,12 @@ class GridColumnInstance extends BaseInstance {
   //#endregion
 }
 const GridColumn_vue_vue_type_style_index_0_lang = "";
-const GridColumn_vue_vue_type_style_index_1_scoped_4b006467_lang = "";
+const GridColumn_vue_vue_type_style_index_1_scoped_be3de0b4_lang = "";
 const _hoisted_1$d = { class: "gridColumn" };
+const _hoisted_2$a = {
+  key: 3,
+  class: "nv-num-text"
+};
 function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_GridTitleContent = resolveComponent("GridTitleContent");
   const _component_grid_column = resolveComponent("grid-column", true);
@@ -32956,7 +32970,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
           column.colType == "seq" ? (openBlock(), createBlock(_component_vxe_column, {
             key: 0,
             type: "seq",
-            align: column.align ? column.align : "center",
+            align: column.align ? column.align : "left",
             width: column.width ? column.width : 60,
             fixed: column.fixed ? column.fixed : null
           }, {
@@ -32996,7 +33010,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
             visible: column.visible,
             fixed: column.fixed ? column.fixed : null,
             align: column.align ? column.align : "left",
-            "header-align": column.headerAlign ? column.headerAlign : "center",
+            "header-align": _ctx.getHeaderAlign(column),
             "footer-align": column.footerAlign,
             "show-overflow": column.showOverflow,
             "show-header-overflow": column.showHeaderOverflow,
@@ -33026,8 +33040,8 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
             resizable: column.resizable,
             visible: column.visible,
             fixed: column.fixed ? column.fixed : null,
-            align: column.align ? column.align : "left",
-            "header-align": column.headerAlign ? column.headerAlign : "center",
+            align: _ctx.getAlign(column),
+            "header-align": _ctx.getHeaderAlign(column),
             "footer-align": column.footerAlign,
             "show-overflow": column.showOverflow,
             "show-header-overflow": column.showHeaderOverflow,
@@ -33169,8 +33183,8 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
                 modelValue: row[_ctx.getField(column)],
                 "onUpdate:modelValue": ($event) => row[_ctx.getField(column)] = $event,
                 disabled: true
-              }, null, 8, ["modelValue", "onUpdate:modelValue"])) : (openBlock(), createBlock(_component_GridCellContent, {
-                key: 3,
+              }, null, 8, ["modelValue", "onUpdate:modelValue"])) : column.colType == "num" ? (openBlock(), createElementBlock("span", _hoisted_2$a, toDisplayString(row[_ctx.getField(column)]), 1)) : (openBlock(), createBlock(_component_GridCellContent, {
+                key: 4,
                 column,
                 row
               }, null, 8, ["column", "row"]))
@@ -33221,7 +33235,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
             visible: column.visible,
             fixed: column.fixed ? column.fixed : null,
             align: column.align ? column.align : "left",
-            "header-align": column.headerAlign ? column.headerAlign : "center",
+            "header-align": _ctx.getHeaderAlign(column),
             "footer-align": column.footerAlign,
             "show-overflow": column.showOverflow,
             "show-header-overflow": column.showHeaderOverflow,
@@ -33254,7 +33268,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
     }), 256))
   ]);
 }
-const GridColumn = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$i], ["__scopeId", "data-v-4b006467"]]);
+const GridColumn = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render$i], ["__scopeId", "data-v-be3de0b4"]]);
 const _sfc_main$h = defineComponent({
   name: "FilterDaterange",
   props: {
@@ -33883,6 +33897,15 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
       }
       return false;
     });
+    /**
+     * 单元格内容过长时是否显示为省略号
+     */
+    __publicField2(this, "getShowOverflow", () => {
+      if (this.props.option.setting) {
+        return this.utilities.isNull(this.props.option.setting.showOverflow) ? true : this.props.option.setting.showOverflow;
+      }
+      return true;
+    });
     /**
      * 显示标题
      * @returns 
@@ -33935,7 +33958,10 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
      * @returns 
      */
     __publicField2(this, "getRowConfig", () => {
-      return this.utilities.isNull(this.props.option.setting) ? {} : this.props.option.setting.rowConfig;
+      let defaultConfig2 = {
+        height: 48
+      };
+      return this.utilities.isNull(this.props.option.setting) ? {} : Object.assign(defaultConfig2, this.props.option.setting.rowConfig, {});
     });
     /**
      * 获取右键菜单配置
@@ -34761,8 +34787,8 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
   }
   //#endregion 公开方法 END
 };
-const Grid_vue_vue_type_style_index_0_scoped_d8ee6cc9_lang = "";
-const _withScopeId$2 = (n) => (pushScopeId("data-v-d8ee6cc9"), n = n(), popScopeId(), n);
+const Grid_vue_vue_type_style_index_0_scoped_7371900e_lang = "";
+const _withScopeId$2 = (n) => (pushScopeId("data-v-7371900e"), n = n(), popScopeId(), n);
 const _hoisted_1$a = { class: "nv-crud nv-pos-r" };
 const _hoisted_2$7 = { class: "grid-msg" };
 const _hoisted_3$6 = { class: "nv-crud-body" };
@@ -34919,6 +34945,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
           "span-method": _ctx.rowspanMethod,
           "checkbox-config": _ctx.getCheckboxConfig(),
           stripe: _ctx.getStripe(),
+          "show-overflow": _ctx.getShowOverflow(),
           onKeydownStart: _ctx.gridEvents.keydownStart,
           onKeydown: _ctx.gridEvents.keydown,
           onKeydownEnd: _ctx.gridEvents.keydownEnd,
@@ -34966,7 +34993,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
             }, null, 8, ["columns", "xTable", "onClearRadioRow", "onDelete", "onAddchild"])
           ]),
           _: 1
-        }, 16, ["empty-text", "data", "border", "show-header", "row-class-name", "cell-class-name", "row-config", "edit-config", "tree-config", "edit-rules", "menu-config", "filter-config", "span-method", "checkbox-config", "stripe", "onKeydownStart", "onKeydown", "onKeydownEnd", "onPaste", "onCopy", "onCut", "onCurrentChange", "onRadioChange", "onCheckboxChange", "onCheckboxAll", "onCheckboxRangeStart", "onCheckboxRangeChange", "onCheckboxRangeEnd", "onCellClick", "onCellDblclick", "onCellMenu", "onCellMouseenter", "onCellMouseleave", "onHeaderCellClick", "onHeaderCellDblclick", "onHeaderCellMenu", "onFooterCellClick", "onFooterCellDblclick", "onFooterCellMenu", "onSortChange", "onFilterChange", "onResizableChange", "onToggleRowExpand", "onToggleTreeExpand", "onMenuClick", "onEditClosed", "onEditActived", "onEditDisabled", "onValidError", "onScroll", "onCustom"]), [
+        }, 16, ["empty-text", "data", "border", "show-header", "row-class-name", "cell-class-name", "row-config", "edit-config", "tree-config", "edit-rules", "menu-config", "filter-config", "span-method", "checkbox-config", "stripe", "show-overflow", "onKeydownStart", "onKeydown", "onKeydownEnd", "onPaste", "onCopy", "onCut", "onCurrentChange", "onRadioChange", "onCheckboxChange", "onCheckboxAll", "onCheckboxRangeStart", "onCheckboxRangeChange", "onCheckboxRangeEnd", "onCellClick", "onCellDblclick", "onCellMenu", "onCellMouseenter", "onCellMouseleave", "onHeaderCellClick", "onHeaderCellDblclick", "onHeaderCellMenu", "onFooterCellClick", "onFooterCellDblclick", "onFooterCellMenu", "onSortChange", "onFilterChange", "onResizableChange", "onToggleRowExpand", "onToggleTreeExpand", "onMenuClick", "onEditClosed", "onEditActived", "onEditDisabled", "onValidError", "onScroll", "onCustom"]), [
           [vShow, _ctx.showTable]
         ])
       ], 512)
@@ -34984,7 +35011,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
     ])) : createCommentVNode("", true)
   ]);
 }
-const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-d8ee6cc9"]]);
+const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-7371900e"]]);
 const propDefine$o = {
   width: {
     // Box 宽度
@@ -213478,6 +213505,15 @@ class GridInstance extends BaseInstance {
       }
       return false;
     });
+    /**
+     * 单元格内容过长时是否显示为省略号
+     */
+    __publicField2(this, "getShowOverflow", () => {
+      if (this.props.option.setting) {
+        return this.utilities.isNull(this.props.option.setting.showOverflow) ? true : this.props.option.setting.showOverflow;
+      }
+      return true;
+    });
     /**
      * 显示标题
      * @returns 
@@ -213530,7 +213566,10 @@ class GridInstance extends BaseInstance {
      * @returns 
      */
     __publicField2(this, "getRowConfig", () => {
-      return this.utilities.isNull(this.props.option.setting) ? {} : this.props.option.setting.rowConfig;
+      let defaultConfig2 = {
+        height: 48
+      };
+      return this.utilities.isNull(this.props.option.setting) ? {} : Object.assign(defaultConfig2, this.props.option.setting.rowConfig, {});
     });
     /**
      * 获取右键菜单配置