hd-idevvue3 3.0.3 → 3.0.4

package/src/hdcom/HdMessage.vue

@@ -1,192 +1,201 @@
-<template>
-</template>
-<script>
+<template></template>
 
+<script>
+/**
+ * websocket消息
+ * @module HdMessage
+ */
+export default {
+  name: 'HdMessage',
+  data() {
+    return {
+      hdQuery: new HdQuery(this),
+      websocket: null,
+    }
+  },
   /**
-   * websocket消息
-   * @module HdMessage
+   * prop
+   * @prop {allProto} 完整格式 如 wss://gctos.huadong.net/ws,与ipAddr和port互斥
+   * @prop {String} ipAddr 有值时,使用该值,无值时,localhost下 为localhost:8080,其它用浏览器的url
+   * @prop {Event} msgRec 消息接收的事件,类型1的会弹出系统自带的消息框
    */
-  export default {
-    name: 'HdMessage',
-    data() {
-      return {
-        hdQuery: new HdQuery(this),
-        websocket: null,
+  props: ['ipAddr', 'port', 'allProto'],
+  mounted() {
+    window._tabOpen = (path) => {
+      //这里必须是全局的
+      if (path.indexOf('http') == 0) {
+        //http开头的在新窗口打开
+        window.open(path)
+      } else if (path.indexOf('iframe://') == 0) {
+        // this.$refs['commsgiframe'].show(path.substring(9));
+      } else {
+        this.$router.push({
+          path: path,
+        })
       }
-    },
-    /**
-     * prop
-     * @prop {allProto} 完整格式 如 wss://gctos.huadong.net/ws,与ipAddr和port互斥
-     * @prop {String} ipAddr 有值时,使用该值,无值时,localhost下 为localhost:8080,其它用浏览器的url
-     * @prop {Event} msgRec 消息接收的事件,类型1的会弹出系统自带的消息框
-     */
-    props: ['ipAddr', 'port', 'allProto'],
-    mounted() {
-      window._tabOpen = (path) => {//这里必须是全局的
-        if (path.indexOf('http') == 0) {//http开头的在新窗口打开
-          window.open(path);
-        } else if(path.indexOf('iframe://') == 0) {
-         // this.$refs['commsgiframe'].show(path.substring(9));
-        } else {
-          this.$router.push({
-            path: path,
-          });
-        }
+    }
+    this.init()
+    this.readMessage()
+  },
+  methods: {
+    init() {
+      this.socketConnect()
+
+      // 连接发生错误的回调方法
+      this.websocket.onerror = () => {
+        this.websocket = -1
+        console.info('连接发生错误')
+        //this.doMsg("连接发生错误");
       }
-      this.init()
-      this.readMessage();
-    },
-    methods: {
-      init() {
-        this.socketConnect()
 
-        // 连接发生错误的回调方法
-        this.websocket.onerror = () => {
-          this.websocket = -1
-          console.info("连接发生错误")
-          //this.doMsg("连接发生错误");
-        };
+      // 连接成功建立的回调方法
+      this.websocket.onopen = () => {
+        console.info('websocket success')
+        this.doHeartConnect() //开启心跳连接
+        //this.doMsg("连接成功");
+      }
 
-        // 连接成功建立的回调方法
-        this.websocket.onopen = () => {
-          console.info("websocket success")
-          this.doHeartConnect()//开启心跳连接
-          //this.doMsg("连接成功");
+      // 接收到消息的回调方法，此处添加处理接收消息方法，当前是将接收到的信息显示在网页上
+      this.websocket.onmessage = (event) => {
+        let msgObj = JSON.parse(event.data)
+        if (msgObj.msgType == -2) {
+          //单用户登录:退出到登录页
+          this.singleLoginNotify(msgObj)
+          return false
         }
-
-        // 接收到消息的回调方法，此处添加处理接收消息方法，当前是将接收到的信息显示在网页上
-        this.websocket.onmessage = (event) => {
-          let msgObj = JSON.parse(event.data)
-          if (msgObj.msgType == -2) {//单用户登录:退出到登录页
-            this.singleLoginNotify(msgObj)
-            return false
-          }
-          //未读消息加一
-          this.$store.state.user.messageNum = this.$store.state.user.messageNum + 1;
-          if (msgObj.msgType == 1) {//type 1为普通消息,默认提示,其它类型发送给业务系统判断
-            this.doMsgObj(msgObj);
-          }
-          this.$emit('msgRec', msgObj)//父类处理事件
+        //未读消息加一
+        this.$store.state.user.messageNum =
+          this.$store.state.user.messageNum + 1
+        if (msgObj.msgType == 1) {
+          //type 1为普通消息,默认提示,其它类型发送给业务系统判断
+          this.doMsgObj(msgObj)
         }
+        this.$emit('msgRec', msgObj) //父类处理事件
+      }
 
-        // 连接关闭的回调方法
-        this.websocket.onclose = () => {
-          console.info("websocket close,restart")
-          if (this.websocket != -1) {//连接错误,停止使用
-            this.websocket = null
-            this.init()//重新连接
-          }
+      // 连接关闭的回调方法
+      this.websocket.onclose = () => {
+        console.info('websocket close,restart')
+        if (this.websocket != -1) {
+          //连接错误,停止使用
+          this.websocket = null
+          this.init() //重新连接
         }
-
-      }
-      ,
-      singleLoginNotify(msgObj) {
-        this.$notify({
-          title: '',
-          message: this.$t('该账号已在其它地方登录,5秒后将退出系统'),
-          duration: 5000,
-          onClose: () => {
-            this.$store.dispatch('LogOut').then(() => {
-              location.reload()// 为了重新实例化vue-router对象 避免bug
-            })
-          }
-        });
       }
-      ,
-      socketConnect() {
-        // 判断当前浏览器是否支持WebSocket
-        let inPort = this.port
-        if ('WebSocket' in window) {
-          if (!this.port) {
-            inPort = '8080';
-          }
-          // let host = "127.0.0.1:8080" //window.location.host
-          let host = window.location.host //window.location.host
-          // 创建一个WebSocket连接，URL：127.0.0.1:8080/realTimeWebSocket/webSocket
-          if (host.indexOf("localhost") >= 0) {
-            host = "127.0.0.1:" + inPort
-          }
-          if (this.ipAddr) {
-            host = this.ipAddr + ":" + inPort
-          }
-          if (this.allProto) {
-            this.websocket = new WebSocket(this.allProto + "?token=" + this.$store.getters.token);
-          } else {
-            this.websocket = new WebSocket("ws://" + host + "/ws?token=" + this.$store.getters.token);
-          }
+    },
+    singleLoginNotify(msgObj) {
+      this.$notify({
+        title: '',
+        message: this.$t('该账号已在其它地方登录,5秒后将退出系统'),
+        duration: 5000,
+        onClose: () => {
+          this.$store.dispatch('LogOut').then(() => {
+            location.reload() // 为了重新实例化vue-router对象 避免bug
+          })
+        },
+      })
+    },
+    socketConnect() {
+      // 判断当前浏览器是否支持WebSocket
+      let inPort = this.port
+      if ('WebSocket' in window) {
+        if (!this.port) {
+          inPort = '8080'
+        }
+        // let host = "127.0.0.1:8080" //window.location.host
+        let host = window.location.host //window.location.host
+        // 创建一个WebSocket连接，URL：127.0.0.1:8080/realTimeWebSocket/webSocket
+        if (host.indexOf('localhost') >= 0) {
+          host = '127.0.0.1:' + inPort
+        }
+        if (this.ipAddr) {
+          host = this.ipAddr + ':' + inPort
+        }
+        if (this.allProto) {
+          this.websocket = new WebSocket(
+            this.allProto + '?token=' + this.$store.getters.token
+          )
         } else {
-          alert('当前浏览器 不支持WebSocket')
+          this.websocket = new WebSocket(
+            'ws://' + host + '/ws?token=' + this.$store.getters.token
+          )
         }
-      },
-      readMessage() {
-        this.hdQuery.query.readFlg = '0';
-        this.hdQuery.rows = '1000';
-        this.hdQuery.sort = 'sendTim'
+      } else {
+        alert('当前浏览器 不支持WebSocket')
+      }
+    },
+    readMessage() {
+      this.hdQuery.query.readFlg = '0'
+      this.hdQuery.rows = '1000'
+      this.hdQuery.sort = 'sendTim'
 
-        this.$http.post('/webresources/login/com/ComMsg/find/rec', this.hdQuery).then(response => {
-            if (response.data.total === 0) {
-              return;
-            }
-            var msg = {};
-            msg.title = this.$t('消息提示');
-            msg.content = this.$t('您有{total}条未读消息', {total: response.data.total});
-            msg.url = '/privilege/commsgto'
-            this.$store.state.user.messageNum = response.data.total;
-            this.doMsgObj(msg);
-            // let data = response.data.rows;
-            // for (let i = 0; i < data.length; i++) {
-            //   this.doMsgObj(data[i]);
-            // }
+      this.$http
+        .post('/webresources/login/com/ComMsg/find/rec', this.hdQuery)
+        .then((response) => {
+          if (response.data.total === 0) {
+            return
           }
-        )
+          var msg = {}
+          msg.title = this.$t('消息提示')
+          msg.content = this.$t('您有{total}条未读消息', {
+            total: response.data.total,
+          })
+          msg.url = '/privilege/commsgto'
+          this.$store.state.user.messageNum = response.data.total
+          this.doMsgObj(msg)
+          // let data = response.data.rows;
+          // for (let i = 0; i < data.length; i++) {
+          //   this.doMsgObj(data[i]);
+          // }
+        })
+    },
+    doMsgObj(con) {
+      let msgcon = ''
+      if (con.url) {
+        msgcon = `<a onclick="_tabOpen('${con.url}')">${con.content}</a>`
+      } else {
+        msgcon = con.content
       }
-      ,
-      doMsgObj(con) {
-        let msgcon = ""
-        if (con.url) {
-          msgcon = `<a onclick="_tabOpen('${con.url}')">${con.content}</a>`
-        } else {
-          msgcon = con.content
-        }
-        //document.getElementById("video").src=require('../assets/sound/notify.wav')
-        //this.notify = new Audio(require('../assets/sound/notify.wav'));
-        this.notify = new Audio(`/webresources/login/com/comwav/txtRead?text=${con.content}`);
-        this.notify.play();
+      //document.getElementById("video").src=require('../assets/sound/notify.wav')
+      //this.notify = new Audio(require('../assets/sound/notify.wav'));
+      this.notify = new Audio(
+        `/webresources/login/com/comwav/txtRead?text=${con.content}`
+      )
+      this.notify.play()
 
-        this.$notify({
-          dangerouslyUseHTMLString: true,
-          title: con.title,
-          message: msgcon,
-          duration: 10000,
-          position: 'bottom-right'
-        });
-        if (!con.msgRecId) {
-          con.msgRecId = con.recId;
-        }
-
-        //消息展示完不在把消息标为已读
-        // this.$http.post('/webresources/login/com/ComMsg/read', {recId: con.msgRecId}).then(response => {
-        //   var data = response.data;
-        //   if (data.code != '1') {
-        //     this.$message({
-        //       type: 'error',
-        //       message: data.message
-        //     })
-        //   }
-        // })
+      this.$notify({
+        dangerouslyUseHTMLString: true,
+        title: con.title,
+        message: msgcon,
+        duration: 10000,
+        position: 'bottom-right',
+      })
+      if (!con.msgRecId) {
+        con.msgRecId = con.recId
       }
-      ,
-      doHeartConnect() {
-        setInterval(() => {
-          try {
-            if (this.websocket && this.websocket != -1) {
-              this.websocket.send('ping')
-            }
-          } catch (e) {
-            console.error(e)
+
+      //消息展示完不在把消息标为已读
+      // this.$http.post('/webresources/login/com/ComMsg/read', {recId: con.msgRecId}).then(response => {
+      //   var data = response.data;
+      //   if (data.code != '1') {
+      //     this.$message({
+      //       type: 'error',
+      //       message: data.message
+      //     })
+      //   }
+      // })
+    },
+    doHeartConnect() {
+      setInterval(() => {
+        try {
+          if (this.websocket && this.websocket != -1) {
+            this.websocket.send('ping')
           }
-        }, 30000)
-      }
-    }
-  }
+        } catch (e) {
+          console.error(e)
+        }
+      }, 30000)
+    },
+  },
+}
 </script>

package/src/hdcom/HdNum.vue

@@ -1,69 +1,79 @@
 <template>
-  <el-input :clearable="false" :disabled="disabled" :step="step" @blur="myblur" @change="mychange"
-            class="hdnum" onkeypress='return( "e"!=(String.fromCharCode(event.keyCode).toLowerCase()))'
-            ref="numInput" type="number"
-            v-model.lazy="mynum"></el-input>
+  <el-input
+    :clearable="false"
+    :disabled="disabled"
+    :step="step"
+    @blur="myblur"
+    @change="mychange"
+    class="hdnum"
+    onkeypress='return( "e"!=(String.fromCharCode(event.keyCode).toLowerCase()))'
+    ref="numInput"
+    type="number"
+    v-model.lazy="mynum"
+  ></el-input>
 </template>
-<!-- onkeypress 是为了阻止e的输入html5的问题-->
+
 <script>
+/**
+ * 输入区为数字时使用,请勿直接使用el-input(校验时空处理有问题)
+ * @module HdNum
+ */
+export default {
+  name: 'HdNum',
+  data() {
+    return {
+      mynum: null,
+    }
+  },
+  inheritAttrs: false,
   /**
-   * 输入区为数字时使用,请勿直接使用el-input(校验时空处理有问题)
-   * @module HdNum
+   * Props  不继承任何属性
+   * @prop {int} value 值,组件使用 v-model=""
+   * @prop {int} step 步长
+   * @prop {boolean}  disabled
+   * @change
+   * @blur
    */
-  export default {
-    name: 'HdNum',
-    data() {
-      return {
-        mynum: null
+  props: ['value', 'step', 'disabled'],
+  methods: {
+    mychange(evt) {
+      if (typeof evt == 'undefined' || evt === '') {
+        // 空字符串设置为null
+        this.mynum = null
+        this.$emit('input', null)
+      } else {
+        this.mynum = parseFloat(evt)
+        this.$emit('input', parseFloat(evt))
+      }
+      this.$emit('change', evt)
+    },
+    myblur(evt) {
+      this.$emit('blur', evt)
+    },
+    isNumber(val) {
+      var regPos = /^\d+(\.\d+)?$/ //非负浮点数
+      var regNeg =
+        /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/ //负浮点数
+      if (regPos.test(val) || regNeg.test(val)) {
+        return true
+      } else {
+        return false
       }
     },
-    inheritAttrs: false,
-    /**
-     * Props  不继承任何属性
-     * @prop {int} value 值,组件使用 v-model=""
-     * @prop {int} step 步长
-     * @prop {boolean}  disabled
-     * @change
-     * @blur
-     */
-    props: ['value', 'step', 'disabled'],
-    methods: {
-      mychange(evt) {
-        if (typeof (evt) == 'undefined' || evt === '') { // 空字符串设置为null
-          this.mynum = null
-          this.$emit('input', null)
+  },
+  watch: {
+    // 给外层v-model赋值
+    value: {
+      handler: function (val, oldVal) {
+        if (val && this.isNumber(val)) {
+          this.mynum = parseFloat(val)
+          this.$emit('input', parseFloat(val))
         } else {
-          this.mynum = parseFloat(evt)
-          this.$emit('input', parseFloat(evt))
+          this.mynum = val
         }
-        this.$emit('change', evt)
-      },
-      myblur(evt) {
-        this.$emit('blur', evt)
       },
-      isNumber(val) {
-        var regPos = /^\d+(\.\d+)?$/; //非负浮点数
-        var regNeg = /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/; //负浮点数
-        if (regPos.test(val) || regNeg.test(val)) {
-          return true;
-        } else {
-          return false;
-        }
-      }
+      immediate: true,
     },
-    watch: {// 给外层v-model赋值
-      value: {
-        handler: function (val, oldVal) {
-          if(val && this.isNumber(val)){
-              this.mynum = parseFloat(val)
-              this.$emit('input', parseFloat(val))
-          }  else {
-              this.mynum = val
-          }
-        },
-        immediate: true
-      }
-    }
-  }
-
+  },
+}
 </script>

package/src/hdcom/HdPopSel.vue

@@ -1,44 +1,60 @@
 <template>
-  <el-input v-bind="$attrs" v-on="$listeners" :placeholder="placeholder?placeholder:''" :value="txtVal" readonly
-            @focus="$emit('focus')" :disabled="disabled"
-            ref="sel" @mouseenter.native="doMouseEnter" @mouseleave.native="doMouseLeave" :clearable="false">
-    <i slot="suffix" class="el-input__icon el-icon-circle-close" v-if="!threePointShow" @click.stop="doClear"
-       style="cursor:pointer "></i>
-    <i v-if="threePointShow" slot="suffix" class="el-input__icon el-icon-more" @click="$emit('pop')"
-       style="cursor:pointer"></i>
+  <el-input
+    v-bind="$attrs"
+    v-on="$listeners"
+    :placeholder="placeholder ? placeholder : ''"
+    :model-value="txtVal"
+    readonly
+    @focus="$emit('focus')"
+    :disabled="disabled"
+    ref="sel"
+    @mouseenter.native="doMouseEnter"
+    @mouseleave.native="doMouseLeave"
+    :clearable="false"
+  >
+    <el-icon class="el-input__icon" style="cursor: pointer"
+      ><el-icon-circle-close
+    /></el-icon>
+    <el-icon class="el-input__icon" style="cursor: pointer"
+      ><el-icon-more
+    /></el-icon>
   </el-input>
 </template>
-<style>
-  .lucencyInput .el-input__inner {
-    border: 0px;
-  }
-</style>
+
 <script>
-/**
-   * 废弃,直接使用HdGridSel
-   * @module HdPoPSel
-   */
+import {
+  CircleClose as ElIconCircleClose,
+  More as ElIconMore,
+} from '@element-plus/icons'
 export default {
+  components: {
+    ElIconCircleClose,
+    ElIconMore,
+  },
   name: 'HdPoPSel',
   data() {
     return {
       popShow: this.show,
-      threePointShow: true
+      threePointShow: true,
     }
   },
   inheritAttrs: false,
+  // 设置value为props属性-必须
   props: {
-    show: Boolean, txtVal: String, idVal: String, placeholder: String, disabled: Boolean
-  }, // 设置value为props属性-必须
+    show: Boolean,
+    txtVal: String,
+    idVal: String,
+    placeholder: String,
+    disabled: Boolean,
+  },
   mounted() {
-    $(this.$parent.$el).find('.el-popover__reference').removeAttr('tabIndex')// 焦点用
+    $(this.$parent.$el).find('.el-popover__reference').removeAttr('tabIndex') // 焦点用
   },
   methods: {
     focus() {
       this.$refs.sel.focus()
     },
-    doQuery() {
-    },
+    doQuery() {},
     doClear() {
       this.$emit('clear')
     },
@@ -52,7 +68,13 @@ export default {
     },
     doMouseLeave() {
       this.threePointShow = true
-    }
-  }
+    },
+  },
 }
 </script>
+
+<style>
+.lucencyInput .el-input__inner {
+  border: 0px;
+}
+</style>