@newview/ui 1.1.18 → 1.1.19

package/README.md

@@ -1,7 +1,12 @@
+### 1.1.19
+
+1.修改表单 datePickerProp 中 format 的数据类型
+
 ### 1.1.18
 
 1. Grid date 增加日期格式化
-2. NvBox 宽度缓慢变化问题处理
+2. Grid 增加列 switch 相关配置
+3. NvBox 宽度缓慢变化问题处理
 
 ### 1.1.17
 

package/dist/newview-ui.js

@@ -5,7 +5,7 @@ var __publicField2 = (obj, key2, value) => {
   return value;
 };
 import { BaseInstance } from "@newview/base-vue";
-import { openBlock, createElementBlock, normalizeStyle, defineComponent, ref, resolveComponent, createVNode, reactive, watch, onMounted, onUnmounted, createBlock, withCtx, createElementVNode, Fragment, renderList, normalizeClass, withDirectives, createTextVNode, toDisplayString, renderSlot, createCommentVNode, createSlots, vShow, h, toRaw, computed, nextTick, mergeProps, toHandlers, pushScopeId, popScopeId, withModifiers, createApp, getCurrentInstance } from "vue";
+import { openBlock, createElementBlock, normalizeStyle, defineComponent, ref, resolveComponent, createVNode, reactive, watch, onMounted, onUnmounted, createBlock, withCtx, createElementVNode, Fragment, renderList, normalizeClass, withDirectives, createTextVNode, toDisplayString, renderSlot, createCommentVNode, createSlots, vShow, h, mergeProps, toRaw, computed, nextTick, toHandlers, pushScopeId, popScopeId, withModifiers, createApp, getCurrentInstance } from "vue";
 import { VxeColumn, VxeColgroup, VXETable, VxeGrid, VxeTable } from "vxe-table";
 import { utilities } from "@newview/tools";
 import { Space, Icon, Drawer, Button } from "view-ui-plus";
@@ -31278,7 +31278,7 @@ let ComFormInstance$1 = class ComFormInstance2 extends BaseInstance {
   }
   //#endregion 公开Api End
 };
-const ComForm_vue_vue_type_style_index_0_scoped_eba0d593_lang = "";
+const ComForm_vue_vue_type_style_index_0_scoped_5fbb5cd3_lang = "";
 const _hoisted_1$b = { class: "comForm" };
 const _hoisted_2$9 = { key: 1 };
 function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
@@ -31673,6 +31673,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
                       key: 13,
                       modelValue: _ctx.formModel[item2.model],
                       "onUpdate:modelValue": ($event) => _ctx.formModel[item2.model] = $event,
+                      style: { "width": "100%" },
                       type: _ctx.getPropValue(item2.timePickerProp, "type"),
                       format: _ctx.getPropValue(item2.timePickerProp, "format"),
                       steps: _ctx.getPropValue(item2.timePickerProp, "steps"),
@@ -31802,7 +31803,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)
   ]);
 }
-const ComForm = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g], ["__scopeId", "data-v-eba0d593"]]);
+const ComForm = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g], ["__scopeId", "data-v-5fbb5cd3"]]);
 const style = "";
 const propDefine$o = {
   options: {
@@ -32674,6 +32675,17 @@ class GridColumnInstance extends BaseInstance {
       return column.visible;
     });
     //#endregion Ch 列 属性获取  END
+    //#region switchConfig 列 属性获取
+    __publicField2(this, "getIsEnableSw", (row) => {
+      if (this.utilities.isNull(row.isEnable)) {
+        return true;
+      }
+      if (typeof row.isEnable == "boolean") {
+        return row.isEnable;
+      }
+      return row.isEnable(row);
+    });
+    //#endregion switchConfig 列 属性获取  END
     //#endregion 列属性获取 End
     //#region 事件
     __publicField2(this, "doClearRadioRow", () => {
@@ -32707,7 +32719,10 @@ class GridColumnInstance extends BaseInstance {
     __publicField2(this, "getColumFilters", (filter3) => {
       if (filter3) {
         if (filter3.type == "select") {
-          return filter3.options;
+          return filter3.options.map((e) => {
+            e.label = e.label ? e.label : e.text;
+            return e;
+          });
         } else if (filter3.type == "daterange") {
           return [{ data: ["", ""] }];
         } else {
@@ -32889,7 +32904,7 @@ class GridColumnInstance extends BaseInstance {
   //#endregion
 }
 const GridColumn_vue_vue_type_style_index_0_lang = "";
-const GridColumn_vue_vue_type_style_index_1_scoped_067f3d07_lang = "";
+const GridColumn_vue_vue_type_style_index_1_scoped_7c63c696_lang = "";
 const _hoisted_1$9 = { class: "gridColumn" };
 function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_GridTitleContent = resolveComponent("GridTitleContent");
@@ -32907,6 +32922,7 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Select = resolveComponent("Select");
   const _component_TreeSelect = resolveComponent("TreeSelect");
   const _component_Checkbox = resolveComponent("Checkbox");
+  const _component_Switch = resolveComponent("Switch");
   const _component_Button = resolveComponent("Button");
   const _component_Space = resolveComponent("Space");
   return openBlock(), createElementBlock("div", _hoisted_1$9, [
@@ -32991,7 +33007,7 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
               }, null, 8, ["column", "row"])
             ]),
             _: 2
-          }, 1032, ["field", "min-width", "width", "resizable", "visible", "fixed", "align", "header-align", "footer-align", "show-overflow", "show-header-overflow", "show-footer-overflow", "class-name", "header-class-name", "footer-class-name", "formatter", "sortable", "sort-by", "sort-type", "tree-node"])) : column.colType == "ed" || column.colType == "password" || column.colType == "auto" || column.colType == "date" || column.colType == "time" || column.colType == "num" || column.colType == "select" || column.colType == "treeSelect" || column.colType == "ch" ? (openBlock(), createBlock(_component_vxe_column, {
+          }, 1032, ["field", "min-width", "width", "resizable", "visible", "fixed", "align", "header-align", "footer-align", "show-overflow", "show-header-overflow", "show-footer-overflow", "class-name", "header-class-name", "footer-class-name", "formatter", "sortable", "sort-by", "sort-type", "tree-node"])) : column.colType == "ed" || column.colType == "password" || column.colType == "auto" || column.colType == "date" || column.colType == "time" || column.colType == "num" || column.colType == "select" || column.colType == "treeSelect" || column.colType == "ch" || column.colType == "switch" ? (openBlock(), createBlock(_component_vxe_column, {
             key: 4,
             field: column.field,
             "min-width": column.minWidth,
@@ -33103,7 +33119,14 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
                 "true-value": _ctx.getChTrueValue(column),
                 "false-value": _ctx.getChFalseValue(column),
                 onOnChange: ($event) => _ctx.doChange(column, scope.row)
-              }, null, 8, ["modelValue", "onUpdate:modelValue", "size", "true-value", "false-value", "onOnChange"])) : createCommentVNode("", true)
+              }, null, 8, ["modelValue", "onUpdate:modelValue", "size", "true-value", "false-value", "onOnChange"])) : column.colType == "switch" ? (openBlock(), createBlock(_component_Switch, mergeProps({
+                key: 9,
+                modelValue: scope.row[_ctx.getField(column)],
+                "onUpdate:modelValue": ($event) => scope.row[_ctx.getField(column)] = $event
+              }, column.switchConfig, {
+                onOnChange: ($event) => _ctx.doChange(column, scope.row),
+                disabled: _ctx.getIsEnableSw(column)
+              }), null, 16, ["modelValue", "onUpdate:modelValue", "onOnChange", "disabled"])) : createCommentVNode("", true)
             ]),
             default: withCtx(({ row }) => [
               column.colType == "ch" ? (openBlock(), createBlock(_component_Checkbox, {
@@ -33114,8 +33137,15 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
                 "true-value": _ctx.getChTrueValue(column),
                 "false-value": _ctx.getChFalseValue(column),
                 onOnChange: ($event) => _ctx.doChange(column, row)
-              }, null, 8, ["modelValue", "onUpdate:modelValue", "size", "true-value", "false-value", "onOnChange"])) : (openBlock(), createBlock(_component_GridCellContent, {
+              }, null, 8, ["modelValue", "onUpdate:modelValue", "size", "true-value", "false-value", "onOnChange"])) : column.colType == "switch" ? (openBlock(), createBlock(_component_Switch, mergeProps({
                 key: 1,
+                modelValue: row[_ctx.getField(column)],
+                "onUpdate:modelValue": ($event) => row[_ctx.getField(column)] = $event
+              }, column.switchConfig, {
+                onOnChange: ($event) => _ctx.doChange(column, row),
+                disabled: _ctx.getIsEnableSw(column)
+              }), null, 16, ["modelValue", "onUpdate:modelValue", "onOnChange", "disabled"])) : (openBlock(), createBlock(_component_GridCellContent, {
+                key: 2,
                 column,
                 row
               }, null, 8, ["column", "row"]))
@@ -33199,7 +33229,7 @@ function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
     }), 256))
   ]);
 }
-const GridColumn = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["render", _sfc_render$d], ["__scopeId", "data-v-067f3d07"]]);
+const GridColumn = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["render", _sfc_render$d], ["__scopeId", "data-v-7c63c696"]]);
 const _sfc_main$c = defineComponent({
   name: "FilterDaterange",
   props: {
@@ -33945,6 +33975,7 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
         }
         $table.reloadData(this.datas.value);
       }
+      $table.clearFilter();
     });
     /**
      * 页码改变
@@ -211380,7 +211411,7 @@ const propDefine$a = {
     default: false
   },
   icon: {
-    //图表 参考ivew图表库
+    //图标 参考ivew图表库
     type: String,
     default: null
   },
@@ -212389,6 +212420,7 @@ class GridInstance extends BaseInstance {
         }
         $table.reloadData(this.datas.value);
       }
+      $table.clearFilter();
     });
     /**
      * 页码改变