doway-coms 2.11.59 → 2.11.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.11.59",
+  "version": "2.11.61",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseDateMonth/index.js

@@ -1,8 +1,8 @@
-// 导入组件，组件必须声明 name
-import BaseDateMonth from './src/index.vue';
-// 为组件提供 install 安装方法，供按需引入
-BaseDateMonth.install = function(Vue) {
-    Vue.component(BaseDateMonth.name, BaseDateMonth);
-};
-// 默认导出组件
+// 导入组件，组件必须声明 name
+import BaseDateMonth from './src/index.vue';
+// 为组件提供 install 安装方法，供按需引入
+BaseDateMonth.install = function(Vue) {
+    Vue.component(BaseDateMonth.name, BaseDateMonth);
+};
+// 默认导出组件
 export default BaseDateMonth;

package/packages/BaseDateMonth/src/index.vue

@@ -1,164 +1,164 @@
-<template>
-  <div class="d-control-container">
-    <div class="d-control-label">
-      {{ label }}
-      <span v-if="rules && rules['required']" class="d-control-label-required"
-        >*</span
-      >
-      <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-        <img src="../../styles/icon/help.png" alt="" style="width: 14px" />
-      </Tooltip>
-    </div>
-    <div class="d-control">
-      <ValidationProvider
-        :name="label"
-        v-slot="v"
-        :rules="rules"
-        v-if="edit === true"
-      >
-        <MonthPicker
-          :size="'small'"
-          placeholder="选择月"
-          v-model="currentValue"
-          value-format="YYYY-MM-DD"
-          style="width: 100%"
-          :class="{ 'd-error-input': v.errors.length > 0 }"
-          @change="change"
-        />
-        <div class="d-error-msg">
-          {{ v.errors[0] }}
-        </div>
-      </ValidationProvider>
-      <Tooltip placement="topLeft" v-else>
-        <template slot="title">
-          {{ moment(currentValue).format("YYYY-MM") }}
-        </template>
-        <span  @contextmenu.prevent="(event) => onContextmenu(event, currentValue)">
-          {{ moment(currentValue).format("YYYY-MM") }}
-        </span>
-      </Tooltip>
-    </div>
-  </div>
-</template>
-  
-<script>
-//VXETable插件
-import VXETable from "vxe-table";
-//轻量级剪贴板复制函数
-import XEClipboard from "xe-clipboard";
-import moment from "moment";
-import { DatePicker } from "ant-design-vue";
-import { ValidationProvider } from "vee-validate";
-import { Tooltip } from "ant-design-vue";
-export default {
-  name: "BaseDateMonth",
-  components: {
-    MonthPicker: DatePicker.MonthPicker,
-    ValidationProvider,
-    Tooltip,
-  },
-  data() {
-    return {
-      moment,
-      filterValue: "",
-      isInputChanged: false,
-      inputTimeout: null,
-      searchRows: [],
-      filterCols: [],
-      gridLoading: false,
-      gridPagerConfig: {
-        total: 0,
-        currentPage: 1,
-        pageSize: 10,
-      },
-    };
-  },
-  computed: {
-    currentValue: {
-      // 动态计算currentValue的值
-      get: function () {
-        return this.value; // 将props中的value赋值给currentValue
-      },
-      set: function (val) {
-        this.$emit("input", val); // 通过$emit触发父组件
-      },
-    },
-  },
-  props: {
-    rules: {
-      type: Object,
-      default: function () {
-        return null;
-      },
-    },
-    value: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-    edit: {
-      type: Boolean,
-      default: function () {
-        return false;
-      },
-    },
-    name: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-    label: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-    placeholder: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-    tooltip: {
-      type: String,
-      default: function () {
-        return "";
-      },
-    },
-  },
-  created() {},
-  methods: {
-    change() {
-      this.$emit("change");
-    },
-    onContextmenu(event, currentValue) {
-      this.$contextmenu({
-        items: [
-          {
-            icon: 'ant-design:folder-open-filled',
-            label: "复制",
-            onClick: () => {
-              if (XEClipboard.copy(currentValue)) {
-                VXETable.modal.message({
-                  content: "已复制到剪贴板！",
-                  status: "success",
-                });
-              }
-            }
-          }
-        ],
-        event,
-        zIndex: 1000,
-        minWidth: 150
-      });
-      return false;
-    }
-  },
-};
-</script>
-  
-  <style lang="less">
-@import "../../styles/default.less";
+<template>
+  <div class="d-control-container">
+    <div class="d-control-label">
+      {{ label }}
+      <span v-if="rules && rules['required']" class="d-control-label-required"
+        >*</span
+      >
+      <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
+        <img src="../../styles/icon/help.png" alt="" style="width: 14px" />
+      </Tooltip>
+    </div>
+    <div class="d-control">
+      <ValidationProvider
+        :name="label"
+        v-slot="v"
+        :rules="rules"
+        v-if="edit === true"
+      >
+        <MonthPicker
+          :size="'small'"
+          placeholder="选择月"
+          v-model="currentValue"
+          value-format="YYYY-MM-DD"
+          style="width: 100%"
+          :class="{ 'd-error-input': v.errors.length > 0 }"
+          @change="change"
+        />
+        <div class="d-error-msg">
+          {{ v.errors[0] }}
+        </div>
+      </ValidationProvider>
+      <Tooltip placement="topLeft" v-else>
+        <template slot="title">
+          {{ moment(currentValue).format("YYYY-MM") }}
+        </template>
+        <span  @contextmenu.prevent="(event) => onContextmenu(event, currentValue)">
+          {{ moment(currentValue).format("YYYY-MM") }}
+        </span>
+      </Tooltip>
+    </div>
+  </div>
+</template>
+  
+<script>
+//VXETable插件
+import VXETable from "vxe-table";
+//轻量级剪贴板复制函数
+import XEClipboard from "xe-clipboard";
+import moment from "moment";
+import { DatePicker } from "ant-design-vue";
+import { ValidationProvider } from "vee-validate";
+import { Tooltip } from "ant-design-vue";
+export default {
+  name: "BaseDateMonth",
+  components: {
+    MonthPicker: DatePicker.MonthPicker,
+    ValidationProvider,
+    Tooltip,
+  },
+  data() {
+    return {
+      moment,
+      filterValue: "",
+      isInputChanged: false,
+      inputTimeout: null,
+      searchRows: [],
+      filterCols: [],
+      gridLoading: false,
+      gridPagerConfig: {
+        total: 0,
+        currentPage: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  computed: {
+    currentValue: {
+      // 动态计算currentValue的值
+      get: function () {
+        return this.value; // 将props中的value赋值给currentValue
+      },
+      set: function (val) {
+        this.$emit("input", val); // 通过$emit触发父组件
+      },
+    },
+  },
+  props: {
+    rules: {
+      type: Object,
+      default: function () {
+        return null;
+      },
+    },
+    value: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+    edit: {
+      type: Boolean,
+      default: function () {
+        return false;
+      },
+    },
+    name: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+    label: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+    placeholder: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+    tooltip: {
+      type: String,
+      default: function () {
+        return "";
+      },
+    },
+  },
+  created() {},
+  methods: {
+    change() {
+      this.$emit("change");
+    },
+    onContextmenu(event, currentValue) {
+      this.$contextmenu({
+        items: [
+          {
+            icon: 'ant-design:folder-open-filled',
+            label: "复制",
+            onClick: () => {
+              if (XEClipboard.copy(currentValue)) {
+                VXETable.modal.message({
+                  content: "已复制到剪贴板！",
+                  status: "success",
+                });
+              }
+            }
+          }
+        ],
+        event,
+        zIndex: 1000,
+        minWidth: 150
+      });
+      return false;
+    }
+  },
+};
+</script>
+  
+  <style lang="less">
+@import "../../styles/default.less";
 </style>

package/packages/BaseGrid/src/index.vue

@@ -1890,6 +1890,7 @@ export default {
           vm.$emit('filterChange')
           break
         case 'desc':
+          $table.sort(column.field, menu.code)
           if (this.sortRemote) {
             let data = []
             $table.getSortColumns().forEach((x) => {
@@ -1899,6 +1900,7 @@ export default {
           }
           break
         case 'asc':
+          $table.sort(column.field, menu.code)
           if (this.sortRemote) {
             let data = []
             $table.getSortColumns().forEach((x) => {
@@ -2144,8 +2146,10 @@ export default {
         colInfo.width = 100
       }
 
-      // 设置最小列宽为60px
-      colInfo.minWidth = originCol.minWidth || 60
+      if (this.showHeaderOverflow = false){
+        // 设置最小列宽为60px
+        colInfo.minWidth = originCol.minWidth || 60
+      }
 
       if (originCol.controlType === 'operation') {
         customSlot['default'] = 'operation_edit'