doway-coms 1.2.0 → 1.2.2

package/package.json

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

package/packages/BaseCheckbox/src/index.vue

@@ -3,12 +3,12 @@
       <div class="d-control-label">
         {{ label
         }}
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
         <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

package/packages/BaseDate/src/index.vue

@@ -6,12 +6,12 @@
       >
         {{ label
         }}
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
         <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

package/packages/BaseDateWeek/src/index.vue

@@ -3,12 +3,12 @@
       <div class="d-control-label">
         {{ label
         }}
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
         <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

package/packages/BaseDatetime/src/index.vue

@@ -6,12 +6,12 @@
       >
         {{ label
         }}
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
         <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

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">-->
@@ -330,7 +339,7 @@
                   :style="{
                     display: 'flex',
                     flexWrap: 'wrap',
-                    justifyContent: 'center',
+                    justifyContent: 'left',
                     alignItems: 'center',
                     maxHeight: '150px',
                     overflow: 'auto',
@@ -342,10 +351,9 @@
                   v-for="loopSource in scope.column.params.dataSource"
                   :key="loopSource.value"
                   :value="loopSource.value"
-                  style="margin: 5px 0"
+                  style="margin: 5px 0;"
                 >{{ loopSource.caption }}
                 </a-checkbox>
-
               </a-checkbox-group>
 <!--          <a-select-->
 <!--              v-model="scope.column.filters[0].data.displayValues"-->
@@ -471,6 +479,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 +517,7 @@ export default {
     BasePagination,
     BasePulldown,
     BaseGridAdjust,
+    Tooltip,
   },
   data() {
     return {
@@ -817,6 +827,7 @@ export default {
   },
 
   created() {
+
     //拖动后输入框有错位问题，暂时不启用
     // this.initColumnDrop()
 
@@ -826,6 +837,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 +876,7 @@ 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 +1197,7 @@ export default {
       let colInfo = {
         field: originCol.field,
         title: originCol.title,
+        tooltip: originCol.tooltip,
         visible: true,
       };
 

package/packages/BaseInput/src/index.vue

@@ -3,12 +3,12 @@
     <div class="d-control-label">
       {{ label
       }}
-      <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-        <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-      </Tooltip>
       <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

package/packages/BaseIntervalInput/src/index.vue

@@ -3,14 +3,14 @@
     <div class="d-control-label">
       {{ label
       }}
-      <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-        <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-      </Tooltip>
       <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

package/packages/BaseNumberInput/src/index.vue

@@ -7,14 +7,14 @@
       >
         {{ label
         }}
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
         <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="{

package/packages/BasePulldown/src/index.vue

@@ -7,12 +7,12 @@
       >
         {{ label
         }}
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
         <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="{

package/packages/BaseSelect/src/index.vue

@@ -6,12 +6,12 @@
       >
         {{ label
         }}
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
         <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

package/packages/BaseSelectMulti/src/index.vue

@@ -3,12 +3,12 @@
     <div class="d-control-label">
       {{ label
       }}
-      <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-        <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-      </Tooltip>
       <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

package/packages/BaseTextArea/src/index.vue

@@ -3,12 +3,12 @@
       <div class="d-control-label" v-if="showLabel === true">
         {{ label
         }}
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
         <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 : '' }"

package/packages/BaseTime/src/index.vue

@@ -3,12 +3,12 @@
       <div class="d-control-label">
         {{ label
         }}
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
         <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

package/packages/utils/common.js

@@ -483,9 +483,12 @@ export function custUnitPriceNotTaxAmount(rowInfo, taxRate, colInfo) {
 export function setIndustryVersionFields(fields){
     let length = fields.length
     for(let i=length-1;i>=0;i--){
-       if(XEUtils.isArray(fields[i].versions) && XEUtils.indexOf(fields[i].versions,store.getters.industryVersion)<0){
-          XEUtils.remove(fields,i)
+       if(XEUtils.isArray(fields[i].versions)){
+         let tempValue = XEUtils.find(fields[i].versions,p=>store.getters.industryVersion.includes(p))
+         if(tempValue){
+            continue
+         }
+         XEUtils.remove(fields,i)
        }
-      
     }
 }