tianheng-ui 0.0.52 → 0.0.55

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.52",
+  "version": "0.0.55",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,

package/packages/formMaking/GenerateForm.vue

@@ -108,7 +108,6 @@ export default {
           }
         }
       });
-      // console.log(this.models)
     },
     generateRules(item) {
       if (this.rules[item.model]) {
@@ -163,7 +162,6 @@ export default {
     value: {
       deep: true,
       handler(val) {
-        console.log(JSON.stringify(val));
         this.models = { ...this.models, ...val };
       }
     }

package/packages/formMaking/WidgetFormItem.vue

@@ -686,7 +686,6 @@ export default {
       this.selectWidget = row.columns[colIndex].list[newIndex];
     },
     handleWidgetTabAdd($event, row, colIndex) {
-      console.log(row, colIndex);
       const newIndex = $event.newIndex;
       const oldIndex = $event.oldIndex;
       const item = $event.item;

package/packages/table/action.vue

@@ -2,7 +2,7 @@
   <div class="th-table-action" @click.stop>
     <template v-for="(item, index) in actions">
       <el-popover
-        v-if="item.act === 'delete'"
+        v-if="item.act === 'delete' && !btnHide(item)"
         :key="index"
         v-model="pop"
         placement="top"
@@ -32,7 +32,7 @@
         >
       </el-popover>
       <el-dropdown
-        v-else-if="item.act === 'more'"
+        v-else-if="item.act === 'more' && !btnHide(item)"
         :key="index"
         :trigger="item.trigger || 'click'"
         :placement="item.placement || 'bottom-end'"
@@ -63,7 +63,7 @@
         </el-dropdown-menu>
       </el-dropdown>
       <el-button
-        v-else
+        v-else-if="!btnHide(item)"
         :key="index"
         :style="item.style"
         :type="item.type"
@@ -107,13 +107,23 @@ export default {
   computed: {
     btnDisabled() {
       return item => {
-        if (item.disabled instanceof Boolean) {
+        if (typeof item.disabled == "boolean") {
           return item.disabled;
         }
-        if (item.disabled instanceof Function) {
+        if (typeof item.disabled == "function") {
           return item.disabled(this.scope);
         }
       };
+    },
+    btnHide() {
+      return item => {
+        if (typeof item.hide == "boolean") {
+          return item.hide;
+        }
+        if (typeof item.hide == "function") {
+          return item.hide(this.scope);
+        }
+      };
     }
   },
   methods: {

package/packages/table/index.vue

@@ -58,7 +58,7 @@
                 :scope="scope"
                 :option="item"
               />
-              <span v-else-if="item.format">
+              <span v-else-if="item.formatTime">
                 {{
                   handleFormatTime(
                     scope.row[item.alias || item.prop],
@@ -66,6 +66,9 @@
                   )
                 }}
               </span>
+              <span v-else-if="item.format">
+                {{ item.format(scope.row) }}
+              </span>
               <span v-else-if="item.alias">{{ scope.row[item.alias] }}</span>
               <span v-else>{{ scope.row[item.prop] }}</span>
             </template>
@@ -126,7 +129,7 @@ export default {
     selectType: {
       type: String,
       default: () => {
-        return "";
+        return "single";
       }
     },
     // 行双击事件

package/packages/table/search.vue

@@ -81,16 +81,11 @@ export default {
       default: () => {
         return [];
       }
-    },
-    params: {
-      type: Object,
-      default: () => {
-        return {};
-      }
     }
   },
   data() {
     return {
+      params: {},
       datePickerTypes: [
         "year",
         "month",
@@ -104,6 +99,23 @@ export default {
       ]
     };
   },
+  watch: {
+    options: {
+      handler(newVal, oldVal) {
+        if (newVal && newVal.length) {
+          newVal.map(item => {
+            this.$set(
+              this.params,
+              item.options.prop,
+              item.options.defaultValue
+            );
+          });
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
   methods: {
     doSearch() {
       this.$emit("on-search", this.params);