xrk-components 0.4.1-beta.2 → 0.4.2-beta.1

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-import { ref, watch, getCurrentScope, onScopeDispose, unref, getCurrentInstance, onMounted, nextTick, openBlock, createElementBlock, createElementVNode, warn, computed as computed$1, provide, inject, watchEffect, onBeforeUnmount, toRef, onUnmounted, isRef, onBeforeMount, defineComponent, mergeProps, renderSlot, useAttrs as useAttrs$1, useSlots, shallowRef, withDirectives, createCommentVNode, Fragment, normalizeClass, createBlock, withCtx, resolveDynamicComponent, withModifiers, createVNode, toDisplayString, normalizeStyle, vShow, Transition, reactive, onUpdated, cloneVNode, Text, Comment, Teleport, readonly, onDeactivated, renderList, createTextVNode, toRaw as toRaw$1, vModelCheckbox, toRefs, vModelRadio, withKeys, h as h$1, createSlots, triggerRef, resolveComponent, resolveDirective, vModelText, createApp, render } from 'vue';
+import { ref, watch, getCurrentScope, onScopeDispose, unref, getCurrentInstance, onMounted, nextTick, openBlock, createElementBlock, createElementVNode, warn, computed as computed$1, provide, inject, watchEffect, onBeforeUnmount, toRef, onUnmounted, isRef, onBeforeMount, defineComponent, mergeProps, renderSlot, useAttrs as useAttrs$1, useSlots, shallowRef, withDirectives, createCommentVNode, Fragment, normalizeClass, createBlock, withCtx, resolveDynamicComponent, withModifiers, createVNode, toDisplayString, normalizeStyle, vShow, Transition, reactive, onUpdated, cloneVNode, Text, Comment, Teleport, readonly, onDeactivated, renderList, createTextVNode, toRaw as toRaw$1, vModelCheckbox, toRefs, vModelRadio, withKeys, h as h$1, createSlots, triggerRef, resolveComponent, resolveDirective, vModelText, createApp, normalizeProps, render } from 'vue';
 import { check, base } from 'xrk-tools';
 
 var provideKey = 'defaultProps';
@@ -38888,6 +38888,8 @@ var ElTableColumn$1 = defineComponent({
         column: {},
         $index: -1
       });
+      console.log(renderDefault,'renderDefault');
+
       const children = [];
       if (Array.isArray(renderDefault)) {
         for (const childNode of renderDefault) {
@@ -38902,6 +38904,7 @@ var ElTableColumn$1 = defineComponent({
           }
         }
       }
+
       const vnode = h$1("div", children);
       return vnode;
     } catch (e) {
@@ -41335,6 +41338,7 @@ var script$2 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$2
         headerAlign: { type: String, required: false },
         className: { type: String, required: false },
         labelClassName: { type: String, required: false },
+        children: { type: Array, required: false },
         textLineClamp: { type: Number, required: false, default: 1 },
         renderHeader: { type: Function, required: false },
         formatter: { type: Function, required: false },
@@ -41556,6 +41560,7 @@ var script$2 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$2
             });
         }); };
         return function (_ctx, _cache) {
+            var _component_table_column = resolveComponent("table-column", true);
             return (openBlock(), createBlock(unref(ElTableColumn), {
                 prop: __props.prop,
                 type: __props.type,
@@ -41578,6 +41583,12 @@ var script$2 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$2
                 default: withCtx(function (_a) {
                     var row = _a.row, column = _a.column, $index = _a.$index;
                     return [
+                        createCommentVNode(" 数据结构+组件递归实现多表头，使用render会出现el-table-column解析顺序问题 "),
+                        (openBlock(true), createElementBlock(Fragment, null, renderList(__props.children, function (item) {
+                            return (openBlock(), createBlock(_component_table_column, normalizeProps(mergeProps({
+                                key: item.label
+                            }, item)), null, 16 /* FULL_PROPS */));
+                        }), 128 /* KEYED_FRAGMENT */)),
                         (__props.render)
                             ? (openBlock(), createBlock(unref(BaseTableColumnContentRender), {
                                 key: 0,

package/lib/index.umd.js

@@ -38891,6 +38891,8 @@ usage: app.provide(ID_INJECTION_KEY, {
           column: {},
           $index: -1
         });
+        console.log(renderDefault,'renderDefault');
+
         const children = [];
         if (Array.isArray(renderDefault)) {
           for (const childNode of renderDefault) {
@@ -38905,6 +38907,7 @@ usage: app.provide(ID_INJECTION_KEY, {
             }
           }
         }
+
         const vnode = vue.h("div", children);
         return vnode;
       } catch (e) {
@@ -41338,6 +41341,7 @@ usage: app.provide(ID_INJECTION_KEY, {
           headerAlign: { type: String, required: false },
           className: { type: String, required: false },
           labelClassName: { type: String, required: false },
+          children: { type: Array, required: false },
           textLineClamp: { type: Number, required: false, default: 1 },
           renderHeader: { type: Function, required: false },
           formatter: { type: Function, required: false },
@@ -41559,6 +41563,7 @@ usage: app.provide(ID_INJECTION_KEY, {
               });
           }); };
           return function (_ctx, _cache) {
+              var _component_table_column = vue.resolveComponent("table-column", true);
               return (vue.openBlock(), vue.createBlock(vue.unref(ElTableColumn), {
                   prop: __props.prop,
                   type: __props.type,
@@ -41581,6 +41586,12 @@ usage: app.provide(ID_INJECTION_KEY, {
                   default: vue.withCtx(function (_a) {
                       var row = _a.row, column = _a.column, $index = _a.$index;
                       return [
+                          vue.createCommentVNode(" 数据结构+组件递归实现多表头，使用render会出现el-table-column解析顺序问题 "),
+                          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.children, function (item) {
+                              return (vue.openBlock(), vue.createBlock(_component_table_column, vue.normalizeProps(vue.mergeProps({
+                                  key: item.label
+                              }, item)), null, 16 /* FULL_PROPS */));
+                          }), 128 /* KEYED_FRAGMENT */)),
                           (__props.render)
                               ? (vue.openBlock(), vue.createBlock(vue.unref(BaseTableColumnContentRender), {
                                   key: 0,

package/lib/packages/base/table/table-column.d.ts

@@ -73,6 +73,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         required: false;
     };
+    children: {
+        type: ArrayConstructor;
+        required: false;
+    };
     textLineClamp: {
         type: NumberConstructor;
         required: false;
@@ -215,6 +219,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         required: false;
     };
+    children: {
+        type: ArrayConstructor;
+        required: false;
+    };
     textLineClamp: {
         type: NumberConstructor;
         required: false;

package/lib/packages/base/table/types/type.d.ts

@@ -73,6 +73,7 @@ export declare type BaseTableColumnProps = {
     headerAlign?: 'left' | 'right' | 'center';
     className?: string;
     labelClassName?: string;
+    children?: Array<BaseTableColumnProps>;
     /**
      * 最多显示多少行，超出时省略号，默认 1 ； 如果使用了render配置，则失效
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xrk-components",
-  "version": "0.4.1-beta.2",
+  "version": "0.4.2-beta.1",
   "description": "",
   "main": "lib/index.esm.js",
   "typings": "lib/packages/index.d.ts",