xianniu-ui 0.6.4 → 0.7.1

package/package.json

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

package/packages/card/index.js

@@ -0,0 +1,7 @@
+import XnCard from './main.vue'
+
+XnCard.install = function (Vue) {
+  Vue.component(XnCard.name, XnCard)
+}
+
+export default XnCard

package/packages/card/main.vue

@@ -0,0 +1,47 @@
+<template>
+  <div class="xn-card">
+    <div class="xn-card-header flex justify-content-between">
+      <slot name="title" v-if="title || $slots.title">
+        <slot name="title">
+          <h3><span>{{title}}</span></h3>
+        </slot>
+      </slot>
+      <div class="xn-card-header__more">
+        <slot name="more"></slot>
+      </div>
+    </div>
+    <div class="xn-card-body" :style="styles">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "XnCard",
+  props: {
+    title: {
+      type: String,
+      default: "",
+    },
+    bodyStyle: {
+      type: Object,
+      default: () => {
+        return {
+          padding: "18px",
+        };
+      },
+    },
+  },
+  computed: {
+    styles() {
+      return {
+        ...this.bodyStyle,
+      };
+    },
+  },
+};
+</script>
+
+<style>
+</style>

package/packages/search/main.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="xn-search">
-    <el-form ref="form" inline :model="form" :label-width="labelWidth">
+    <el-form
+      ref="form"
+      inline
+      :model="form"
+      :label-width="labelWidth"
+      @submit.native.prevent
+      @keyup.enter.native="onSearch"
+    >
       <el-row :gutter="0" class="xn-search--row">
         <template v-for="(item, idx) in form.value">
           <el-col v-bind="{ ...col }" :key="idx" v-show="item.isShow || isColl">
@@ -16,6 +23,7 @@
                 :data-level="(item.options && item.options.dataLevel) || 2"
                 v-model="item.modelVal"
                 @on-city="handleChangeCity"
+                
               />
             </el-form-item>
             <el-form-item
@@ -53,6 +61,7 @@
                 :reserve-keyword="isRemote(item.remote)"
                 :default-first-option="isRemote(item.remote)"
                 :remote-method="item.remote"
+                
               >
                 <el-option
                   v-for="(itemData, idxData) in item.data"
@@ -302,12 +311,12 @@ export default {
     setValue(key, value) {
       if (Object.prototype.toString.call(key) === "[object Object]") {
         const list = this.form.value;
-        const keys = Object.keys(key)
+        const keys = Object.keys(key);
         for (let i = 0; i < list.length; i++) {
           const item = list[i];
-          if(keys.includes(item.prop)){
-            console.log(item,key[item.prop]);
-            item.modelVal = key[item.prop]
+          if (keys.includes(item.prop)) {
+            console.log(item, key[item.prop]);
+            item.modelVal = key[item.prop];
           }
         }
         return;

package/packages/style/src/card.scss

@@ -0,0 +1,16 @@
+.xn-card {
+    background-color: #fff;
+    padding: 0 38px;
+    &-header {
+        padding: 24px 0 13px 0;
+        border-bottom: 1px solid #f2f2f2;
+        h3 {
+            margin: 0;
+            padding: 0;
+            font-size: 18px;
+            font-weight: 500;
+            color: #202131;
+            line-height: 25px;
+        }
+    }
+}

package/packages/style/src/index.scss

@@ -12,6 +12,7 @@
 @import './footer.scss';
 @import './tag.scss';
 @import './ellipsis.scss';
+@import './card.scss';
 
 
 
@@ -19,4 +20,5 @@
 @import './theme/variables.scss';
 @import './theme/mixin.scss';
 @import './theme/transition.scss';
-@import './theme/sidebar.scss';
+@import './theme/sidebar.scss';
+@import './theme/element-ui.scss';

package/packages/style/src/theme/element-ui.scss

@@ -0,0 +1,8 @@
+.el-descriptions{
+    .el-descriptions-item__label:not(.is-bordered-label){
+        color: #909097;
+    }
+    &--small{
+        font-size: 14px;
+    }
+}

package/packages/table/main.vue

@@ -116,7 +116,7 @@
       </el-table-column>
       <el-table-column
         width="50px"
-        label="No."
+        label="序号"
         v-if="index && data.length"
         type="index"
       ></el-table-column>

package/packages/tree/main.vue

@@ -61,7 +61,7 @@ export default {
       if (
         data.parentId &&
         data.parentId !== 0 &&
-        !data[this.defaultProps.children].length
+        (data[this.defaultProps.children] && !data[this.defaultProps.children].length)
       ) {
         className = 'especially'
       }

package/src/index.js

@@ -15,6 +15,7 @@ import XnFooter from '../packages/footer/index'
 import XnEmpty from '../packages/empty/index'
 import XnTag from '../packages/tag/index'
 import XnEllipsis from '../packages/ellipsis/index'
+import XnCard from '../packages/card/index'
 
 import Utils from 'xn-ui/src/utils/index'
 const doc = 'http://lzwr.gitee.io/xn-ui/#/'
@@ -34,7 +35,8 @@ const components = [
     XnFooter,
     XnEmpty,
     XnTag,
-    XnEllipsis
+    XnEllipsis,
+    XnCard
 ]
 const version = require('../package.json').version
 const install = function (Vue) {
@@ -80,5 +82,6 @@ export default {
     XnFooter,
     XnEmpty,
     XnTag,
-    XnEllipsis
+    XnEllipsis,
+    XnCard
 }