cnhis-design-vue 3.1.23-beta.0 → 3.1.23-beta.11

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/{edit-separate.vue.d.ts → editSeparate.vue.d.ts}

@@ -51,6 +51,7 @@ declare const _default: import("vue").DefineComponent<{
     tableHandler: import("../../../../../../../../es/components/iho-table").IhoTableHandler;
     popoverRef: import("vue").Ref<any>;
     editContent: import("vue").Ref<any>;
+    setEditContent: (value: any) => void;
     show: import("vue").Ref<boolean>;
     setShow: (v: boolean) => void;
     emit: (event: "update:value", ...args: any[]) => void;
@@ -59,23 +60,6 @@ declare const _default: import("vue").DefineComponent<{
     updateShow: (show: boolean) => void;
     style: import("vue").ComputedRef<CSSProperties>;
     elementRef: import("vue").Ref<any>;
-    SlotRender: import("vue").DefineComponent<{
-        renderer: {
-            type: PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../../../../../../es/shared/types").Func<any[], any>>;
-            required: true;
-        };
-        rootSlots: {
-            type: PropType<Record<string, import("../../../../../../../../es/shared/types").Func<any[], any>>>;
-        };
-    }, () => any, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-        renderer: {
-            type: PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../../../../../../es/shared/types").Func<any[], any>>;
-            required: true;
-        };
-        rootSlots: {
-            type: PropType<Record<string, import("../../../../../../../../es/shared/types").Func<any[], any>>>;
-        };
-    }>>, {}>;
     NPopover: any;
     NInput: any;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -2,10 +2,10 @@ import { reactive, inject, unref, createVNode, onBeforeUnmount } from 'vue';
 import { traverse } from '../../../../../../../shared/utils/index2.js';
 import { isFunction } from 'lodash-es';
 import '../../../../../index2.js';
-import { INPUT_TYPE, InjectionIhoTableUUID } from '../../../../constants/index2.js';
+import { EDITABLE_WIDGET_TYPE, InjectionIhoTableUUID } from '../../../../constants/index2.js';
 import { getRowHeight } from '../../../../utils/index2.js';
-import { isSeparateColumn, getColumnRenderWidth, contentSeparate, getColumnInfoMaxLength, generateSeparateRowData } from './separate-utils2.js';
-import EditSeparate from './edit-separate.js';
+import { isSeparateColumn, getColumnRenderWidth, contentSeparate, getColumnInfoMaxLength, generateSeparateRowData } from './separateUtils2.js';
+import EditSeparate from './editSeparate.js';
 import { defineTablePlugin } from '../../../../hooks/useTablePlugin2.js';
 
 function separateRendererPlugins() {
@@ -24,8 +24,8 @@ function separateRendererPlugins() {
   return defineTablePlugin({
     name: pluginName,
     vxe(instance) {
-      instance.renderer.add(INPUT_TYPE.SEPARATE, {
-        renderCell(renderOpt, {
+      instance.renderer.add(EDITABLE_WIDGET_TYPE.SEPARATE, {
+        renderCell(renderOpts, {
           column,
           row
         }) {
@@ -34,14 +34,18 @@ function separateRendererPlugins() {
           const separateRow = getSeparateRowData(unref(uuid), row);
           return createVNode("section", null, [(_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field]]);
         },
-        renderEdit(renderOpt, {
+        renderEdit(renderOpts, {
           column,
           row
         }) {
-          var _a;
+          var _a, _b;
           const uuid = inject(InjectionIhoTableUUID);
           const separateRow = getSeparateRowData(unref(uuid), row);
           const height = getRowHeight();
+          const slots = {};
+          if (isFunction((_a = renderOpts.props) == null ? void 0 : _a.separateSlot)) {
+            slots.menu = renderOpts.props.separateSlot;
+          }
           return [createVNode(EditSeparate, {
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
@@ -49,8 +53,8 @@ function separateRendererPlugins() {
             "height": height,
             "column": column,
             "row": row,
-            "displayContent": (_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field]
-          }, null)];
+            "displayContent": (_b = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _b[column.field]
+          }, slots)];
         }
       });
     },

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/{separate-utils.js → separateUtils.js}

@@ -1 +1 @@
-export { contentSeparate, generateSeparateRowData, getColumnInfoMaxLength, getColumnRenderWidth, isSeparateColumn } from './separate-utils2.js';
+export { contentSeparate, generateSeparateRowData, getColumnInfoMaxLength, getColumnRenderWidth, isSeparateColumn } from './separateUtils2.js';

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/{separate-utils2.js → separateUtils2.js}

@@ -1,7 +1,7 @@
 import { getStringWidth } from '../../../../../../../shared/utils/index2.js';
 import { isNumber, isArray, cloneDeep, isString } from 'lodash-es';
 import { nextTick, unref } from 'vue';
-import { INPUT_TYPE } from '../../../../constants/index2.js';
+import { EDITABLE_WIDGET_TYPE } from '../../../../constants/index2.js';
 
 function getColumnInfoMaxLength(parsedRowDataInfo) {
   return Math.max(...parsedRowDataInfo.map((r) => r.data.length), 1);
@@ -29,8 +29,8 @@ function generateSeparateRowData(parsedRowDataInfo, index) {
 function contentSeparate(value, field, width) {
   if (isArray(value)) {
     return value.map((row) => {
-      var _a, _b, _c;
-      return (_c = (_b = (_a = field.context) == null ? void 0 : _a.separateFormatter) == null ? void 0 : _b.call(_a, cloneDeep(row))) != null ? _c : row;
+      var _a, _b, _c, _d;
+      return (_d = (_c = (_b = (_a = field.editRender) == null ? void 0 : _a.props) == null ? void 0 : _b.separateFormatter) == null ? void 0 : _c.call(_b, cloneDeep(row))) != null ? _d : row;
     });
   }
   if (!isString(value) || !isNumber(width))
@@ -48,7 +48,7 @@ function contentSeparate(value, field, width) {
 }
 function isSeparateColumn(field) {
   var _a;
-  return field.field && ((_a = field.editRender) == null ? void 0 : _a.name) === INPUT_TYPE.SEPARATE;
+  return field.field && ((_a = field.editRender) == null ? void 0 : _a.name) === EDITABLE_WIDGET_TYPE.SEPARATE;
 }
 
 export { contentSeparate, generateSeparateRowData, getColumnInfoMaxLength, getColumnRenderWidth, isSeparateColumn };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/timeRendererPlugin/editTime.d.ts

@@ -0,0 +1,31 @@
+import { PropType } from 'vue';
+import { IhoTableFieldItem } from '../../../../../../../../es/components/iho-table';
+import { AnyObject } from '../../../../../../../../es/shared/types';
+declare const _default: import("vue").DefineComponent<{
+    column: {
+        type: PropType<IhoTableFieldItem>;
+        required: true;
+    };
+    row: {
+        type: PropType<AnyObject>;
+        required: true;
+    };
+    index: {
+        type: NumberConstructor;
+        required: true;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    column: {
+        type: PropType<IhoTableFieldItem>;
+        required: true;
+    };
+    row: {
+        type: PropType<AnyObject>;
+        required: true;
+    };
+    index: {
+        type: NumberConstructor;
+        required: true;
+    };
+}>>, {}>;
+export default _default;

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/timeRendererPlugin/editTime.js

@@ -0,0 +1,60 @@
+import { defineComponent, inject, createVNode, mergeProps } from 'vue';
+import { NTimePicker } from 'naive-ui';
+import { InjectionIhoTableEmits } from '../../../../constants/index2.js';
+import { useCommon } from '../hooks/useCommon2.js';
+
+var EditTime = defineComponent({
+  name: "EditTime",
+  inheritAttrs: false,
+  components: {
+    NTimePicker
+  },
+  props: {
+    column: {
+      type: Object,
+      required: true
+    },
+    row: {
+      type: Object,
+      required: true
+    },
+    index: {
+      type: Number,
+      required: true
+    }
+  },
+  setup(props, {
+    attrs,
+    emit
+  }) {
+    const globEmit = inject(InjectionIhoTableEmits);
+    const {
+      formRef,
+      isShow
+    } = useCommon();
+    const onUpdateValue = (value) => {
+      globEmit("formChange", {
+        value,
+        row: props.row,
+        column: props.column,
+        index: props.index
+      });
+    };
+    const timeConfig = {
+      placeholder: attrs.placeholder || "\u8BF7\u9009\u62E9",
+      valueFormat: attrs.valueFormat || "HH:mm",
+      format: attrs.valueFormat || "yyyy-MM-dd HH:mm:ss",
+      ...attrs,
+      onUpdateFormattedValue: onUpdateValue
+    };
+    return () => createVNode(NTimePicker, mergeProps({
+      "ref": formRef,
+      "show": isShow.value,
+      "onUpdate:show": ($event) => isShow.value = $event,
+      "formattedValue": props.row[props.column.field],
+      "onUpdate:formattedValue": ($event) => props.row[props.column.field] = $event
+    }, timeConfig), null);
+  }
+});
+
+export { EditTime as default };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/timeRendererPlugin/index.d.ts

@@ -0,0 +1 @@
+export declare function timeRendererPlugin(): import("../../../../../../../../es/components/iho-table").TablePlugin;

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

@@ -0,0 +1,39 @@
+import { createVNode, mergeProps } from 'vue';
+import '../../../../../index2.js';
+import { EDITABLE_WIDGET_TYPE } from '../../../../constants/index2.js';
+import EditTime from './editTime.js';
+import { defineTablePlugin } from '../../../../hooks/useTablePlugin2.js';
+
+function timeRendererPlugin() {
+  const pluginName = "timeRendererPlugin";
+  return defineTablePlugin({
+    name: pluginName,
+    vxe(instance) {
+      instance.renderer.add(EDITABLE_WIDGET_TYPE.TIME, {
+        renderCell({
+          props
+        }, {
+          row,
+          column
+        }) {
+          return [createVNode("span", null, [row[column.field]])];
+        },
+        renderEdit({
+          props
+        }, {
+          row,
+          column,
+          $rowIndex
+        }) {
+          return [createVNode(EditTime, mergeProps((props == null ? void 0 : props.componentProps) || {}, {
+            "column": column,
+            "row": row,
+            "index": $rowIndex
+          }), null)];
+        }
+      });
+    }
+  });
+}
+
+export { timeRendererPlugin };

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

@@ -4,5 +4,8 @@ export { colorRendererPlugin } from './widgets/colorRendererPlugin.js';
 export { seqRendererPlugin } from './widgets/seqRendererPlugin.js';
 export { checkRendererPlugin } from './widgets/checkRendererPlugin.js';
 export { pictureRendererPlugin } from './widgets/pictureRendererPlugin.js';
-export { inputRendererPlugins } from './editableWidgets/inputRendererPlugins.js';
+export { inputRendererPlugin } from './editableWidgets/inputRendererPlugin.js';
 export { separateRendererPlugins } from './editableWidgets/separateRendererPlugin/index.js';
+export { selectRendererPlugin } from './editableWidgets/selectRendererPlugin/index.js';
+export { dateRendererPlugin } from './editableWidgets/dateRendererPlugin/index.js';
+export { timeRendererPlugin } from './editableWidgets/timeRendererPlugin/index.js';

package/es/components/iho-table/src/plugins/rowGroupSettingPlugin/index2.js

@@ -1,7 +1,6 @@
 import { isObject } from '@vue/shared';
-import { isArray, isString } from 'lodash-es';
 import '../../../index2.js';
-import { IhoTableRowGroupSequence } from '../../constants/index2.js';
+import { groupTraverser, createRowGroupList } from './rowGroupUtils2.js';
 import { defineTablePlugin } from '../../hooks/useTablePlugin2.js';
 
 function rowGroupSettingPlugin() {
@@ -24,49 +23,5 @@ function rowGroupSettingPlugin() {
 function fieldSearcher(fieldName, fieldList) {
   return fieldList.find((field) => field.field === fieldName);
 }
-function createRowGroupList(rowGroupSetting, fieldList) {
-  const result = fieldList.map((field) => field.field);
-  IhoTableRowGroupSequence.some((sequence) => {
-    const currentLevelGroup = rowGroupSetting[sequence];
-    if (!isArray(currentLevelGroup))
-      return true;
-    currentLevelGroup.forEach((groupSetting) => {
-      if (!isArray(groupSetting.list) || !groupSetting.list.length)
-        return;
-      const children = [];
-      groupSetting.list.forEach((fieldName, idx) => {
-        const groupIdx = groupIndexSearcher(fieldName, result);
-        if (!~groupIdx)
-          return;
-        children.push(result[groupIdx]);
-        if (idx === 0) {
-          result.splice(groupIdx, 1, { fieldName: groupSetting.title, children });
-        } else {
-          result.splice(groupIdx, 1);
-        }
-      });
-    });
-  });
-  return result;
-  function groupIndexSearcher(fieldName, groupList) {
-    return groupList.findIndex((group) => (isObject(group) ? group.fieldName : group) === fieldName);
-  }
-}
-function groupTraverser(groupList, replacer) {
-  return groupList.reduce((result, group) => {
-    if (isString(group)) {
-      const item = replacer(group);
-      item && result.push(item);
-    }
-    if (isObject(group) && group.children) {
-      const item = replacer(group.fieldName, true);
-      if (item) {
-        item.children = groupTraverser(group.children, replacer);
-        result.push(item);
-      }
-    }
-    return result;
-  }, []);
-}
 
 export { rowGroupSettingPlugin };

package/es/components/iho-table/src/plugins/rowGroupSettingPlugin/rowGroupUtils.d.ts

@@ -0,0 +1,11 @@
+import { NotNull, Nullable } from '../../../../../../es/shared/types';
+import { IhoTableConfig, IhoTableFieldItem } from '../../../../../../es/components/iho-table';
+declare type GroupItem = string | {
+    fieldName: string;
+    children?: GroupItem[];
+};
+export declare function createRowGroupList(rowGroupSetting: NotNull<IhoTableConfig['rowGroupSetting']>, fieldList: IhoTableFieldItem[], getKey?: (field: IhoTableFieldItem) => string): GroupItem[];
+export declare function groupTraverser<T extends Nullable<{
+    children?: T[];
+}>>(groupList: GroupItem[], replacer: (fieldName: string, isBlock?: boolean) => T): NotNull<T>[];
+export {};

package/es/components/iho-table/src/plugins/rowGroupSettingPlugin/rowGroupUtils.js

@@ -0,0 +1 @@
+export { createRowGroupList, groupTraverser } from './rowGroupUtils2.js';

package/es/components/iho-table/src/plugins/rowGroupSettingPlugin/rowGroupUtils2.js

@@ -0,0 +1,50 @@
+import { isObject } from '@vue/shared';
+import { isArray, isString } from 'lodash-es';
+import { IhoTableRowGroupSequence } from '../../constants/index2.js';
+
+function createRowGroupList(rowGroupSetting, fieldList, getKey = (field) => field.field) {
+  const result = fieldList.map((field) => getKey(field));
+  IhoTableRowGroupSequence.some((sequence) => {
+    const currentLevelGroup = rowGroupSetting[sequence];
+    if (!isArray(currentLevelGroup))
+      return true;
+    currentLevelGroup.forEach((groupSetting) => {
+      if (!isArray(groupSetting.list) || !groupSetting.list.length)
+        return;
+      const children = [];
+      groupSetting.list.forEach((fieldName, idx) => {
+        const groupIdx = groupIndexSearcher(fieldName, result);
+        if (!~groupIdx)
+          return;
+        children.push(result[groupIdx]);
+        if (idx === 0) {
+          result.splice(groupIdx, 1, { fieldName: groupSetting.title, children });
+        } else {
+          result.splice(groupIdx, 1);
+        }
+      });
+    });
+  });
+  return result;
+  function groupIndexSearcher(fieldName, groupList) {
+    return groupList.findIndex((group) => (isObject(group) ? group.fieldName : group) === fieldName);
+  }
+}
+function groupTraverser(groupList, replacer) {
+  return groupList.reduce((result, group) => {
+    if (isString(group)) {
+      const item = replacer(group);
+      item && result.push(item);
+    }
+    if (isObject(group) && group.children) {
+      const item = replacer(group.fieldName, true);
+      if (item) {
+        item.children = groupTraverser(group.children, replacer);
+        result.push(item);
+      }
+    }
+    return result;
+  }, []);
+}
+
+export { createRowGroupList, groupTraverser };

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

@@ -21,8 +21,6 @@ export declare type IhoTableConfig = VxeTableProps & Partial<{
 }>;
 export declare type IhoTableFieldItem = {
     [K in keyof VxeTableDefines.ColumnInfo]?: K extends 'children' ? IhoTableFieldItem[] : K extends keyof VxeTableDefines.ColumnInfo ? VxeTableDefines.ColumnInfo[K] : never;
-} & {
-    context?: AnyObject;
 } & {
     [K: string]: unknown;
 };
@@ -39,7 +37,6 @@ export declare type LowCodeTableFieldItem = {
     title: string;
     colWidth: string | number;
     settingObj: LowCodeTableSettingObj;
-    context: AnyObject;
 }>;
 export declare type IhoFormChangePayload = {
     column: VxeTableDefines.ColumnInfo;