zydx-plus 1.19.95 → 1.19.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.19.95",
+  "version": "1.19.97",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/menuTree/src/ZydxMenuTree.vue

@@ -53,6 +53,11 @@ export default {
       required: true,
     },
   },
+  data () {
+      return {
+          pcatalogIds: ''
+      }
+  },
   computed: {
     targetTree: function () {
       let that = this;
@@ -109,7 +114,10 @@ export default {
     },
     // 点击回调事件
     clickItem(item) {
+      this.getPcatalogIds(item.pcatalogId);
+      item["catalogPIds"] = this.pcatalogIds.split("").reverse().join("");
       this.$emit("clickItem", item);
+      this.pcatalogIds = '';
     },
     // 递归调用修改状态
     setIsShowUpDown(item, index) {
@@ -123,6 +131,20 @@ export default {
         }
       }
     },
+    // 获取当前节点的父级id
+    getPcatalogIds: function (pcatalogId) {
+        let that = this
+        if (pcatalogId === '-1') {
+            that.pcatalogIds += ','
+        } else {
+            this.treeData.some(function (item) {
+                if (item.catalogId === pcatalogId) {
+                    that.pcatalogIds += ',' + item.catalogId
+                    that.getPcatalogIds(item.pcatalogId)
+                }
+            })
+        }
+    },
   },
 };
 </script>
@@ -134,6 +156,7 @@ export default {
   text-overflow: ellipsis;
   padding: 0px 10px;
   width: 100%;
+  box-sizing: border-box;
 }
 
 </style>

package/src/components/menuTree/src/ZydxMenuTreeInfo.vue

@@ -24,6 +24,7 @@ selectItem 传入当前选择的节点，是一个对象
           class="widthB100 ellipse cursor "
           :class="menuTitleStyle"
           @click.stop="clickItem(menuInfo)"
+          :title="menuInfo.title"
         >
           <template v-if="menuConfig.isCheckBox">
             <checkBox v-model="menuConfig.checkBoxValue" :value="menuInfo.catalogId"></checkBox>

package/src/components/tipBox/src/main.vue

@@ -15,7 +15,8 @@
                         <div v-if="type === 'radio'">
                             <div class="radio-list" v-for="(item,index) in radioArr" :key="index">
                                 <label>
-                                    <input type="radio" name="radio" :value="item.value" :checked="item.checked" @change="radioTao(index)" />
+                                    <input type="radio" name="radio" :value="item.value" :checked="item.checked"
+                                           @change="radioTao(index)"/>
                                     <span>{{ item.label }}</span>
                                 </label>
                             </div>
@@ -23,8 +24,15 @@
                         <div class="tip-img" v-if="type === 'input'">
                             <div class="tip-input" v-for="(item,index) in inputArr" :key="index">
                                 <span v-if="item.name">{{ item.name }}</span>
-                                <input v-if="item.type === 'input'" type="text" :placeholder="item.placeholder"
-                                       v-model="item.value" :disabled="item.disabled"/>
+                                <div style="display: inline-block;" v-if="item.type === 'input'">
+                                    <input v-if="!item.number" type="text" :placeholder="item.placeholder"
+                                           v-model="item.value" :disabled="item.disabled"/>
+                                    <div v-else class="number-input">
+                                        <input type="number" @keypress="isNumberKey($event,index)"
+                                               :placeholder="item.placeholder"
+                                               v-model="item.value" :disabled="item.disabled"/>
+                                    </div>
+                                </div>
                                 <div style="display: inline-block;">
                                     <Select v-if="item.type === 'select'" :options="item.option"
                                             v-model:value="item.selectValue"></Select>
@@ -36,8 +44,11 @@
                                 </div>
                                 <div v-if="item.type === 'text'" class="text">{{ item.value }}</div>
                                 <div v-if="item.type === 'code'" class="ph-code">
-                                    <input type="text" v-model="item.value" :placeholder="item.placeholder" />
-                                    <button ref="tipID" @click="item.codeTap($refs.tipID[0],inputArr)">{{ item.butVal }}</button>
+                                    <input type="text" v-model="item.value" :placeholder="item.placeholder"/>
+                                    <button ref="tipID" @click="item.codeTap($refs.tipID[0],inputArr)">{{
+                                        item.butVal
+                                        }}
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -55,6 +66,20 @@
 <script>
 import Select from '../../select/src/select.vue'
 import Calendar from '../../calendar/src/Calendar'
+function isNumberKey(evt) {
+    var charCode = (evt.which) ? evt.which : event.keyCode;
+    if (charCode === 46) {
+        // Check if the text already contains a decimal point
+        return evt.target.value.indexOf('.') === -1;
+    } else if (charCode > 31 && (charCode < 48 || charCode > 57))
+        return false;
+
+    // Check if the first character is zero
+    return !(evt.target.value === '' && String.fromCharCode(charCode) === '0');
+
+
+}
+
 
 export default {
     name: 'zydx-tip-box',
@@ -110,7 +135,31 @@ export default {
         }
     },
     methods: {
-        radioTao(index){
+        isNumberKey(evt,index) {
+            const charCode = (evt.which) ? evt.which : event.keyCode;
+            if (charCode === 46) {
+                if (this.inputArr[index].value.indexOf('.') !== -1)
+                    evt.preventDefault();
+                else
+                    return true;
+            } else if (charCode > 31 && (charCode < 48 || charCode > 57))
+                evt.preventDefault();
+
+            if (this.valueState(this.inputArr[index].value) && String.fromCharCode(charCode) === '0')
+                evt.preventDefault();
+            // 判断是否有小数点
+            if(this.inputArr[index].value === undefined) return true
+            if (this.inputArr[index].value.indexOf('.') !== -1) {
+                // 判断小数点的位数
+                if (this.inputArr[index].value.split('.')[1].length >= 1) {
+                    evt.preventDefault();
+                }
+            }
+        },
+        valueState(v) {
+            return v === '' || v === undefined || v === null;
+        },
+        radioTao(index) {
             this.radioArr.forEach(item => {
                 item.checked = false
             })

package/src/components/tipBox/src/zydxStyle.css

@@ -100,6 +100,7 @@ font-size: 12px;
   line-height: 30px;
   padding-right: 10px;
   text-align: right;
+  float: left;
 }
 .tip-input input{
   width: 211px;
@@ -167,4 +168,21 @@ font-size: 12px;
   top: 12px;
   left: 20px;
   z-index: 1;
+}
+.number-input{
+  width: 211px;
+  height: 32px;
+  box-sizing: border-box;
+  font-size: 16px;
+  outline: none;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+  box-shadow: 0 1px 0 1px rgb(0 0 0 / 4%);
+  overflow: hidden;
+}
+.number-input>input{
+  border: 0 !important;
+  box-shadow: none !important;
+  height: 30px !important;
+  width: 240px !important;
 }

package/src/index.js

@@ -57,7 +57,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.19.95',
+    version: '1.19.97',
     install,
     Calendar,
     Message,