doway-coms 2.11.42 → 2.11.44

package/package.json

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

package/packages/BaseDate/src/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="d-control-container">
     <div
-      class="d-control-label"
-      :style="{ width: labelWidth > 0 ? labelWidth + 'px' : 'none' }"
+        class="d-control-label"
+        :style="{ width: labelWidth > 0 ? labelWidth + 'px' : 'none' }"
     >
       {{ label }}
       <span v-if="rules && rules['required']" class="d-control-label-required"
-        >*</span
+      >*</span
       >
       <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
         <img src="../../styles/icon/help.png" alt="" style="width: 14px" />
@@ -14,22 +14,22 @@
     </div>
     <div class="d-control">
       <ValidationProvider
-        :name="label"
-        v-slot="v"
-        :rules="rules"
-        v-if="edit === true"
+          :name="label"
+          v-slot="v"
+          :rules="rules"
+          v-if="edit === true"
       >
         <DatePicker
-          :size="'small'"
-          placeholder="选择日期"
-          v-model="currentValue"
-          :disabled-date="disabledDate"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          style="width: 100%"
-          @change="change"
-          :class="{ 'd-error-input': v.errors.length > 0 }"
-          :dropdown-class-name="getDatePickerClass({disablePrevYearBtn, disableNextYearBtn})"
+            :size="'small'"
+            placeholder="选择日期"
+            v-model="currentValue"
+            :disabled-date="disabledDate"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 100%"
+            @change="change"
+            :class="{ 'd-error-input': v.errors.length > 0 }"
+            :dropdown-class-name="getDatePickerClass({disablePrevYearBtn, disableNextYearBtn})"
         />
         <div class="d-error-msg">
           {{ v.errors[0] }}
@@ -52,17 +52,13 @@
 import VXETable from "vxe-table";
 //轻量级剪贴板复制函数
 import XEClipboard from "xe-clipboard";
-import {DatePicker as a, DatePicker as a, DatePicker, Tooltip} from "ant-design-vue";
+import { DatePicker, Tooltip } from "ant-design-vue";
 import { ValidationProvider } from "vee-validate";
 import moment from "moment";
-import {DatePicker as a
-import {DatePicker as a
 
 export default {
   name: "BaseDate",
   components: {
-    a-date - picker,
-    a-date - picker,
     DatePicker,
     ValidationProvider,
     Tooltip,
@@ -201,11 +197,12 @@ export default {
         return false;
       }
       return (
-        current &&
-        current.diff(moment().add(this.disabledDateValue, "day"), "days") < 0
+          current &&
+          current.diff(moment().add(this.disabledDateValue, "day"), "days") < 0
       );
     },
-    getDatePickerClass({disablePrevYearBtn, disableNextYearBtn}) {
+    getDatePickerClass({ disablePrevYearBtn, disableNextYearBtn }) {
+
       const classes = [];
 
       if (disablePrevYearBtn) {
@@ -222,18 +219,15 @@ export default {
 };
 </script>
 
-  <style lang="less">
+<style lang="less">
 @import "../../styles/default.less";
 </style>
-
-<style>
 /* 隐藏上一年按钮 */
 .hide-prev-year .ant-calendar-prev-year-btn {
-  display: none !important;
+display: none !important;
 }
 
 /* 隐藏下一年按钮 */
 .hide-next-year .ant-calendar-next-year-btn {
-  display: none !important;
+display: none !important;
 }
-</style>

package/packages/BaseGrid/src/index.vue

@@ -2285,6 +2285,8 @@ export default {
           originCol.disabledDateValue == undefined ? 0: originCol.disabledDateValue
       }
       colParams['disableUserVisible'] = originCol.disableUserVisible === true
+      colParams['disablePrevYearBtn'] = originCol.disablePrevYearBtn === true
+      colParams['disableNextYearBtn'] = originCol.disableNextYearBtn === true
       colInfo['params'] = colParams
       colInfo['params']['sysOriValue'] = {}