cnhis-design-vue 3.1.22-beta.5 → 3.1.22-beta.6

package/es/components/iho-table/index2.js

@@ -2,6 +2,7 @@ import { COMPONENT_NAMESPACE } from '../../shared/global/variable2.js';
 import { safeComponentRegister } from '../../shared/utils/index2.js';
 import script from './src/IhoTable.js';
 import * as index from './src/plugins/index2.js';
+import 'vue';
 import 'lodash-es';
 import './src/constants/index2.js';
 import '../../shared/utils/tapable/SyncHook.js';

package/es/components/iho-table/src/IhoTable.js

@@ -1,9 +1,9 @@
 import { defineComponent, provide, ref, computed, resolveComponent, openBlock, createElementBlock, createVNode, mergeProps, unref, withCtx, Fragment, renderList, createBlock } from 'vue';
 import { watchDebounced } from '@vueuse/shared';
+import { isArray } from 'lodash-es';
 import { InjectionIhoTableEmits, InjectionIhoTableConfig } from './constants/index2.js';
 import { createTableHooks, applyTableEventHooks, applyTableConfigHooks, applyTableFieldHooks } from './hooks/tapHooks/index2.js';
-import 'lodash-es';
-import IhoTableColumn from './components/IhoTableColumn.js';
+import ColumnComponent from './components/IhoTableColumn.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
 const _hoisted_1 = { class: "iho-table" };
@@ -21,28 +21,43 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: emits }) {
     const props = __props;
     provide(InjectionIhoTableEmits, emits);
+    const vxeTableRef = ref();
     const hooks = createTableHooks();
     const configRef = ref({});
     provide(InjectionIhoTableConfig, configRef);
+    function updateConfigRef(config) {
+      if (!config)
+        return;
+      configRef.value = applyTableConfigHooks(hooks, config);
+    }
     const fieldListRef = ref([]);
-    const eventHookHandler = computed(() => applyTableEventHooks(hooks, configRef.value));
-    const bindProperties = computed(() => ({ ...configRef.value, ...eventHookHandler.value }));
+    function updateFieldListRef(fieldList, config) {
+      if (!isArray(fieldList) || !config)
+        return;
+      fieldListRef.value = applyTableFieldHooks(hooks, fieldList, config);
+    }
+    const eventHookHandler = applyTableEventHooks(hooks, configRef, vxeTableRef);
+    const bindProperties = computed(() => ({ ...configRef.value, ...eventHookHandler }));
     watchDebounced(() => props.tableConfig, (config) => {
-      configRef.value = applyTableConfigHooks(hooks, config || {});
+      updateConfigRef(config);
+      updateFieldListRef(props.fieldList);
     }, { immediate: true, flush: "post", deep: true, debounce: 50 });
     watchDebounced(() => props.fieldList, (fieldList) => {
-      fieldListRef.value = applyTableFieldHooks(hooks, fieldList, configRef.value || {});
+      updateFieldListRef(fieldList, configRef.value);
     }, { immediate: true, flush: "post", deep: true, debounce: 50 });
     return (_ctx, _cache) => {
       const _component_vxe_table = resolveComponent("vxe-table");
       return openBlock(), createElementBlock("section", _hoisted_1, [
-        createVNode(_component_vxe_table, mergeProps(unref(bindProperties), {
+        createVNode(_component_vxe_table, mergeProps({
+          ref_key: "vxeTableRef",
+          ref: vxeTableRef
+        }, unref(bindProperties), {
           eventHookHandler: "",
           data: __props.tableData
         }), {
           default: withCtx(() => [
             (openBlock(true), createElementBlock(Fragment, null, renderList(fieldListRef.value, (field) => {
-              return openBlock(), createBlock(unref(IhoTableColumn), {
+              return openBlock(), createBlock(unref(ColumnComponent), {
                 key: field.field,
                 field
               }, null, 8, ["field"]);