hd-idevvue3 3.0.2 → 3.0.4

package/src/hdcom/HdRightMenu.vue

@@ -1,61 +1,63 @@
-<template>
-  <div class="rightmenu">
-    <slot name="rightMenu">
-      <el-button-group>
-
-        <ex-button class="rightmenu_button" @click="doAdd" vid="doAdd">增加
-        </ex-button>
-        <ex-button class="rightmenu_button" @click="doUpdate" vid="doUpdate">修改
-        </ex-button>
-        <ex-button class="rightmenu_button" @click="doRemove" vid="doRemove">删除
-        </ex-button>
-        <ex-button class="rightmenu_button" @click="doCopy" vid="doCopy">复制
-        </ex-button>
-      </el-button-group>
-      <div style="border: #555 1px solid;" v-if="$slots.rightMenuExt"></div>
-      <el-button-group>
-
-        <slot name="rightMenuExt">
-        </slot>
-      </el-button-group>
-    </slot>
-  </div>
-</template>
-<script>
-// import BtnRight from './BtnRight'
-
-export default {
-  name: 'HdRightMenu',
-  // mixins: [BtnRight],
-  props: {
-    noRoleManage: false,
-  },
-  data() {
-    return {
-      isFocus: false,
-      rangeThis: {} // 快捷键有效区域
-    }
-  },
-  created() {
-    // if (!this.noRoleManage) {
-    //   if (this.$route && this.$route.meta.btnRoleCheck) { // 角色管理下激活
-    //     this.addBtnMetaToParent()
-    //   }
-    // }
-  },
-  methods: {
-    doAdd() {
-      this.$emit('do-add')
-    },
-    doRemove() {
-      this.$emit('do-remove')
-    },
-    doUpdate() {
-      this.$emit('do-update')
-    },
-    doCopy() {
-      this.$emit('do-copy')
-    },
-  }
-}
-</script>
+<template>
+  <div class="rightmenu">
+    <slot name="rightMenu">
+      <el-button-group>
+        <ex-button class="rightmenu_button" @click="doAdd" vid="doAdd"
+          >增加
+        </ex-button>
+        <ex-button class="rightmenu_button" @click="doUpdate" vid="doUpdate"
+          >修改
+        </ex-button>
+        <ex-button class="rightmenu_button" @click="doRemove" vid="doRemove"
+          >删除
+        </ex-button>
+        <ex-button class="rightmenu_button" @click="doCopy" vid="doCopy"
+          >复制
+        </ex-button>
+      </el-button-group>
+      <div style="border: #555 1px solid" v-if="$slots.rightMenuExt"></div>
+      <el-button-group>
+        <slot name="rightMenuExt"> </slot>
+      </el-button-group>
+    </slot>
+  </div>
+</template>
+
+<script>
+// import BtnRight from './BtnRight'
+
+export default {
+  name: 'HdRightMenu',
+  // mixins: [BtnRight],
+  props: {
+    noRoleManage: false,
+  },
+  data() {
+    return {
+      isFocus: false,
+      rangeThis: {}, // 快捷键有效区域
+    }
+  },
+  created() {
+    // if (!this.noRoleManage) {
+    //   if (this.$route && this.$route.meta.btnRoleCheck) { // 角色管理下激活
+    //     this.addBtnMetaToParent()
+    //   }
+    // }
+  },
+  methods: {
+    doAdd() {
+      this.$emit('do-add')
+    },
+    doRemove() {
+      this.$emit('do-remove')
+    },
+    doUpdate() {
+      this.$emit('do-update')
+    },
+    doCopy() {
+      this.$emit('do-copy')
+    },
+  },
+}
+</script>

package/src/hdcom/HdSel/SelGridFieldcod.vue

@@ -1,36 +1,54 @@
-<!--代码表用popsel-->
 <template>
-  <hd-grid-sel :txtVal="txtVal" :idVal="idVal" placeholder="请点击选取"
-               height="50vh" width="300px" :hdQuery="hdQuery" :disabled="disabled"
-               url="webresources/login/privilege/SysField/vue/find" @rowClick="doClick" :beforeQuery="beforeQuery">
-    <el-table-column width="120px" align="left" header-align="center" label="代码" prop="fieldCod" sortable></el-table-column>
-    <el-table-column widhth="180px" align="left" header-align="center" label="名称" prop="fieldName" sortable></el-table-column>
+  <hd-grid-sel
+    :txtVal="txtVal"
+    :idVal="idVal"
+    placeholder="请点击选取"
+    height="50vh"
+    width="300px"
+    :hdQuery="hdQuery"
+    :disabled="disabled"
+    url="webresources/login/privilege/SysField/vue/find"
+    @rowClick="doClick"
+    :beforeQuery="beforeQuery"
+  >
+    <el-table-column
+      width="120px"
+      align="left"
+      header-align="center"
+      label="代码"
+      prop="fieldCod"
+      sortable
+    ></el-table-column>
+    <el-table-column
+      widhth="180px"
+      align="left"
+      header-align="center"
+      label="名称"
+      prop="fieldName"
+      sortable
+    ></el-table-column>
   </hd-grid-sel>
 </template>
 
 <script>
-
-  export default {
-    name: 'sel-grid-fieldcode',
-    components: {},
-    data() {
-      return {
-        hdQuery: new HdQuery(this)
-      }
+export default {
+  name: 'sel-grid-fieldcode',
+  components: {},
+  data() {
+    return {
+      hdQuery: new HdQuery(this),
+    }
+  },
+  mounted() {},
+  props: { txtVal: String, idVal: String, disabled: Boolean }, // 设置value为props属�??-必须
+  methods: {
+    beforeQuery(val) {
+      this.hdQuery.query.anyQuery = val
     },
-    mounted() {
+    doClick(row) {
+      this.$emit('update:txtVal', row.fieldName)
+      this.$emit('update:idVal', row.fieldCod)
     },
-    props: {txtVal: String, idVal: String, disabled: Boolean},// 设置value为props属�??-必须
-    methods: {
-      beforeQuery(val) {
-        this.hdQuery.query.anyQuery = val
-      },
-      doClick(row) {
-        this.$emit('update:txtVal', row.fieldName)
-        this.$emit('update:idVal', row.fieldCod)
-      }
-    }
-  }
+  },
+}
 </script>
-
-

package/src/hdcom/HdTableColumn.vue

@@ -1,54 +1,103 @@
 <template>
   <!--改动说明,btnRight 和isShow是该column是否显示,只在fixed:right时使用,-->
-  <div v-if="!btnRight||!isShow"></div>
-  <ExTableColumn :class-name="getClassName($attrs)" :label="$t($attrs.label)" :sortable="realSortable"
-    :width="autoWidth" :showOverflowTooltip="showOverflowTooltip" v-bind="$attrs" v-else-if="!$slots.default"
-    v-on="$listeners" :filters="filterData" :filter-method="isOpenFilter ? ()=>true : null">
+  <div v-if="!btnRight || !isShow"></div>
+  <ExTableColumn
+    :class-name="getClassName($attrs)"
+    :label="$t($attrs.label)"
+    :sortable="realSortable"
+    :width="autoWidth"
+    :showOverflowTooltip="showOverflowTooltip"
+    v-bind="$attrs"
+    v-else-if="!$slots.default"
+    v-on="$listeners"
+    :filters="filterData"
+    :filter-method="isOpenFilter ? () => true : null"
+  >
     <template slot="header" slot-scope="scope">
       <slot name="header" :index="scope.$index" :row="scope.row">
-        {{$t($attrs.label)}}
+        {{ $t($attrs.label) }}
       </slot>
     </template>
     <template slot-scope="scope">
       <slot :index="scope.$index" :row="scope.row">
         <!--noEdit不允许编辑-->
-        <template v-if="scope.row.isEdit&&!noEdit">
-          <component :gridRow="scope.row" :idVal.sync="scope.row[$attrs.idVal]" :is="input"
-            :txtVal.sync="scope.row[$attrs.txtVal]" @blur="checkErr(scope.row)"
-            @change="(v)=>{$emit('change',v,scope.row)}" @selItem="(v)=>{selItem(scope.row,v)}" style="width: 100%;"
-            v-bind="inputProp" v-model="scope.row[$attrs.prop]"></component>
+        <template v-if="scope.row.isEdit && !noEdit">
+          <component
+            :gridRow="scope.row"
+            :idVal.sync="scope.row[$attrs.idVal]"
+            :is="input"
+            :txtVal.sync="scope.row[$attrs.txtVal]"
+            @blur="checkErr(scope.row)"
+            @change="
+              (v) => {
+                $emit('change', v, scope.row)
+              }
+            "
+            @selItem="
+              (v) => {
+                selItem(scope.row, v)
+              }
+            "
+            style="width: 100%"
+            v-bind="inputProp"
+            v-model="scope.row[$attrs.prop]"
+          ></component>
         </template>
-        <template v-else-if="!isHtml">{{getValueByPath(scope.row, $attrs.prop)}}</template>
+        <template v-else-if="!isHtml">{{
+          getValueByPath(scope.row, $attrs.prop)
+        }}</template>
         <template v-else>
           <div v-html="getValueByPath(scope.row, $attrs.prop)"></div>
         </template>
       </slot>
-      <template v-if="scope.row.isEdit&&!noEdit">
-        <ErrHint :errMsg="scope.row['_err_'+$attrs.prop]" @checkErr="(v)=>{checkErr(scope.row,v)}"
-          v-model="scope.row[$attrs.prop]"></ErrHint>
+      <template v-if="scope.row.isEdit && !noEdit">
+        <ErrHint
+          :errMsg="scope.row['_err_' + $attrs.prop]"
+          @checkErr="
+            (v) => {
+              checkErr(scope.row, v)
+            }
+          "
+          v-model="scope.row[$attrs.prop]"
+        ></ErrHint>
       </template>
     </template>
   </ExTableColumn>
   <!--复合表头时,但是复合表头里的具体表头依然会进入第一个条件-->
-  <ExTableColumn :label="$t($attrs.label)" :sortable="realSortable" :width="autoWidth"
-    :showOverflowTooltip="showOverflowTooltip" v-bind="$attrs" v-else-if="$slots.default" v-on="$listeners">
+  <ExTableColumn
+    :label="$t($attrs.label)"
+    :sortable="realSortable"
+    :width="autoWidth"
+    :showOverflowTooltip="showOverflowTooltip"
+    v-bind="$attrs"
+    v-else-if="$slots.default"
+    v-on="$listeners"
+  >
     <slot></slot>
   </ExTableColumn>
   <!--没啥用-->
-  <ExTableColumn :label="$t($attrs.label)" :sortable="realSortable" :width="autoWidth"
-    :showOverflowTooltip="showOverflowTooltip" v-bind="$attrs" v-else v-on="$listeners">
+  <ExTableColumn
+    :label="$t($attrs.label)"
+    :sortable="realSortable"
+    :width="autoWidth"
+    :showOverflowTooltip="showOverflowTooltip"
+    v-bind="$attrs"
+    v-else
+    v-on="$listeners"
+  >
   </ExTableColumn>
 </template>
+
 <script>
-import AsyncValidator from "async-validator";
-import BtnRight from "./BtnRight";
+import AsyncValidator from 'async-validator'
+import BtnRight from './BtnRight'
 
 /**
  *覆盖ElTableColumn 主要增加行内编辑的校验,及增加inputProp input inputFormat selFormat属性(与高级查询配合),在多数情况可以不用写templeate
  * @module HdTableColumn
  */
 export default {
-  name: "ElTableColumn",
+  name: 'ElTableColumn',
   inheritAttrs: false,
   components: {},
   mixins: [BtnRight],
@@ -79,7 +128,7 @@ export default {
       type: [String, Object],
       default: function () {
         // updTimFirst是因为会触发HdQuery的排序及查询,默认不让查询
-        return "ElInput";
+        return 'ElInput'
       },
     },
     inputProp: Object, // input的属性
@@ -89,7 +138,7 @@ export default {
       // 编辑时是否可编辑
       type: Boolean,
       default: function () {
-        return false;
+        return false
       },
     },
     noZeroHide: {
@@ -101,7 +150,7 @@ export default {
       // 排序只用custom不用前端排序
       type: Boolean,
       default: function () {
-        return false;
+        return false
       },
     },
     rules: Array, // 校验
@@ -113,39 +162,39 @@ export default {
       // 编辑时是否可编辑
       type: Boolean,
       default: function () {
-        return true;
+        return true
       },
     },
     openFilter: {
       type: Boolean,
       default: function () {
-        return false;
+        return false
       },
     },
     isHtml: {
       // 编辑时是否可编辑
       type: Boolean,
       default: function () {
-        return false;
+        return false
       },
     },
   },
   mounted() {
-    this.isFixDo();
-    const comPar = this.getHdComGrid();
+    this.isFixDo()
+    const comPar = this.getHdComGrid()
     if (comPar) {
-      const allrules = comPar.validate; // hdcomgrid的rules
+      const allrules = comPar.validate // hdcomgrid的rules
       if (allrules && this.rules) {
-        allrules[this.$attrs.prop] = this.rules;
+        allrules[this.$attrs.prop] = this.rules
       }
       if (this.$attrs.prop && !this.noQuery) {
         // 高级查询用
-        comPar.allColumn.push(this);
+        comPar.allColumn.push(this)
       }
     }
-    const hdPar = this.getHdGrid();
+    const hdPar = this.getHdGrid()
     if (hdPar) {
-      hdPar.colThis.push(this);
+      hdPar.colThis.push(this)
     }
     // this.flushFilterData()
   },
@@ -155,141 +204,141 @@ export default {
       btnRight: true, // 按钮权限判断 浮动区 隐藏显示
       isShow: true, // 是否显示
       // filterData: null
-    };
+    }
   },
   updated() {},
   methods: {
     isFixDo() {
       // 浮动区权限控制
-      if (this.$attrs.fixed && this.$attrs.fixed == "right") {
+      if (this.$attrs.fixed && this.$attrs.fixed == 'right') {
         // 剧右的是按钮,左侧的不管
-        this.addBtnMetaToParent();
-        this.checkRight();
-        this.getHdComGrid().columnFlowThis = this;
+        this.addBtnMetaToParent()
+        this.checkRight()
+        this.getHdComGrid().columnFlowThis = this
       }
     },
     getName() {
       // 按钮权限控制
-      return this.$t("列表浮动区");
+      return this.$t('列表浮动区')
     },
     selItem(row, data) {
       if (this.selFormat) {
         // 有format的情况
-        return this.selFormat(row, this.$attrs.prop, data);
+        return this.selFormat(row, this.$attrs.prop, data)
       }
     },
     checkErr(row) {
       this.validate(row[this.$attrs.prop], (msg) => {
-        this.$set(row, "_err_" + this.$attrs.prop, msg);
-      });
+        this.$set(row, '_err_' + this.$attrs.prop, msg)
+      })
     },
     getRules() {
-      const comPar = this.getHdComGrid();
+      const comPar = this.getHdComGrid()
       if (comPar) {
-        const allrules = comPar.validate; // hdcomgrid的rules
-        return allrules;
+        const allrules = comPar.validate // hdcomgrid的rules
+        return allrules
       } else {
-        return false;
+        return false
       }
     },
     getHdComGrid() {
-      let par = this.$parent;
+      let par = this.$parent
       while (par) {
-        if (par.$options.name == "HdComGrid") {
-          return par;
+        if (par.$options.name == 'HdComGrid') {
+          return par
         }
-        par = par.$parent;
+        par = par.$parent
       }
-      return null;
+      return null
     },
     getHdGrid() {
-      let par = this.$parent;
+      let par = this.$parent
       while (par) {
-        if (par.$options.name == "HdGrid") {
-          return par;
+        if (par.$options.name == 'HdGrid') {
+          return par
         }
-        par = par.$parent;
+        par = par.$parent
       }
-      return null;
+      return null
     },
     validate(data, callback) {
-      var descriptor = {};
-      const rules = this.getRules();
+      var descriptor = {}
+      const rules = this.getRules()
       if (!rules) {
-        return false;
+        return false
       }
-      const oneRule = rules[this.$attrs.prop];
+      const oneRule = rules[this.$attrs.prop]
       if (!oneRule) {
-        return false;
+        return false
       }
-      descriptor[this.$attrs.prop] = oneRule;
-      var validator = new AsyncValidator(descriptor);
-      var model = {};
-      model[this.$attrs.prop] = data;
+      descriptor[this.$attrs.prop] = oneRule
+      var validator = new AsyncValidator(descriptor)
+      var model = {}
+      model[this.$attrs.prop] = data
       validator.validate(model, { firstFields: true }, (errors, fields) => {
-        callback(errors ? errors[0].message : "");
-      });
+        callback(errors ? errors[0].message : '')
+      })
     },
     getValueByPath(row, prop) {
       // 支持多级
-      prop = prop || "";
-      const paths = prop.split(".");
-      let current = row;
-      let result = null;
+      prop = prop || ''
+      const paths = prop.split('.')
+      let current = row
+      let result = null
       for (let i = 0, j = paths.length; i < j; i++) {
-        const path = paths[i];
-        if (!current) break;
+        const path = paths[i]
+        if (!current) break
 
         if (i === j - 1) {
-          result = current[path];
-          break;
+          result = current[path]
+          break
         }
-        current = current[path];
+        current = current[path]
       }
       if (this.inputFormat) {
         // 有format的情况
-        return this.inputFormat(result, row, prop);
+        return this.inputFormat(result, row, prop)
       } else {
         if (this.$attrs.txtVal) {
-          return row[this.$attrs.txtVal];
+          return row[this.$attrs.txtVal]
         } else if (result === 0 && !this.noZeroHide) {
-          return "";
+          return ''
         } else {
-          return result;
+          return result
         }
       }
     },
     getRealWidth(str) {
       //获取字符长度,中文为2英文为1
-      let l = str.length;
-      let blen = 0;
+      let l = str.length
+      let blen = 0
       for (let i = 0; i < l; i++) {
         if ((str.charCodeAt(i) & 0xff00) != 0) {
-          blen++;
+          blen++
         }
-        blen++;
+        blen++
       }
-      return blen;
+      return blen
     },
     getClassName(attr) {
-      let c1 = attr["class-name"] ? attr["class-name"] : "";
-      let c2 = attr.fixed ? `backFF` : "";
-      return c2 + c1;
+      let c1 = attr['class-name'] ? attr['class-name'] : ''
+      let c2 = attr.fixed ? `backFF` : ''
+      return c2 + c1
     },
   },
   computed: {
     autoWidth() {
       //增加一个auto属性
-      if (this.$attrs.width == "auto") {
+      if (this.$attrs.width == 'auto') {
         if (this.$attrs.label) {
           return (
             this.perWidth * this.getRealWidth(this.$t(this.$attrs.label)) + 17
-          );
+          )
         } else {
-          return 100;
+          return 100
         }
       } else {
-        return this.$attrs.width;
+        return this.$attrs.width
       }
     },
     filterData() {
@@ -298,37 +347,35 @@ export default {
         this.getHdComGrid().hdResult &&
         this.getHdComGrid().hdResult._rows
       ) {
-        let filter = [];
-        let obj = {};
+        let filter = []
+        let obj = {}
 
         this.getHdComGrid().hdResult._rows.forEach((row) => {
-          let value = row[this.$attrs.prop] || null;
-          let text = this.getValueByPath(row, this.$attrs.prop) || "";
+          let value = row[this.$attrs.prop] || null
+          let text = this.getValueByPath(row, this.$attrs.prop) || ''
 
           if (!obj[value]) {
-            obj[value] = { number: 1, text: text };
+            obj[value] = { number: 1, text: text }
           } else {
-            obj[value].number++;
+            obj[value].number++
           }
-        });
+        })
         this.$nextTick((v) => {
           Object.keys(obj).forEach((v) => {
-            filter.push({ text: `${obj[v].text}(${obj[v].number})`, value: v });
-          });
-        });
+            filter.push({ text: `${obj[v].text}(${obj[v].number})`, value: v })
+          })
+        })
         // console.log('filterData', this.getHdComGrid().hdResult._rows, filter)
-        return filter;
+        return filter
       }
     },
     isOpenFilter() {
-      return this.openFilter && this.$attrs.label != "操作";
+      return this.openFilter && this.$attrs.label != '操作'
     },
     realSortable() {
       // return this.sortable
-      return this.sortable ? "custom" : false;
+      return this.sortable ? 'custom' : false
     },
   },
-};
+}
 </script>
-
-