@lambo-design/schema-paging-table 1.0.0-beta.1 → 1.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/schema-paging-table",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.10",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -10,10 +10,10 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@lambo-design/core": "^4.7.1-beta.103",
-    "@lambo-design/shared": "^1.0.0-beta.92",
-    "@lambo-design/schema-form": "^1.0.0-beta.22",
-    "@lambo-design/paging-table": "^1.0.0-beta.69"
+    "@lambo-design/core": "^4.7.1-beta.105",
+    "@lambo-design/schema-form": "^1.0.0-beta.27",
+    "@lambo-design/shared": "^1.0.0-beta.97",
+    "@lambo-design/paging-table": "^1.0.0-beta.71"
   },
   "scripts": {}
 }

package/src/index.vue

@@ -12,7 +12,17 @@
     @on-select-all="onSelectAll"
     @on-select-all-cancel="onSelectAllCancel">
     <div slot="search">
-      <LamboSchemaForm :labelWidth="100" ref="lamboSchemaForm" v-model="queryForm" :form-type="'search'" :fieldList="formFields"  @doSearch="doSearch" @reset="onReset"/>
+      <LamboSchemaForm
+        ref="lamboSchemaForm"
+        v-model="queryForm"
+        :form-type="'search'"
+        :fieldList="formFields"
+        :labelWidth="100"
+        :default-rows="2"
+        :grid-columns="4"
+        :customComponents="customComponents"
+        :customValidates="customValidates"
+        @doSearch="doSearch" @reset="onReset"/>
       <div v-if="rowName" class="tags">
         <Tag v-for="item in selectTags" :key="item.key" :name="item.key" closable @on-close="tagClose">
           {{ item.value }}
@@ -55,17 +65,17 @@
 import ajax from '@lambo-design/shared/utils/ajax'
 import { operateBtn, operateHref } from '@lambo-design/shared/utils/assist'
 import LamboPagingTable from '@lambo-design/paging-table'
-import LamboSchemaForm from '@lambo-design/schema-form'
-
+// import LamboSchemaForm from '@lambo-design/schema-form'
+// const LamboSchemaForm = ()=> import('@lambo-design/schema-form')
 export default {
   name:"schema-paging-table",
   components: {
-    LamboSchemaForm,
+    LamboSchemaForm: () => import('@lambo-design/schema-form'),
     LamboPagingTable,
   },
   data() {
     return {
-      queryForm: null,
+      queryForm: {},
       tableSearchParams: {},
       selection: [],
       selectStore: [],
@@ -118,6 +128,8 @@ export default {
         return []
       }
     },
+    customComponents: Object,
+    customValidates: Object
   },
   computed: {
     tableColumn: function () {
@@ -134,7 +146,7 @@ export default {
           obj.render = (h, param) => {
             return h('div',
               obj.button.map((item,index)=>{
-                return operateHref(self, h, param.row, item.name, (vm, currentRow) => {
+                let doms = operateHref(self, h, param.row, item.name || param.row[obj.key], (vm, currentRow) => {
                   if(item.clickEvent?.type==="route"){
                     // self.$Message.info(item.clickEvent.name)
                     let query = item.clickEvent?.route?.keys?.reduce((acc,sourceItem)=>{
@@ -165,6 +177,14 @@ export default {
                     self.$Message.info(item.clickEvent.name)
                   }
                 },item.permission)
+
+                if(item && typeof item.condition == "function"){
+                  if(item.condition(param)){
+                    return doms
+                  }
+                }else{
+                  return doms
+                }
               })
             )
           }
@@ -213,6 +233,7 @@ export default {
       this.tableSearchParams = Object.assign({}, this.queryForm)
     },
     onReset() {
+      Object.assign(this.queryForm, this.$options.propsData.form)
       this.doSearch()
     },
     fetch: function (request,response) {
@@ -347,7 +368,7 @@ export default {
 .lambo-grid-table {
   /deep/.ivu-form {
     .ivu-form-item {
-      display: block !important;
+      display: block;
     }
   }
 }