xianniu-ui 0.8.18 → 0.8.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.8.18",
+  "version": "0.8.20",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/ellipsis/main.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="xn-ellipsis" ref="root">
+  <div class="xn-ellipsis" ref="root" @mouseover="onMouseUp" @mouseleave="onMouseLeave">
     {{ expanded ? content : text }}
-    <span class="xn-ellipsis__action" v-if="hasAction" @click="onClickAction">{{
+    <span class="xn-ellipsis__action" v-if="hasAction"  @click="onClickAction">{{
       expanded ? collapseText : expandText
     }}</span>
   </div>
@@ -27,6 +27,10 @@ export default {
       type: String,
       default: "收起",
     },
+    trigger:{
+      type:String,
+      default:"click"
+    }
   },
   data() {
     return {
@@ -64,6 +68,7 @@ export default {
       const { root } = this.$refs;
       const cloneContainer = () => {
         if (!root) return;
+        console.log("🚀 ~ file: main.vue:71 ~ cloneContainer ~ root:", root)
         const originStyle = window.getComputedStyle(root);
         const container = document.createElement("div");
         const styleNames = Array.prototype.slice.apply(originStyle);
@@ -80,6 +85,7 @@ export default {
 
         container.innerText = this.content;
         document.body.appendChild(container);
+        console.log(container);
         return container;
       };
       const calcEllipsisText = (container, maxHeight) => {
@@ -123,9 +129,20 @@ export default {
       document.body.removeChild(container);
     },
     onClickAction(event) {
+      if(this.trigger !== 'click') return
       this.expanded = !this.expanded;
       this.$emit("clickAction", event);
     },
+    onMouseUp(event){
+      if(this.trigger!=='hover') return
+      this.expanded =!this.expanded;
+      this.$emit("hover", event);
+    },
+    onMouseLeave(event){
+      if(this.trigger!=='hover') return
+      this.expanded = false;
+      this.$emit("hover", event);
+    }
   },
   mounted() {
     this.calcEllipsised();

package/packages/search/main.vue

@@ -24,9 +24,22 @@
                 v-model="item.modelVal"
                 v-bind="item.options ? { ...item.options } : {}"
                 @on-city="handleChangeCity"
-                
               />
             </el-form-item>
+            <el-form-item
+              v-if="item.type === 'cascader'"
+              :key="idx"
+              :label="item.label"
+              :prop="item.prop"
+              class="xn-search--row_col"
+            >
+              <el-cascader
+                style="width:100%"
+                :options="item.data"
+                v-bind="item.options ? { ...item.options } : {}"
+                @change="onChangeCascader($event,item)"
+              ></el-cascader>
+            </el-form-item>
             <el-form-item
               v-if="item.type === 'input'"
               :key="idx"
@@ -62,7 +75,6 @@
                 :reserve-keyword="isRemote(item.remote)"
                 :default-first-option="isRemote(item.remote)"
                 :remote-method="item.remote"
-                
               >
                 <el-option
                   v-for="(itemData, idxData) in item.data"
@@ -306,7 +318,8 @@ export default {
     },
     setData(key, data) {
       const row =
-        this.form.value && this.form.value.find((item) => item.label === key || item.prop === key);
+        this.form.value &&
+        this.form.value.find((item) => item.label === key || item.prop === key);
       this.$set(row, "data", data);
     },
     setValue(key, value) {
@@ -328,6 +341,13 @@ export default {
         this.$set(row, "modelVal", value);
       }
     },
+    onChangeCascader(val,item){
+      const newArr = [...new Set(val.flat(Infinity))]
+      item.modelVal = newArr
+      if(item.options && item.options.change && typeof item.options.change === 'function'){
+        item.options.change(newArr,val)
+      }
+    },
   },
 };
 </script>

package/packages/upload/main.vue

@@ -203,7 +203,7 @@ export default {
     this.idCardSize()
   },
   beforeDestroy() {
-    this.$emit("update:fileList", []);
+    // this.$emit("update:fileList", []);
   },
   methods: {
     async idCardSize() {