vue2-client 1.15.49 → 1.15.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.49",
+  "version": "1.15.50",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -1054,8 +1054,8 @@ export default {
             this.getDataCallback(
               res.filter(h => {
                   if (fromModel.indexOf('org') > -1) {
-                    if(type === '部门'){
-                      return formModelData?.includes(h.orgid || h.f_organization_id ) || formModelData?.includes(h.parentid)
+                    if (type === '部门') {
+                      return formModelData?.includes(h.orgid || h.f_organization_id) || formModelData?.includes(h.parentid)
                     } else {
                       return formModelData?.includes(h.orgid || h.f_organization_id || h.parentid)
                     }

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -315,7 +315,11 @@ export default {
               return k === key
             })
             if (!col || !col.width || col.slotType === 'action') {
-              return h('th', { ...restProps }, [...children])
+              if (children) {
+                return h('th', { ...restProps }, [...children])
+              } else {
+                return h('th', { ...restProps })
+              }
             }
 
             // 创建一个防止点击排序的容器
@@ -407,7 +411,11 @@ export default {
               }
             }
 
-            return h('th', { ...newRestProps, class: 'resize-table-th' }, [...children, preventSort, drag])
+            if (children) {
+              return h('th', { ...newRestProps, class: 'resize-table-th' }, [...children, preventSort, drag])
+            } else {
+              return h('th', { ...newRestProps, class: 'resize-table-th' }, [preventSort, drag])
+            }
           },
         }
       }