cnhis-design-vue 3.1.35-beta.9 → 3.1.35

package/es/components/big-table/src/BigTable.vue2.js

@@ -1170,7 +1170,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         } = separateDataMap.value.get(rawRow) || {};
         if (colspans) {
           const colspan = colspans[column.field];
-          column.title === "\u64CD\u4F5C" && console.log(rowIndex, colspan);
           if (colspan === 0)
             return {
               colspan: 0,

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

@@ -97,6 +97,8 @@ function useSeparateRow(getColumnConfig, spanMethod, getFieldItem, $VXETable) {
       return { colspan: 1, columnIndex: 0 };
     const columnInfo = $VXETable.value.getColumnByField(field);
     const columnIndex = $VXETable.value.getColumnIndex(columnInfo);
+    const visibleColumn = $VXETable.value.getColumns() || [];
+    const _columnIndex = visibleColumn.findIndex((column) => column.field === field);
     const { colspan = 1 } = spanMethod({
       column: columnInfo,
       row,
@@ -104,15 +106,17 @@ function useSeparateRow(getColumnConfig, spanMethod, getFieldItem, $VXETable) {
       $rowIndex: rowIndex,
       _rowIndex: rowIndex,
       columnIndex,
-      $columnIndex: columnIndex
+      $columnIndex: columnIndex,
+      _columnIndex
     }) || {};
-    return { colspan, columnIndex };
+    return { colspan, columnIndex, _columnIndex };
   }
   async function getColumnRenderWidth(column, row, rowIndex) {
     if (!isFunction(spanMethod) || !$VXETable.value)
       return { width: await getWidth(column), colspan: 1 };
-    const { colspan, columnIndex } = getColspanInfo(column.columnName, row, rowIndex);
-    const width = colspan <= 0 ? 0 : colspan === 1 ? await getWidth(column) : await $VXETable.value.getColumns().slice(columnIndex, columnIndex + colspan).reduce(async (res, columnInfo) => {
+    const { colspan, _columnIndex, columnIndex } = getColspanInfo(column.columnName, row, rowIndex);
+    const colIndex = _columnIndex != null ? _columnIndex : columnIndex;
+    const width = colspan <= 0 ? 0 : colspan === 1 ? await getWidth(column) : await $VXETable.value.getColumns().slice(colIndex, colIndex + colspan).reduce(async (res, columnInfo) => {
       return await res + await getWidth({ columnName: columnInfo.field });
     }, Promise.resolve(0));
     return { width, colspan };

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

@@ -2077,7 +2077,6 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         onActiveCellChangeEnd?: ((params: import("vxe-table").VxeTableProDefines.ActiveCellChangeEndEventParams) => void) | undefined;
         uuid?: string | undefined;
         isTree?: import("../../../es/shared/types").MaybeString<0 | 2 | 1 | 3> | undefined;
-        isSort?: import("../../../es/shared/types").MaybeString<0 | 1> | undefined;
         isBatchSelect?: import("../../../es/shared/types").MaybeString<0 | 1> | undefined;
         showSeq?: boolean | undefined;
         selectType?: "checkbox" | "radio" | null | undefined;
@@ -4468,7 +4467,6 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         params?: any;
         uuid?: string | undefined;
         isTree?: import("../../../es/shared/types").MaybeString<0 | 2 | 1 | 3> | undefined;
-        isSort?: import("../../../es/shared/types").MaybeString<0 | 1> | undefined;
         isBatchSelect?: import("../../../es/shared/types").MaybeString<0 | 1> | undefined;
         showSeq?: boolean | undefined;
         selectType?: "checkbox" | "radio" | null | undefined;

package/es/components/iho-table/src/IhoTable.vue.d.ts

@@ -2076,7 +2076,6 @@ declare const _default: import("vue").DefineComponent<{
         onActiveCellChangeEnd?: ((params: import("vxe-table").VxeTableProDefines.ActiveCellChangeEndEventParams) => void) | undefined;
         uuid?: string | undefined;
         isTree?: import("../../../../es/shared/types").MaybeString<0 | 2 | 1 | 3> | undefined;
-        isSort?: import("../../../../es/shared/types").MaybeString<0 | 1> | undefined;
         isBatchSelect?: import("../../../../es/shared/types").MaybeString<0 | 1> | undefined;
         showSeq?: boolean | undefined;
         selectType?: "checkbox" | "radio" | null | undefined;
@@ -4467,7 +4466,6 @@ declare const _default: import("vue").DefineComponent<{
         params?: any;
         uuid?: string | undefined;
         isTree?: import("../../../../es/shared/types").MaybeString<0 | 2 | 1 | 3> | undefined;
-        isSort?: import("../../../../es/shared/types").MaybeString<0 | 1> | undefined;
         isBatchSelect?: import("../../../../es/shared/types").MaybeString<0 | 1> | undefined;
         showSeq?: boolean | undefined;
         selectType?: "checkbox" | "radio" | null | undefined;

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

@@ -1,6 +1,6 @@
 import { defineComponent, resolveComponent, createVNode } from 'vue';
-import { widthAppend, arrayed } from '../../../../shared/utils/index.js';
-import { isEmpty, omit, isObject, isString, isFunction } from 'lodash-es';
+import { shallowOmit, widthAppend, arrayed } from '../../../../shared/utils/index.js';
+import { isEmpty, isObject, isString, isFunction } from 'lodash-es';
 import Annotation from '../../../annotation-edit/index.js';
 import { NEllipsis } from 'naive-ui';
 import { getLowCodeFieldFromField } from '../utils/index.js';
@@ -54,10 +54,10 @@ const ColumnComponent = defineComponent({
       return result;
     }
     function renderColumn(field) {
-      return createVNode(VxeColumn, omit(field, ["slots"]), columnSlot(field));
+      return createVNode(VxeColumn, shallowOmit(field, ["slots"]), columnSlot(field));
     }
     function renderColumnGroup(group, children) {
-      return createVNode(VxeColumnGroup, omit(group, ["children"]), {
+      return createVNode(VxeColumnGroup, shallowOmit(group, ["children"]), {
         default: () => children.map((child) => createVNode(ColumnComponent, {
           "field": child,
           "annotation": props.annotation

package/es/components/iho-table/src/plugins/anchorPlugin/useAnchor.js

@@ -1,16 +1,15 @@
+import { shallowOmit } from '../../../../../shared/utils/index.js';
 import { ref, watch, unref } from 'vue';
 import { useThrottleFn } from '@vueuse/core';
-import { cloneDeep, omit } from 'lodash-es';
+import { cloneDeep } from 'lodash-es';
 
 function flatFieldList(fieldList, _flatFieldList) {
   fieldList.forEach((field) => {
     var _a;
     if ((_a = field.children) == null ? void 0 : _a.length) {
-      const temp = cloneDeep(field);
-      _flatFieldList.push({
-        ...omit(temp, "children"),
-        width: 0
-      });
+      const temp = shallowOmit(cloneDeep(field), ["children"]);
+      temp.width = 0;
+      _flatFieldList.push(temp);
       flatFieldList(field.children, _flatFieldList);
     } else {
       isVisible(field) && _flatFieldList.push(field);

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

@@ -1,4 +1,4 @@
-import { pick, isFunction, cloneDeep, isObject } from 'lodash-es';
+import { isFunction, cloneDeep, isObject } from 'lodash-es';
 import { toRaw, h } from 'vue';
 import { HIGHEST_PRIORITY, IHO_TABLE_FIXED_STATUS, WIDGET_TYPE } from '../../constants/index.js';
 import { defineTablePlugin } from '../../hooks/useTablePlugin.js';
@@ -15,13 +15,13 @@ function lowCodeFieldAdaptorPlugin() {
         const result = {
           className: _field.bold ? "iho-table__boldCell" : "",
           field: _field.columnName,
-          showOverflow: Reflect.has(_field, "showOverflow") ? _field.showOverflow : "tooltip",
+          showOverflow: "tooltip",
           visible: IhoTableStatusHelper.notNegative(_field.isShow),
           minWidth: _field.colWidth,
           sortable: IhoTableStatusHelper.isPositive(_field.isSort),
-          title: _field.alias || _field.title,
           fixed: IHO_TABLE_FIXED_STATUS[_field.isFixed],
-          ...pick(_field, ["treeNode", "resizable"])
+          ..._field,
+          title: _field.alias || _field.title
         };
         slotsAdaptor(result, _field);
         settingObjAdaptor(result, _field, config);
@@ -32,16 +32,18 @@ function lowCodeFieldAdaptorPlugin() {
 }
 function slotsAdaptor(fieldItem, lowCodeField) {
   const slots = {
-    ...lowCodeField.slots,
     default: lowCodeField.slotFn,
-    header: lowCodeField.headerSlotFn
+    header: lowCodeField.headerSlotFn,
+    edit: lowCodeField.editSlotFn,
+    ...lowCodeField.slots
   };
   if (isFunction(lowCodeField.checkEditStatus)) {
     const { default: defaultSlot } = slots;
     if (isFunction(defaultSlot)) {
       slots.default = (payload) => {
-        if (!lowCodeField.checkEditStatus(payload))
+        if (!lowCodeField.checkEditStatus(payload)) {
           return [h("span", null, getDefaultValue(payload.row, payload.column.editRender.props))];
+        }
         return defaultSlot(payload);
       };
     }
@@ -53,7 +55,6 @@ function settingObjAdaptor(fieldItem, lowCodeField, config) {
   const props = cloneDeep(toRaw(lowCodeField));
   props.componentProps = {
     size: config.size === "mini" ? "small" : config.size,
-    options: lowCodeField.options,
     ...props.componentProps
   };
   fieldItem.editRender = {

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

@@ -43,7 +43,9 @@ function selectRendererPlugin() {
           column,
           $rowIndex
         }) => {
-          return [createVNode(EditSelect, mergeProps(fieldItem.componentProps, {
+          return [createVNode(EditSelect, mergeProps({
+            "options": fieldItem.options
+          }, fieldItem.componentProps, {
             "column": column,
             "row": row,
             "row-index": $rowIndex,

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/selectUtils.js

@@ -9,7 +9,7 @@ function getDefaultValue(row, item) {
       var _a2;
       return ((_a2 = options == null ? void 0 : options.find((v) => v.value == value2)) == null ? void 0 : _a2.label) || value2 || "";
     };
-    return findValue(((_a = item.componentProps) == null ? void 0 : _a.options) || []);
+    return findValue(((_a = item.componentProps) == null ? void 0 : _a.options) || item.options || []);
   }
 }
 

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

@@ -14,7 +14,6 @@ export declare type IhoTableConfig = VxeTableProps & Partial<{
 }> & Partial<{
     uuid: string;
     isTree: MaybeString<0 | 1 | 2 | 3>;
-    isSort: MaybeString<0 | 1>;
     isBatchSelect: MaybeString<0 | 1>;
     showSeq: boolean;
     selectType: Exclude<VxeTableDefines.ColumnInfo['type'], 'seq' | 'expand' | 'html'>;
@@ -53,7 +52,6 @@ export declare type LowCodeTableFieldItem = {
     [K: string]: unknown;
 } & Partial<{
     id: number | string;
-    title: string;
     alias: string;
     isFixed: 0 | 1 | 2;
     colWidth: VxeTableDefines.ColumnInfo['width'];
@@ -64,18 +62,21 @@ export declare type LowCodeTableFieldItem = {
     formType: string;
     fieldSetting: string;
     componentProps: AnyObject;
-    showOverflow: VxeTableDefines.ColumnInfo['showOverflow'];
     options: AnyObject[];
     annotation: boolean;
-    slots: IhoTableFieldItem['slots'];
     slotFn: NonNullable<IhoTableFieldItem['slots']>['default'];
     headerSlotFn: NonNullable<IhoTableFieldItem['slots']>['header'];
+    editSlotFn: NonNullable<IhoTableFieldItem['slots']>['edit'];
     filterDefaultValue: Partial<{
         checked: string[];
         sortStatus: null | 'asc' | 'desc';
     }>;
+    /**
+     * 即将被废弃，请使用表格外层的beforeEditMethod属性
+     * @deprecated
+     */
     checkEditStatus: (payload: VxeTableDefines.CellRenderBodyParams) => boolean | void;
-}> & Partial<Pick<VxeTableDefines.ColumnInfo, 'resizable'>>;
+}> & Partial<VxeTableDefines.ColumnInfo>;
 export declare type IhoTableFormChangePayload = {
     column: IhoTableFieldItem;
     row: AnyObject;

package/es/components/info-header/index.d.ts

@@ -10,6 +10,8 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     };
     patientInfo: {
         type: import("vue").PropType<Partial<{
+            avatar: string;
+            avatarProps: string;
             name: string;
             sex: string;
             age: string;
@@ -66,6 +68,8 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         };
         patientInfo: {
             type: import("vue").PropType<Partial<{
+                avatar: string;
+                avatarProps: string;
                 name: string;
                 sex: string;
                 age: string;
@@ -185,6 +189,7 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     }>;
     NTag: any;
     NScrollbar: any;
+    NImage: any;
     SlotRender: import("vue").DefineComponent<{
         renderer: {
             type: import("vue").PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../es/shared/types").Func<any[], any>>;
@@ -328,6 +333,8 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     };
     patientInfo: {
         type: import("vue").PropType<Partial<{
+            avatar: string;
+            avatarProps: string;
             name: string;
             sex: string;
             age: string;
@@ -379,6 +386,8 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
 }, {
     separator: string;
     patientInfo: Partial<{
+        avatar: string;
+        avatarProps: string;
         name: string;
         sex: string;
         age: string;

package/es/components/info-header/src/InfoHeader.vue.d.ts

@@ -19,6 +19,8 @@ declare const _default: import("vue").DefineComponent<{
     };
     patientInfo: {
         type: PropType<Partial<{
+            avatar: string;
+            avatarProps: string;
             name: string;
             sex: string;
             age: string;
@@ -73,6 +75,8 @@ declare const _default: import("vue").DefineComponent<{
         };
         patientInfo: {
             type: PropType<Partial<{
+                avatar: string;
+                avatarProps: string;
                 name: string;
                 sex: string;
                 age: string;
@@ -179,6 +183,7 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     NTag: any;
     NScrollbar: any;
+    NImage: any;
     SlotRender: import("vue").DefineComponent<{
         renderer: {
             type: PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | Func<any[], any>>;
@@ -322,6 +327,8 @@ declare const _default: import("vue").DefineComponent<{
     };
     patientInfo: {
         type: PropType<Partial<{
+            avatar: string;
+            avatarProps: string;
             name: string;
             sex: string;
             age: string;
@@ -371,6 +378,8 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     separator: string;
     patientInfo: Partial<{
+        avatar: string;
+        avatarProps: string;
         name: string;
         sex: string;
         age: string;

package/es/components/info-header/src/InfoHeader.vue.js

@@ -1,6 +1,6 @@
-import { defineComponent, computed, ref, nextTick, onMounted, watch, onBeforeUnmount, onDeactivated, onActivated, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createCommentVNode, Fragment, toDisplayString, renderList, withDirectives, createBlock, unref, mergeProps, withCtx, createTextVNode, vShow, createVNode, resolveDynamicComponent, h } from 'vue';
+import { defineComponent, computed, ref, nextTick, onMounted, watch, onBeforeUnmount, onDeactivated, onActivated, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createCommentVNode, Fragment, createVNode, unref, mergeProps, toDisplayString, renderList, withDirectives, createBlock, withCtx, createTextVNode, vShow, resolveDynamicComponent, h } from 'vue';
 import { isString } from 'lodash-es';
-import { NTag, NScrollbar, NDescriptions, NDescriptionsItem } from 'naive-ui';
+import { NImage, NTag, NScrollbar, NDescriptions, NDescriptionsItem } from 'naive-ui';
 import { useThrottleFn, useEventListener } from '@vueuse/core';
 import script$1 from '../../../shared/components/SlotRender/SlotRender.js';
 import InfoEllipsis from './InfoEllipsis.vue.js';
@@ -164,32 +164,39 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         _ctx.$slots.operation ? (openBlock(), createElementBlock("div", _hoisted_2)) : createCommentVNode("v-if", true),
         createElementVNode("section", _hoisted_3, [
           renderSlot(_ctx.$slots, "patientModule"),
-          !_ctx.$slots.avatarModule ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-            renderSlot(_ctx.$slots, "avatar"),
-            createElementVNode("section", null, [
-              createElementVNode("header", _hoisted_4, [
-                __props.patientInfo.name ? (openBlock(), createElementBlock("div", _hoisted_5, toDisplayString(__props.patientInfo.name), 1)) : createCommentVNode("v-if", true),
-                __props.patientInfo.sex ? (openBlock(), createElementBlock("div", _hoisted_6, "/ " + toDisplayString(__props.patientInfo.sex), 1)) : createCommentVNode("v-if", true),
-                __props.patientInfo.age ? (openBlock(), createElementBlock("div", _hoisted_7, " / " + toDisplayString(__props.patientInfo.age) + toDisplayString(__props.patientInfo.ageUnit || "\u5C81"), 1)) : createCommentVNode("v-if", true),
-                (openBlock(true), createElementBlock(Fragment, null, renderList(__props.patientInfo.tagList || [], (tag) => {
-                  return withDirectives((openBlock(), createBlock(unref(NTag), mergeProps({
-                    key: tag.content,
-                    size: "medium",
-                    bordered: false,
-                    color: getTagColor(tag)
-                  }, tag), {
-                    default: withCtx(() => [
-                      createTextVNode(toDisplayString(tag.content), 1)
-                    ]),
-                    _: 2
-                  }, 1040, ["color"])), [
-                    [vShow, tag.content]
-                  ]);
-                }), 128))
+          renderSlot(_ctx.$slots, "avatarModule", {}, () => [
+            !_ctx.$slots.avatarModule ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+              renderSlot(_ctx.$slots, "avatar", {}, () => [
+                createVNode(unref(NImage), mergeProps({
+                  style: { "border-radius": "50%", "width": "40px", "height": "40px" },
+                  src: __props.patientInfo.avatar
+                }, __props.patientInfo.avatarProps), null, 16, ["src"])
               ]),
-              renderSlot(_ctx.$slots, "avatarInfo")
-            ])
-          ], 64)) : createCommentVNode("v-if", true)
+              createElementVNode("section", null, [
+                createElementVNode("header", _hoisted_4, [
+                  __props.patientInfo.name ? (openBlock(), createElementBlock("div", _hoisted_5, toDisplayString(__props.patientInfo.name), 1)) : createCommentVNode("v-if", true),
+                  __props.patientInfo.sex ? (openBlock(), createElementBlock("div", _hoisted_6, "/ " + toDisplayString(__props.patientInfo.sex), 1)) : createCommentVNode("v-if", true),
+                  __props.patientInfo.age ? (openBlock(), createElementBlock("div", _hoisted_7, " / " + toDisplayString(__props.patientInfo.age) + toDisplayString(__props.patientInfo.ageUnit || "\u5C81"), 1)) : createCommentVNode("v-if", true),
+                  (openBlock(true), createElementBlock(Fragment, null, renderList(__props.patientInfo.tagList || [], (tag) => {
+                    return withDirectives((openBlock(), createBlock(unref(NTag), mergeProps({
+                      key: tag.content,
+                      size: "medium",
+                      bordered: false,
+                      color: getTagColor(tag)
+                    }, tag), {
+                      default: withCtx(() => [
+                        createTextVNode(toDisplayString(tag.content), 1)
+                      ]),
+                      _: 2
+                    }, 1040, ["color"])), [
+                      [vShow, tag.content]
+                    ]);
+                  }), 128))
+                ]),
+                renderSlot(_ctx.$slots, "avatarInfo")
+              ])
+            ], 64)) : createCommentVNode("v-if", true)
+          ])
         ]),
         createElementVNode("section", {
           class: "c-info-header__info",

package/es/shared/utils/index.d.ts

@@ -13,3 +13,4 @@ export declare function findAncestor(ele: HTMLElement | null, finder: (ele: HTML
 export declare function widthAppend(value: string | number, append?: string): string;
 export declare function targetStringIncludes(arr: string[], target: string): boolean;
 export declare const jsonParse: import("@vueuse/core").UseMemoizedFn<any, [value: string]>;
+export declare function shallowOmit<T, K extends Array<keyof T>>(target: T, keys: K): Omit<T, K[number]>;

package/es/shared/utils/index.js

@@ -149,5 +149,14 @@ const jsonParse = useMemoize(
   },
   { getKey: (value) => value }
 );
+function shallowOmit(target, keys) {
+  if (!isObject(target))
+    return target;
+  const result = { ...target };
+  for (let i = 0; i < keys.length; i++) {
+    Reflect.deleteProperty(result, keys[i]);
+  }
+  return result;
+}
 
-export { DMZ, arrayed, deepOmit, findAncestor, generateTimeFormat, getStringWidth, jsonParse, safeComponentRegister, separateMetaModule, targetStringIncludes, traverse, uuidGenerator, widthAppend };
+export { DMZ, arrayed, deepOmit, findAncestor, generateTimeFormat, getStringWidth, jsonParse, safeComponentRegister, separateMetaModule, shallowOmit, targetStringIncludes, traverse, uuidGenerator, widthAppend };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.35-beta.9",
+	"version": "3.1.35",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "8d267f616faf3d29f286ee547128485422475433"
+	"gitHead": "aaa5ebb047af4fcf32f1a2947f360b1d9015b8e4"
 }