doway-coms 1.1.100 → 1.2.1

package/package.json

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

package/packages/BaseCheckbox/src/index.vue

@@ -2,9 +2,13 @@
     <div class="d-control-container">
       <div class="d-control-label">
         {{ label
-        }}<span v-if="rules && rules['required']" class="d-control-label-required"
+        }}
+        <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
@@ -33,11 +37,13 @@
   <script>
   import { Checkbox } from 'ant-design-vue'
   import { ValidationProvider } from 'vee-validate'
+  import { Tooltip } from 'ant-design-vue'
   export default {
     name: 'BaseCheckbox',
     components:{
-        Checkbox,
-    ValidationProvider
+      Checkbox,
+      ValidationProvider,
+      Tooltip,
   },
     data() {
       return {
@@ -101,6 +107,12 @@
         default: function() {
           return ''
         }
+      },
+      tooltip: {
+        type: String,
+        default: function() {
+          return ''
+        }
       }
     },
     created() {},

package/packages/BaseDate/src/index.vue

@@ -5,9 +5,13 @@
         :style="{ width: labelWidth > 0 ? labelWidth + 'px' : 'none' }"
       >
         {{ label
-        }}<span v-if="rules && rules['required']" class="d-control-label-required"
+        }}
+        <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
@@ -40,11 +44,15 @@
 import { DatePicker } from 'ant-design-vue'
   import { ValidationProvider } from 'vee-validate'
   import moment from 'moment'
+import { Tooltip } from 'ant-design-vue'
+
   export default {
     name: 'BaseDate',
     components:{
         DatePicker,
-    ValidationProvider
+    ValidationProvider,
+      Tooltip,
+
   },
     data() {
       return {
@@ -121,6 +129,12 @@ import { DatePicker } from 'ant-design-vue'
         default: function() {
           return ''
         }
+      },
+      tooltip: {
+        type: String,
+        default: function() {
+          return ''
+        }
       }
     },
     created() {},

package/packages/BaseDateWeek/src/index.vue

@@ -2,9 +2,13 @@
     <div class="d-control-container">
       <div class="d-control-label">
         {{ label
-        }}<span v-if="rules && rules['required']" class="d-control-label-required"
+        }}
+        <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
@@ -34,11 +38,13 @@
   import moment from 'moment'
   import { DatePicker } from 'ant-design-vue'
   import { ValidationProvider } from 'vee-validate'
+  import { Tooltip } from 'ant-design-vue'
   export default {
     name: 'BaseDateWeek',
     components:{
     WeekPicker:DatePicker.WeekPicker,
-    ValidationProvider
+    ValidationProvider,
+      Tooltip,
   },
     data() {
       return {
@@ -103,6 +109,12 @@
         default: function() {
           return ''
         }
+      },
+      tooltip: {
+        type: String,
+        default: function() {
+          return ''
+        }
       }
     },
     created() {},

package/packages/BaseDatetime/src/index.vue

@@ -5,9 +5,13 @@
         :style="{ width: labelWidth > 0 ? labelWidth + 'px' : 'none' }"
       >
         {{ label
-        }}<span v-if="rules && rules['required']" class="d-control-label-required"
+        }}
+        <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
@@ -40,11 +44,15 @@
   import { DatePicker } from 'ant-design-vue'
   import { ValidationProvider } from 'vee-validate'
 import moment from 'moment'
+  import { Tooltip } from 'ant-design-vue'
+
   export default {
     name: "BaseDatetime",
     components:{
         DatePicker,
-    ValidationProvider
+    ValidationProvider,
+      Tooltip,
+
   },
     data() {
         return {
@@ -121,7 +129,13 @@ import moment from 'moment'
             default: function () {
                 return "";
             }
+        },
+      tooltip: {
+        type: String,
+        default: function() {
+          return ''
         }
+      }
     },
     created() { },
     methods: {

package/packages/BaseForm/src/index.vue

@@ -14,6 +14,7 @@
           :label="col.title"
           v-model="row[col.field]"
           :edit="col.edit"
+          :tooltip="col.tooltip"
           :rules="col.rules"
           @change="
             () => {
@@ -50,6 +51,7 @@
           :label="col.title"
           v-model="row[col.field]"
           :edit="col.edit"
+          :tooltip="col.tooltip"
           :rules="col.rules"
           @change="
             () => {
@@ -68,6 +70,7 @@
           :edit="col.edit"
           :rules="col.rules"
           :min="col.min"
+          :tooltip="col.tooltip"
           :max="col.max"
           :precision="col.precision"
           @change="
@@ -90,6 +93,7 @@
           v-model="row[col.field]"
           :edit="col.edit"
           :rules="col.rules"
+          :tooltip="col.tooltip"
           :displayType="col.displayType"
           :valueType="col.valueType"
           @change="
@@ -107,6 +111,7 @@
           :label="col.title"
           v-model="row[col.field]"
           :edit="col.edit"
+          :tooltip="col.tooltip"
           :pastDate="col.pastDate"
           :rules="col.rules"
         />
@@ -119,6 +124,7 @@
           :label="col.title"
           v-model="row[col.field]"
           :pastDate="col.pastDate"
+          :tooltip="col.tooltip"
           :edit="col.edit"
           :rules="col.rules"
         />
@@ -131,6 +137,7 @@
           :label="col.title"
           v-model="row[col.field]"
           :edit="col.edit"
+          :tooltip="col.tooltip"
           :rules="col.rules"
           @change="
             rowInfo => {
@@ -145,6 +152,7 @@
           "
           :label="col.title"
           v-model="row[col.field]"
+          :tooltip="col.tooltip"
           :edit="col.edit"
           :rules="col.rules"
         />
@@ -156,6 +164,7 @@
           :label="col.title"
           v-model="row[col.field]"
           :edit="col.edit"
+          :tooltip="col.tooltip"
           :rules="col.rules"
         />
         <BaseSelect
@@ -167,6 +176,7 @@
           v-model="row[col.field]"
           :edit="col.edit"
           :rules="col.rules"
+          :tooltip="col.tooltip"
           :dataSource="col.dataSource"
           @change="
             rowInfo => {
@@ -182,6 +192,7 @@
         :label="col.title"
         v-model="row[col.field]"
         :edit="col.edit"
+        :tooltip="col.tooltip"
         :rules="col.rules"
         @change="
           rowInfo => {
@@ -201,6 +212,7 @@
           :defaultExpression="col.defaultExpression"
           :row="row"
           :api="col.api"
+          :tooltip="col.tooltip"
           :optBtns="col.optBtns"
           :popupAddName="col.popupAddName"
           :popupAddPath="col.popupAddPath"

package/packages/BaseGrid/src/index.vue

@@ -64,6 +64,15 @@
       :show-footer="showFooter"
       @scroll="bodyScroll"
     >
+      <template v-for="item in internalColumns" #[item.field]>
+        <div :key="item.field">
+          <span v-if="item.visible !== false">{{item.title}}</span>
+          <Tooltip :title="item.tooltip" v-if="item.tooltip && item.visible !== false" style="margin: 0 2px">
+            <img src="../../styles/icon/help.png" alt="" style="width: 14px">
+          </Tooltip>
+<!--          {{item}}-->
+        </div>
+      </template>
       <template #toolbar_buttons>
 <!--        <div>-->
 <!--          <span v-for="loopFilterStr in filterStr" :key="loopFilterStr.field">-->
@@ -471,6 +480,7 @@ import { mapGetters } from "vuex";
 import XEUtils from "xe-utils";
 //VXETable插件
 import VXETable from "vxe-table";
+import { Tooltip } from 'ant-design-vue'
 //ant的空状态展示占位图
 import {
   Empty,
@@ -508,6 +518,7 @@ export default {
     BasePagination,
     BasePulldown,
     BaseGridAdjust,
+    Tooltip,
   },
   data() {
     return {
@@ -817,6 +828,7 @@ export default {
   },
 
   created() {
+
     //拖动后输入框有错位问题，暂时不启用
     // this.initColumnDrop()
 
@@ -826,6 +838,12 @@ export default {
     //     filterMethod:this.sysRowStateFilter,
     //     filters:[{label:'筛选删除行',value:'delete',checked:true}]
     //   })
+    for (let i = 0; i < this.columns.length; i++) {
+      this.internalColumns.push(this.initColumns(this.columns[i]));
+      if(this.columns[i].visible !== false && this.columns[i].controlType !== 'operation') {
+        this.internalColumns[i].slots.header = this.columns[i].field;
+      }
+    }
     if (this.showSeq) {
       this.internalColumns.push(
         // {
@@ -859,9 +877,8 @@ export default {
         },
       });
     }
-    for (let i = 0; i < this.columns.length; i++) {
-      this.internalColumns.push(this.initColumns(this.columns[i]));
-    }
+
+    console.log(this.internalColumns)
     this.gridEdit = this.edit;
   },
 
@@ -1182,6 +1199,7 @@ export default {
       let colInfo = {
         field: originCol.field,
         title: originCol.title,
+        tooltip: originCol.tooltip,
         visible: true,
       };
 

package/packages/BaseInput/src/index.vue

@@ -2,9 +2,13 @@
   <div class="d-control-container">
     <div class="d-control-label">
       {{ label
-      }}<span v-if="rules && rules['required']" class="d-control-label-required"
+      }}
+      <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
@@ -35,11 +39,14 @@
 
 import { Input } from 'ant-design-vue'
 import { ValidationProvider } from 'vee-validate'
+import { Tooltip } from 'ant-design-vue'
 export default {
   name: 'BaseInput',
   components:{
     Input,
-    ValidationProvider
+    ValidationProvider,
+    Tooltip,
+
   },
   data() {
     return {
@@ -103,6 +110,12 @@ export default {
       default: function() {
         return ''
       }
+    },
+    tooltip: {
+      type: String,
+      default: function() {
+        return ''
+      }
     }
   },
   created() {},

package/packages/BaseIntervalInput/src/index.vue

@@ -2,11 +2,15 @@
   <div class="d-control-container">
     <div class="d-control-label">
       {{ label
-      }}<span
+      }}
+      <span
         v-if="rules && Object.getOwnPropertyNames(rules).length > 0"
         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" style="font-size:12px">
       <ValidationProvider
@@ -79,10 +83,14 @@
 import XEUtils from 'xe-utils'
 import moment from 'moment'
 import { ValidationProvider } from 'vee-validate'
+import { Tooltip } from 'ant-design-vue'
+
 export default {
   name: 'BaseIntervalInput',
   components:{
-    ValidationProvider
+    ValidationProvider,
+    Tooltip,
+
   },
   data() {
     return {
@@ -197,6 +205,12 @@ export default {
       default: function() {
         return ''
       }
+    },
+    tooltip: {
+      type: String,
+      default: function() {
+        return ''
+      }
     }
   },
   created() {},

package/packages/BaseNumberInput/src/index.vue

@@ -6,11 +6,15 @@
         :style="{ width: labelWidth > 0 ? labelWidth + 'px' : 'none' }"
       >
         {{ label
-        }}<span
+        }}
+        <span
           v-if="rules && Object.getOwnPropertyNames(rules).length > 0"
           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="{
@@ -48,11 +52,15 @@
   import XEUtils from 'xe-utils'
   import { InputNumber } from 'ant-design-vue'
   import { ValidationProvider } from 'vee-validate'
+  import { Tooltip } from 'ant-design-vue'
+
   export default {
     name: 'BaseNumberInput',
     components:{
         InputNumber,
-    ValidationProvider
+    ValidationProvider,
+      Tooltip,
+
   },
     data() {
       return {
@@ -156,6 +164,12 @@
         default: function() {
           return ''
         }
+      },
+      tooltip: {
+        type: String,
+        default: function() {
+          return ''
+        }
       }
     },
     created() {},

package/packages/BasePulldown/src/index.vue

@@ -6,9 +6,13 @@
         :style="{ width: labelWidth > 0 ? labelWidth + 'px' : 'none' }"
       >
         {{ label
-        }}<span v-if="rules && rules['required']" class="d-control-label-required"
+        }}
+        <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="{
@@ -149,6 +153,7 @@
   import { Input,Button,Row,Col } from 'ant-design-vue'
   import { ValidationProvider } from 'vee-validate'
   import {Pulldown} from 'vxe-table'
+  import { Tooltip } from 'ant-design-vue'
   export default {
     name: 'BasePulldown',
     components:{
@@ -157,7 +162,9 @@
         'a-row':Row,
         'a-col':Col,
         'VxePulldown':Pulldown,
-        ValidationProvider
+        ValidationProvider,
+      Tooltip,
+
     },
     data() {
       return {
@@ -309,6 +316,12 @@
       isLocalData: {
         type: Boolean,
         default: false
+      },
+      tooltip: {
+        type: String,
+        default: function() {
+          return ''
+        }
       }
     },
     watch: {},

package/packages/BaseSelect/src/index.vue

@@ -5,9 +5,13 @@
         :style="{ width: labelWidth > 0 ? labelWidth + 'px' : 'none' }"
       >
         {{ label
-        }}<span v-if="rules && rules['required']" class="d-control-label-required"
+        }}
+        <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
@@ -44,6 +48,7 @@
       import { Select } from 'ant-design-vue'
   import { ValidationProvider } from 'vee-validate'
   import { displaySelectCaption } from  '../../utils/filters'
+      import { Tooltip } from 'ant-design-vue'
   export default {
     filters:{
         displaySelectCaption:displaySelectCaption
@@ -52,7 +57,9 @@
     components:{
         Select,
         SelectOption:Select.Option,
-    ValidationProvider
+    ValidationProvider,
+      Tooltip,
+
   },
     data() {
       return {
@@ -124,6 +131,12 @@
         default: function() {
           return ''
         }
+      },
+      tooltip: {
+        type: String,
+        default: function() {
+          return ''
+        }
       }
     },
     created() {},

package/packages/BaseSelectMulti/src/index.vue

@@ -2,9 +2,13 @@
   <div class="d-control-container">
     <div class="d-control-label">
       {{ label
-      }}<span v-if="rules && rules['required']" class="d-control-label-required"
+      }}
+      <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
@@ -42,8 +46,10 @@
 
 <script>
      import { Select } from 'ant-design-vue'
-  import { ValidationProvider } from 'vee-validate'
-  import { displaySelectMultiCaption } from  '../../utils/filters'
+    import { ValidationProvider } from 'vee-validate'
+    import { displaySelectMultiCaption } from  '../../utils/filters'
+     import { Tooltip } from 'ant-design-vue'
+
 export default {
   name: 'BaseSelectMulti',
   filters:{
@@ -52,7 +58,9 @@ export default {
   components:{
       Select,
       SelectOption:Select.Option,
-    ValidationProvider
+    ValidationProvider,
+    Tooltip,
+
   },
   data() {
     return {
@@ -118,6 +126,12 @@ export default {
       default: function() {
         return ''
       }
+    },
+    tooltip: {
+      type: String,
+      default: function() {
+        return ''
+      }
     }
   },
   created() {},

package/packages/BaseTextArea/src/index.vue

@@ -2,9 +2,13 @@
     <div class="d-control-container">
       <div class="d-control-label" v-if="showLabel === true">
         {{ label
-        }}<span v-if="rules && rules['required']" class="d-control-label-required"
+        }}
+        <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
         :style="{ width: width ? width : '100%', height: height ? height : '' }"
@@ -35,11 +39,15 @@
   <script>
     import { Input } from 'ant-design-vue'
   import { ValidationProvider } from 'vee-validate'
+    import { Tooltip } from 'ant-design-vue'
+
   export default {
     name: 'BaseTextArea',
     components:{
     'a-textarea':Input.TextArea,
-    ValidationProvider
+    ValidationProvider,
+      Tooltip,
+
   },
     data() {
       return {
@@ -121,6 +129,12 @@
         default: function() {
           return ''
         }
+      },
+      tooltip: {
+        type: String,
+        default: function() {
+          return ''
+        }
       }
     },
     created() {},