cnhis-design-vue 3.1.30-beta.6 → 3.1.30-beta.7

package/es/components/big-table/index.d.ts

@@ -1,5 +1,4 @@
 import { SFCWithInstall } from '../../../es/shared/types';
-export * from './src/hooks/export';
 declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     data: {
         type: ArrayConstructor;

package/es/components/big-table/index.js

@@ -3,7 +3,6 @@ import { safeComponentRegister } from '../../shared/utils/index.js';
 import { expandXEUtils } from '../../shared/utils/utilExpand.js';
 import '../index.js';
 import script from './src/BigTable.js';
-export { useColumnConfigAdaptor } from './src/hooks/useColumnConfigAdaptor.js';
 import Grid from '../grid/index.js';
 
 const BigTable = script;

package/es/components/iho-table/index.d.ts

@@ -1,6 +1,6 @@
 import { SFCWithInstall } from '../../../es/shared/types';
 import { IhoTableInstance } from '../../../es/components/iho-table/src/types';
-export * from './src/hooks/useTablePlugin';
+export * from './src/hooks/export';
 export * from './src/types';
 export declare const useIhoTablePresetPlugins: (instance: IhoTableInstance) => void;
 declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{

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

@@ -18,6 +18,7 @@ import '../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
 export { AbstractConfigHooks, AbstractDataHooks, AbstractDomInsertHooks, AbstractEventHooks, AbstractFieldHooks, AbstractSetupHooks } from './src/types/pluginType.js';
 import { useTablePlugin } from './src/hooks/useTablePlugin.js';
 export { defineTablePlugin, useTablePlugin } from './src/hooks/useTablePlugin.js';
+export { useColumnConfigAdaptor } from './src/hooks/useColumnConfigAdaptor.js';
 
 const { use } = useTablePlugin();
 const useIhoTablePresetPlugins = (instance) => {

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

@@ -36,13 +36,16 @@ const ColumnComponent = defineComponent({
       }, null) : null]);
     }
     function columnSlot({
-      slots
+      slots,
+      annotation
     }) {
-      return Object.assign({}, slots, {
-        header(payload) {
-          return renderHeader(payload, slots == null ? void 0 : slots.header);
-        }
-      });
+      const result = {
+        ...slots
+      };
+      if (annotation !== false) {
+        result.header = (payload) => renderHeader(payload, slots == null ? void 0 : slots.header);
+      }
+      return result;
     }
     function renderColumn(field) {
       return createVNode(VxeColumn, omit(field, ["slots"]), columnSlot(field));

package/es/components/{big-table → iho-table}/src/hooks/export.d.ts

@@ -1 +1,2 @@
+export * from './useTablePlugin';
 export * from './useColumnConfigAdaptor';

package/es/components/iho-table/src/hooks/export.js

@@ -0,0 +1,2 @@
+export { defineTablePlugin, useTablePlugin } from './useTablePlugin.js';
+export { useColumnConfigAdaptor } from './useColumnConfigAdaptor.js';

package/es/components/iho-table/src/plugins/defaultConfigPlugin/index.js

@@ -17,6 +17,7 @@ function defaultConfigPlugin() {
             columnConfig: { resizable: true },
             rowConfig: { height: 48, isHover: true, isCurrent: true, keyField: "theUniqueKey" },
             mouseConfig: { selected: true },
+            showOverflow: "tooltip",
             editConfig: {
               trigger: "click",
               mode: "cell",

package/es/components/iho-table/src/plugins/lowCodeFieldAdaptorPlugin/index.js

@@ -25,15 +25,14 @@ function lowCodeFieldAdaptorPlugin() {
   });
 }
 function settingObjAdaptor(fieldItem, lowCodeField) {
-  if (!lowCodeField.settingObj)
-    return;
+  var _a, _b;
   fieldItem.editRender = {
     autofocus: "input",
-    name: lowCodeField.settingObj.attr || "DEFAULT",
+    name: (((_a = lowCodeField.settingObj) == null ? void 0 : _a.attr) || lowCodeField.formType || "DEFAULT").toUpperCase(),
     props: cloneDeep(toRaw(lowCodeField))
   };
   fieldItem.editRender.enabled = !Reflect.get(WIDGET_TYPE, fieldItem.editRender.name);
-  fieldItem.visible = lowCodeField.settingObj.isHide !== IHO_TABLE_STRING_STATUS.POSITIVE;
+  fieldItem.visible = ((_b = lowCodeField.settingObj) == null ? void 0 : _b.isHide) !== IHO_TABLE_STRING_STATUS.POSITIVE;
 }
 
 export { lowCodeFieldAdaptorPlugin };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/index.js

@@ -1,6 +1,6 @@
-import { reactive, inject, createVNode, toRaw, onBeforeUnmount } from 'vue';
+import { reactive, inject, createVNode, toRaw, h, onBeforeUnmount } from 'vue';
 import { traverse } from '../../../../../../../shared/utils/index.js';
-import { isFunction } from 'lodash-es';
+import { isFunction, isObject } from 'lodash-es';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE, InjectionIhoTableUUID } from '../../../../constants/index.js';
 import { getRowHeight } from '../../../../utils/index.js';
@@ -29,10 +29,11 @@ function separateRendererPlugins() {
           column,
           row
         }) {
-          var _a;
           const uuid = inject(InjectionIhoTableUUID);
-          const separateRow = getSeparateRowData(uuid, row);
-          return createVNode("section", null, [(_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field]]);
+          const separateRow = getSeparateRowData(uuid, row) || {
+            separateData: {}
+          };
+          return createVNode("section", null, [separateRow.separateData[column.field]]);
         },
         renderEdit(renderOpts, {
           column,
@@ -43,8 +44,9 @@ function separateRendererPlugins() {
           const separateRow = getSeparateRowData(uuid, row);
           const height = getRowHeight();
           const slots = {};
-          if (isFunction((_a = renderOpts.props) == null ? void 0 : _a.separateSlot)) {
-            slots.menu = renderOpts.props.separateSlot;
+          if ((_a = renderOpts.props) == null ? void 0 : _a.separateSlot) {
+            const separate = toRaw(renderOpts.props.separateSlot);
+            slots.menu = isFunction(separate) ? separate : isObject(separate) ? (props) => h(separate, props) : void 0;
           }
           return [createVNode(EditSeparate, {
             "value": row[column.field],

package/es/components/iho-table/src/types/index.d.ts

@@ -1,5 +1,5 @@
 import { AnyObject, TupleToUnion } from '../../../../../es/shared/types';
-import { VxeTableProps, VxeTableDefines } from 'vxe-table';
+import { VxeTableProps, VxeTableDefines, VxeTableInstance } from 'vxe-table';
 import { VxeTableEventProps } from 'vxe-table/types/table';
 import { IhoTableEventNameTuple, IhoTableRowGroupSequence, VxeEventListenerNameList } from '../../../../../es/components/iho-table/src/constants';
 export * from './pluginType';
@@ -40,6 +40,7 @@ export declare type LowCodeTableFieldItem = {
     settingObj: LowCodeTableSettingObj;
     treeNode: boolean;
     isShow: 0 | 1;
+    formType: string;
     componentProps: AnyObject;
     showOverflow: VxeTableDefines.ColumnInfo['showOverflow'];
 }> & Partial<Pick<VxeTableDefines.ColumnInfo, 'resizable'>>;
@@ -60,3 +61,6 @@ export declare type IhoTableAnchorItem = {
     title: string;
     left: number;
 };
+export declare type IhoTableExpose = {
+    $table: VxeTableInstance;
+};

package/es/components/index.d.ts

@@ -25,10 +25,9 @@ import CSearchCascader from './search-cascader';
 export * from './form-render';
 export * from './shortcut-provider';
 export * from './shortcut-setter';
-export * from './big-table';
+export * from './iho-table';
 export * from './button-print';
 export * from './form-config';
-export * from './iho-table';
 declare function install(app: App): void;
 export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CInfoHeader, CTimeLine, CBpmnWorkflow, CStepsWheel, CEditor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter, CFormConfig, CIhoTable, CKeyboard, CSearchCascader };
 declare const _default: {

package/es/components/index.js

@@ -66,10 +66,10 @@ export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, f
 export * from '@formily/core';
 export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';
 export { useShortcutSignature } from './shortcut-provider/src/hooks/useShortcutSignature.js';
-export { useColumnConfigAdaptor } from './big-table/src/hooks/useColumnConfigAdaptor.js';
-export { Print } from './button-print/src/utils/print.js';
 export { defineTablePlugin, useTablePlugin } from './iho-table/src/hooks/useTablePlugin.js';
+export { useColumnConfigAdaptor } from './iho-table/src/hooks/useColumnConfigAdaptor.js';
 export { AbstractConfigHooks, AbstractDataHooks, AbstractDomInsertHooks, AbstractEventHooks, AbstractFieldHooks, AbstractSetupHooks } from './iho-table/src/types/pluginType.js';
+export { Print } from './button-print/src/utils/print.js';
 
 const components = {
   CGrid: Grid,

package/es/components/keyboard/src/Keyboard.js

@@ -233,7 +233,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
           createCommentVNode(" </n-popover> "),
           createElementVNode("div", {
-            class: normalizeClass(["c-keyboard-english", __props.dragable ? "isFixed" : ""]),
+            class: normalizeClass(["c-keyboard-english", { isFixed: __props.dragable }]),
             ref_key: "englishKeyboardRef",
             ref: englishKeyboardRef,
             style: normalizeStyle(unref(style))

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.30-beta.6",
+	"version": "3.1.30-beta.7",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "21fe9d52c5242a1a00ed2aa48045ef5ff1d661f1"
+	"gitHead": "4cc6424d34e20374b9f582fb0b8203b1f2842e3d"
 }

package/es/components/big-table/src/hooks/export.js

@@ -1 +0,0 @@
-export { useColumnConfigAdaptor } from './useColumnConfigAdaptor.js';