@lambo-design/schema-paging-table 1.0.0-beta.80 → 1.0.0-beta.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/schema-paging-table",
-  "version": "1.0.0-beta.80",
+  "version": "1.0.0-beta.82",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -11,10 +11,10 @@
   },
   "devDependencies": {
     "standard-version": "^9.5.0",
-    "@lambo-design/core": "^4.7.1-beta.172",
-    "@lambo-design/shared": "^1.0.0-beta.318",
-    "@lambo-design/paging-table": "^1.0.0-beta.100",
-    "@lambo-design/schema-form": "^1.0.0-beta.94"
+    "@lambo-design/shared": "^1.0.0-beta.346",
+    "@lambo-design/core": "^4.7.1-beta.176",
+    "@lambo-design/paging-table": "^1.0.0-beta.102",
+    "@lambo-design/schema-form": "^1.0.0-beta.100"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/index.vue

@@ -29,6 +29,7 @@
         :fieldList="formFields"
         :labelWidth="labelWidth"
         :labelPosition="labelPosition"
+        :labelColon="labelColon"
         :default-rows="2"
         :grid-columns="gridColumns"
         :customComponents="customComponents"
@@ -181,6 +182,11 @@ export default {
       require: false,
       default: "right"
     },
+    labelColon: {
+      type: Boolean,
+      require: false,
+      default: false
+    },
     operColumnDropdownNum: {
       type: Number,
       require: false,
@@ -222,9 +228,8 @@ export default {
   },
   computed: {
     tableColumn: function () {
-      let columns = []
       let self = this
-      self.columnList.forEach((item,index)=>{
+      const processColumn = (item) => {
         let obj = item
         if(obj.hasOwnProperty("enums") && obj.hasOwnProperty("translate") && obj.translate === 'enums'){
           obj.render = function (h, param) {
@@ -262,7 +267,7 @@ export default {
                   dom = () => { return item.name ? item.name : param.row[obj.key]}
                 } else {
                   dom = (disable) => {if(disable) { return operateHref(self, h, param.row, item.name || param.row[obj.key], (vm, currentRow) => {}, '', item.permission)}
-                    else {return operateHref(self, h, param.row, item.name || param.row[obj.key], (vm, currentRow) => {self.handleClickEvent(item, currentRow)
+                  else {return operateHref(self, h, param.row, item.name || param.row[obj.key], (vm, currentRow) => {self.handleClickEvent(item, currentRow)
                   }, '', item.permission)}}
                 }
                 let directives = item.permission ? [{ name: "permission", value: item.permission }] : null;
@@ -300,13 +305,13 @@ export default {
             }
             let style ={}
             if (obj.tooltip) style= {
-                display: 'inline-block',
-                width: '100%',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-                verticalAlign: 'top',
-                whiteSpace: 'nowrap'
-              }
+              display: 'inline-block',
+              width: '100%',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              verticalAlign: 'top',
+              whiteSpace: 'nowrap'
+            }
             return h('span', {
               style: style,
               domProps: { title: item.name ? item.name : param.row[obj.key] }
@@ -319,22 +324,28 @@ export default {
           this.selectCondition = item.selectCondition ? item.selectCondition : ''
         } else if (item.tooltip) {
           if(typeof obj.render !==  'function')
-          obj.render = (h, param) => {
-            return h('span', {
-              style: {
-                display: 'inline-block',
-                width: '100%',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-                verticalAlign: 'top',
-                whiteSpace: 'nowrap'
-              },
-              domProps: { title: item.name ? item.name : param.row[obj.key] }
-            }, item.name ? item.name : param.row[obj.key])
-          }
+            obj.render = (h, param) => {
+              return h('span', {
+                style: {
+                  display: 'inline-block',
+                  width: '100%',
+                  overflow: 'hidden',
+                  textOverflow: 'ellipsis',
+                  verticalAlign: 'top',
+                  whiteSpace: 'nowrap'
+                },
+                domProps: { title: item.name ? item.name : param.row[obj.key] }
+              }, item.name ? item.name : param.row[obj.key])
+            }
         }
-        columns.push(item)
-      })
+        // 如果存在子列，递归处理
+        if (obj.children && Array.isArray(obj.children)) {
+          obj.children = obj.children.map(processColumn)
+        }
+        return obj
+      }
+      // 遍历列配置并处理
+      let columns = self.columnList.map(processColumn)
       return columns
     },
     dropDownButton: function () {
@@ -581,8 +592,12 @@ export default {
     },
     onReset() {
       // Object.assign(this.queryForm, this.$options.propsData.form)
-      this.queryForm = this.$options.propsData.form;
-      this.doSearch()
+      this.$emit('onReset')
+      // 等待业务对form属性重置的操作
+      this.$nextTick(()=>{
+        this.queryForm = this.$options.propsData.form;
+        this.doSearch()
+      })
     },
     fetch: function (request,response,index,item) {
       let self = this