tianheng-ui 0.0.68 → 0.0.70

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,
@@ -78,7 +78,7 @@
     "lib",
     "packages"
   ],
-  "homepage": "",
+  "homepage": "https://tianhengui.demo.tianhengyun.com/",
   "keywords": [
     "tianheng",
     "tianheng-ui"

package/packages/Grid/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="th-grid">
+  <div class="th-grid" :class="{ 'th-grid__border': border }">
     <slot></slot>
   </div>
 </template>
@@ -8,7 +8,9 @@
 export default {
   name: "ThGrid",
   props: {
-    column: Number | String
+    column: Number | String,
+    position: { type: String, default: "block" },
+    border: Boolean
   },
   data() {
     return {};

package/packages/GridItem/index.vue

@@ -1,11 +1,19 @@
 <template>
-  <div class="th-grid-item" :style="selfStyle">
+  <div
+    class="th-grid-item"
+    :class="{ 'th-grid-item__border': border }"
+    :style="selfStyle"
+  >
     <slot v-if="$slots.default"></slot>
-    <div v-else class="th-grid-item-content">
-      <i v-if="isIcon" :class="['th-icon',icon]"></i>
+    <div
+      v-else
+      class="th-grid-item-content"
+      :class="`th-grid-item-content_${position}`"
+    >
+      <i v-if="isIcon" :class="['th-icon', icon]"></i>
       <img v-else class="th-grid-item-img" src="" alt="" />
-      <p class="th-grid-item-title">{{ title }}</p>
-      <p class="th-grid-item-label">{{ label }}</p>
+      <slot v-if="$slots.title" name="title"></slot>
+      <p v-else class="th-grid-item-title">{{ title }}</p>
     </div>
   </div>
 </template>
@@ -15,11 +23,13 @@ export default {
   name: "ThGridItem",
   props: {
     title: String,
-    label: String,
     icon: String
   },
   data() {
-    return {};
+    return {
+      position: "",
+      border: false
+    };
   },
   computed: {
     isIcon() {
@@ -33,11 +43,15 @@ export default {
       }
 
       let column = 0;
-      if (parent) column = parent.column;
+      if (parent) {
+        column = parent.column;
+        this.position = parent.position;
+        this.border = parent.border;
+      }
 
       const style = {};
       if (column) {
-        style.flex = 'none'
+        style.flex = "none";
         style.flexBasis = `${100 / column}%`;
       }
       return style;

package/packages/Table/index.vue

@@ -308,7 +308,6 @@ export default {
 .th-table {
   position: relative;
   width: 100%;
-  height: 100%;
   .pagination {
     margin-top: 20px;
   }

package/packages/Table/search.vue

@@ -41,9 +41,9 @@
         <template v-if="item.options.remote">
           <el-option
             v-for="option in item.options.options"
-            :key="option[item.option.props.value]"
-            :label="option[item.option.props.label]"
-            :value="option[item.option.props.value]"
+            :key="option[item.options.props.value]"
+            :label="option[item.options.props.label]"
+            :value="option[item.options.props.value]"
           >
           </el-option>
         </template>

package/packages/Table/tools.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="th-tools">
+  <div class="th-table-tools">
     <el-button
       v-for="(item, index) in options"
       :key="index"
@@ -43,7 +43,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.th-tools {
+.th-table-tools {
   margin-bottom: 10px;
 }
 </style>

package/packages/VueEditor/index.vue

@@ -9,11 +9,11 @@ export default {
   components: { VueEditor },
   model: {
     prop: "value",
-    event: "uploadValue"
+    event: "upload:value"
   },
   props: {
     value: String,
-    disabled: String
+    disabled: Boolean
   },
   data() {
     return {
@@ -21,8 +21,14 @@ export default {
     };
   },
   watch: {
-    data(val) {
-      this.$emit("uploadValue", val);
+    data: {
+      handler(val) {
+        this.$emit("upload:value", val);
+      },
+      deep: true
+    },
+    value(val) {
+      this.data = val
     }
   }
 };