cnhis-design-vue 3.1.17-beta.5 → 3.1.17-beta.8

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

@@ -2845,15 +2845,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         row: any;
         rowIndex: any;
     };
-    initEditTable: () => Promise<void>;
-    activeMethod: ({ row, rowIndex, column, columnIndex }: {
-        row: any;
-        rowIndex: number;
-        column: any;
-        columnIndex: number;
-    }) => boolean;
     deleteRow: (row: any, col: any, index: number) => void;
-    onClickSelectTable: (row: any) => Promise<void>;
     onFormChange: ({ value, row, column, index }: {
         value: string | number | null;
         row: any;
@@ -2941,6 +2933,12 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         } | null;
         showOverflow: boolean;
     })[];
+    getRowData: (row: import("../../../es/src/types").AnyObject) => {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: import("../../../es/src/types").AnyObject;
+        row: import("../../../es/src/types").AnyObject;
+    } | undefined;
     formatterEdit: (params: any, col: any) => any;
     getEditBtn: (row: any, col: any, index: any) => any;
     formatter: (params: any, col: any, _isEdit: any) => any;

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1126,12 +1126,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostHoverWarning: string;
                 textColorGhostPressedWarning: string;
                 textColorGhostFocusWarning: string;
-                textColorGhostDisabledWarning: string; /**
-                 * 判断是否渲染EditForm
-                 * @param {*} row
-                 * @param {*} column
-                 * @returns
-                 */
+                textColorGhostDisabledWarning: string;
                 borderWarning: string;
                 borderHoverWarning: string;
                 borderPressedWarning: string;
@@ -1252,7 +1247,9 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextHoverPrimary: string;
                 textColorTextPressedPrimary: string;
                 textColorTextFocusPrimary: string;
-                textColorTextDisabledPrimary: string;
+                textColorTextDisabledPrimary: string; /**
+                 * tsx渲染表格
+                 */
                 textColorGhostPrimary: string;
                 textColorGhostHoverPrimary: string;
                 textColorGhostPressedPrimary: string;
@@ -1331,6 +1328,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextPressedWarning: string;
                 textColorTextFocusWarning: string;
                 textColorTextDisabledWarning: string;
+                /** string */
                 textColorGhostWarning: string;
                 textColorGhostHoverWarning: string;
                 textColorGhostPressedWarning: string;
@@ -2849,15 +2847,7 @@ declare const _default: import("vue").DefineComponent<{
         row: any;
         rowIndex: any;
     };
-    initEditTable: () => Promise<void>;
-    activeMethod: ({ row, rowIndex, column, columnIndex }: {
-        row: any;
-        rowIndex: number;
-        column: any;
-        columnIndex: number;
-    }) => boolean;
     deleteRow: (row: any, col: any, index: number) => void;
-    onClickSelectTable: (row: any) => Promise<void>;
     onFormChange: ({ value, row, column, index }: {
         value: string | number | null;
         row: any;
@@ -2945,6 +2935,12 @@ declare const _default: import("vue").DefineComponent<{
         } | null;
         showOverflow: boolean;
     })[];
+    getRowData: (row: import("../../../src/types").AnyObject) => {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: import("../../../src/types").AnyObject;
+        row: import("../../../src/types").AnyObject;
+    } | undefined;
     formatterEdit: (params: any, col: any) => any;
     getEditBtn: (row: any, col: any, index: any) => any;
     formatter: (params: any, col: any, _isEdit: any) => any;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -19,7 +19,7 @@ import { useBatchEditing } from './hooks/useBatchEditing.js';
 import { useNestTable } from './hooks/useNestTable.js';
 import { useAnchor } from './hooks/useAnchor.js';
 import { useEvent } from './hooks/useEvent.js';
-import { useSeparateRow } from './hooks/useSeparateRow.js';
+import { useSeparateRow, useSeparateMap } from './hooks/useSeparateRow.js';
 import { useFormat } from './hooks/useFormat.js';
 import { useTableParse } from './hooks/useTableParse.js';
 import { useEdit, comps } from './hooks/useEdit.js';
@@ -82,10 +82,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       getInlineOpreateRow
     } = useBatchEditing(props, state, emit, xGrid);
     const {
-      initEditTable,
-      activeMethod,
       deleteRow,
-      onClickSelectTable,
       onFormChange,
       getDefaultValue
     } = useEdit(props, state, emit, xGrid);
@@ -506,7 +503,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.columnLen = currentColumns.filter((item) => item.visible).length;
       return columns;
     };
+    const {
+      getRowData
+    } = useSeparateMap();
     const formatterEdit = (params, col) => {
+      var _a, _b;
       let {
         row,
         column,
@@ -526,7 +527,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       const propsData = {
         col,
         row,
-        index: $rowIndex,
+        index: (_b = (_a = getRowData(row)) == null ? void 0 : _a.index) != null ? _b : $rowIndex,
         type: formType,
         ...col.componentProps || {},
         onFormChange,
@@ -537,7 +538,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             column: col,
             index: $rowIndex
           });
-        }
+        },
+        editTrigger: state.editConfig.trigger
       };
       if (formType === "date" || formType === "time") {
         propsData.formattedValue = row[col.columnName];

package/es/packages/big-table/src/components/edit-form/edit-date.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, createVNode, mergeProps } from 'vue';
+import { defineComponent, ref, computed, onMounted, createVNode, mergeProps } from 'vue';
 import { generateTimeFormat } from '../../../../../src/utils';
 import { isFunction } from 'lodash-es';
 import { NDatePicker } from 'naive-ui';
@@ -28,6 +28,8 @@ var EditDate = defineComponent({
     attrs,
     emit
   }) {
+    const dateRef = ref(null);
+    const isShow = ref(false);
     const onConfirm = (value) => {
       emit("formChange", {
         value,
@@ -124,7 +126,18 @@ var EditDate = defineComponent({
     if (config.type.includes("time")) {
       config.isTimeDisabled = customDateDisabledDecorator(props.col.isTimeDisabled) || isTimeDisabled;
     }
-    return () => createVNode(NDatePicker, mergeProps(attrs, config, {
+    onMounted(() => {
+      var _a;
+      if (attrs.editTrigger !== "manual") {
+        (_a = dateRef.value) == null ? void 0 : _a.focus();
+        isShow.value = true;
+      }
+    });
+    return () => createVNode(NDatePicker, mergeProps({
+      "ref": dateRef,
+      "show": isShow.value,
+      "onUpdate:show": ($event) => isShow.value = $event
+    }, attrs, config, {
       "onUpdateFormattedValue": onConfirm
     }), null);
   }

package/es/packages/big-table/src/components/edit-form/edit-input.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, createVNode, mergeProps } from 'vue';
+import { defineComponent, ref, onMounted, createVNode, mergeProps } from 'vue';
 import { NInput, NInputNumber } from 'naive-ui';
 
 var EditInput = defineComponent({
@@ -32,6 +32,7 @@ var EditInput = defineComponent({
     emit
   }) {
     const __value = ref(attrs.value);
+    const inputRef = ref(null);
     const onUpdateValue = (value) => {
       emit("formChange", {
         value,
@@ -52,11 +53,21 @@ var EditInput = defineComponent({
       placeholder: props.col.placeholder || "\u8BF7\u8F93\u5165",
       ...props.col.componentProps || {}
     };
-    return () => props.type === "input" ? createVNode(NInput, mergeProps(attrs, config, {
+    onMounted(() => {
+      var _a;
+      if (attrs.editTrigger !== "manual") {
+        (_a = inputRef.value) == null ? void 0 : _a.focus();
+      }
+    });
+    return () => props.type === "input" ? createVNode(NInput, mergeProps({
+      "ref": inputRef
+    }, attrs, config, {
       "value": __value.value,
       "onUpdate:value": ($event) => __value.value = $event,
       "onBlur": onBlur
-    }), null) : createVNode(NInputNumber, mergeProps(attrs, config, {
+    }), null) : createVNode(NInputNumber, mergeProps({
+      "ref": inputRef
+    }, attrs, config, {
       "onUpdateValue": onUpdateValue
     }), null);
   }

package/es/packages/big-table/src/components/edit-form/edit-select.d.ts

@@ -11,7 +11,7 @@ declare const _default: import("vue").DefineComponent<{
         type: (NumberConstructor | ObjectConstructor)[];
         default: number;
     };
-}, () => JSX.Element[], unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("formChange" | "setOptions")[], "formChange" | "setOptions", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("formChange" | "setOptions")[], "formChange" | "setOptions", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     col: {
         type: ObjectConstructor;
         default: () => {};

package/es/packages/big-table/src/components/edit-form/edit-select.js

@@ -1,4 +1,4 @@
-import { defineComponent, reactive, createVNode, mergeProps } from 'vue';
+import { defineComponent, ref, reactive, onMounted, createVNode, mergeProps } from 'vue';
 import { NSelect } from 'naive-ui';
 import vexutils from '../../../../../src/utils/vexutils';
 
@@ -28,6 +28,8 @@ var EditSelect = defineComponent({
     slots,
     emit
   }) {
+    const selectRef = ref(null);
+    const isShow = ref(false);
     const state = reactive({
       options: [],
       loading: false,
@@ -77,7 +79,16 @@ var EditSelect = defineComponent({
       }
     };
     init();
-    return () => [createVNode(NSelect, mergeProps(attrs, state.config, {
+    onMounted(() => {
+      var _a;
+      (_a = selectRef.value) == null ? void 0 : _a.focus();
+      isShow.value = true;
+    });
+    return () => createVNode(NSelect, mergeProps({
+      "ref": selectRef,
+      "show": isShow.value,
+      "onUpdate:show": ($event) => isShow.value = $event
+    }, attrs, state.config, {
       "options": state.options,
       "consistentMenuWidth": false,
       "clearable": true,
@@ -85,7 +96,7 @@ var EditSelect = defineComponent({
       "placeholder": props.col.placeholder || "\u8BF7\u9009\u62E9",
       "loading": state.loading,
       "onUpdateValue": onUpdateValue
-    }), null)];
+    }), null);
   }
 });
 

package/es/packages/big-table/src/components/edit-form/edit-separate.js

@@ -24,32 +24,33 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     watch(show, updateShow);
     const editContent = ref();
     const { getRowData } = useSeparateMap();
-    async function updateShow(show2) {
+    async function onShow(target) {
       var _a;
-      const target = getRowData(props.row);
       if (!target)
         return;
-      if (show2) {
-        editContent.value = cloneDeep(target.row[props.col.field]);
-        await new Promise((resolve) => setTimeout(resolve));
-        (_a = popoverRef.value) == null ? void 0 : _a.syncPosition();
-        return;
-      }
-      const old = target.row[props.col.field];
+      editContent.value = cloneDeep(target.row[props.col.field]);
+      await new Promise((resolve) => setTimeout(resolve));
+      (_a = popoverRef.value) == null ? void 0 : _a.syncPosition();
+      return;
+    }
+    async function onClose(target) {
       if (!target)
         return;
+      const old = target.row[props.col.field];
       if (!isObject(editContent.value) && !isArray(editContent.value)) {
         if (old === editContent.value)
           return;
       }
-      target.rawRow[props.col.field] = editContent.value;
       emit("formChange", {
         value: editContent.value,
-        row: target.row,
+        row: props.row,
         column: props.col,
         index: target.index
       });
     }
+    function updateShow(show2) {
+      show2 ? onShow(getRowData(props.row)) : onClose(getRowData(props.row));
+    }
     const style = {
       border: "1px solid #f5f5f5",
       padding: "4px 0 4px 4px",

package/es/packages/big-table/src/components/edit-form/edit-separate.vue.d.ts

@@ -41,7 +41,19 @@ declare const _default: import("vue").DefineComponent<{
         rawRow: AnyObject;
         row: AnyObject;
     } | undefined;
-    updateShow: (show: boolean) => Promise<void>;
+    onShow: (target: {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: AnyObject;
+        row: AnyObject;
+    } | undefined) => Promise<void>;
+    onClose: (target: {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: AnyObject;
+        row: AnyObject;
+    } | undefined) => Promise<void>;
+    updateShow: (show: boolean) => void;
     style: CSSProperties;
     SlotRender: import("vue").DefineComponent<{
         renderer: {

package/es/packages/big-table/src/components/edit-form/edit-time.js

@@ -1,4 +1,4 @@
-import { defineComponent, createVNode, mergeProps } from 'vue';
+import { defineComponent, ref, onMounted, createVNode, mergeProps } from 'vue';
 import { NTimePicker } from 'naive-ui';
 
 var editTime = defineComponent({
@@ -30,6 +30,8 @@ var editTime = defineComponent({
     attrs,
     emit
   }) {
+    const timeRef = ref(null);
+    const isShow = ref(false);
     const onUpdateValue = (value) => {
       emit("formChange", {
         value,
@@ -44,7 +46,18 @@ var editTime = defineComponent({
       format: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
       ...props.col.componentProps || {}
     };
-    return () => createVNode(NTimePicker, mergeProps(attrs, config, {
+    onMounted(() => {
+      var _a;
+      if (attrs.editTrigger !== "manual") {
+        (_a = timeRef.value) == null ? void 0 : _a.focus();
+        isShow.value = true;
+      }
+    });
+    return () => createVNode(NTimePicker, mergeProps({
+      "ref": timeRef,
+      "show": isShow.value,
+      "onUpdate:show": ($event) => isShow.value = $event
+    }, attrs, config, {
       "onUpdateFormattedValue": onUpdateValue
     }), null);
   }

package/es/packages/big-table/src/hooks/useEdit.d.ts

@@ -96,7 +96,7 @@ export declare const comps: {
             type: (NumberConstructor | ObjectConstructor)[];
             default: number;
         };
-    }, () => JSX.Element[], unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("formChange" | "setOptions")[], "formChange" | "setOptions", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("formChange" | "setOptions")[], "formChange" | "setOptions", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         col: {
             type: ObjectConstructor;
             default: () => {};
@@ -233,7 +233,19 @@ export declare const comps: {
             rawRow: import("../../../../src/types").AnyObject;
             row: import("../../../../src/types").AnyObject;
         } | undefined;
-        updateShow: (show: boolean) => Promise<void>;
+        onShow: (target: {
+            separateData: Record<string, string>;
+            index: number;
+            rawRow: import("../../../../src/types").AnyObject;
+            row: import("../../../../src/types").AnyObject;
+        } | undefined) => Promise<void>;
+        onClose: (target: {
+            separateData: Record<string, string>;
+            index: number;
+            rawRow: import("../../../../src/types").AnyObject;
+            row: import("../../../../src/types").AnyObject;
+        } | undefined) => Promise<void>;
+        updateShow: (show: boolean) => void;
         style: import("vue").CSSProperties;
         SlotRender: import("vue").DefineComponent<{
             renderer: {
@@ -1458,12 +1470,6 @@ export declare const comps: {
 };
 export declare const useEdit: (props: any, state: any, emit: any, xGrid: any) => {
     initEditTable: () => Promise<void>;
-    activeMethod: ({ row, rowIndex, column, columnIndex }: {
-        row: any;
-        rowIndex: number;
-        column: any;
-        columnIndex: number;
-    }) => boolean;
     deleteRow: (row: any, col: any, index: number) => void;
     onClickSelectTable: (row: any) => Promise<void>;
     onFormChange: ({ value, row, column, index }: {

package/es/packages/big-table/src/hooks/useEdit.js

@@ -34,25 +34,6 @@ const useEdit = (props, state, emit, xGrid) => {
     xGrid.value.remove(row);
     emit("clickBtn", { row, column: col, index });
   };
-  const activeMethod = ({
-    row,
-    rowIndex,
-    column,
-    columnIndex
-  }) => {
-    var _a;
-    const { isEdit, fieldList } = props.columnConfig;
-    if (isEdit) {
-      const isEditCol = ((_a = fieldList.find((v) => v.columnName === column.field)) == null ? void 0 : _a.isEdit) || false;
-      if (isEditCol) {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  };
   const onClickSelectTable = async (row) => {
     emit("clickSelectTable", { row });
     const record = {
@@ -131,7 +112,6 @@ const useEdit = (props, state, emit, xGrid) => {
   };
   return {
     initEditTable,
-    activeMethod,
     deleteRow,
     onClickSelectTable,
     onFormChange,

package/es/packages/big-table/style/index.css

@@ -538,6 +538,12 @@ body > .vxe-table--tooltip-wrapper {
   margin-right: 6px;
   box-shadow: 0px 2px 4px 0px rgba(99, 129, 249, 0.5);
 }
+.custom-big-table .vxe-table--render-default .vxe-table--fixed-left-wrapper.scrolling--middle {
+  box-shadow: 4px 0 4px 0 rgba(0, 0, 0, 0.12);
+}
+.custom-big-table .vxe-table--render-default .vxe-table--fixed-right-wrapper.scrolling--middle {
+  box-shadow: -4px 0 4px 0 rgba(0, 0, 0, 0.12);
+}
 .annotation-edit {
   cursor: pointer;
   color: #0067ee;

package/es/packages/fabric-chart/src/hooks/useLeft.js

@@ -22,9 +22,10 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   const mainScaleWidth = 9;
   const subScaleWidth = 5;
   function drawScaleNumber(text, item, left2, top) {
+    const { position } = item;
     return new fabric.Text(String(text), {
       ...defaultTextStyle,
-      originX: item.position || "center",
+      originX: position == "left" ? "right" : position == "right" ? "left" : "center",
       left: left2,
       top,
       ...item.style
@@ -35,13 +36,13 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     let lineXMain = [scaleLeft - mainScaleWidth / 2, scaleLeft + mainScaleWidth / 2];
     let lineXSub = [scaleLeft - subScaleWidth / 2, scaleLeft + subScaleWidth / 2];
     let textLeft = scaleLeft;
-    if (position === "left") {
+    if (position === "right") {
       scaleLeft = x;
       lineXMain = [scaleLeft, scaleLeft + mainScaleWidth];
       lineXSub = [scaleLeft, scaleLeft + subScaleWidth];
       textLeft = lineXMain[1];
     }
-    if (position === "right") {
+    if (position === "left") {
       scaleLeft = x + width;
       lineXMain = [scaleLeft - mainScaleWidth, scaleLeft];
       lineXSub = [scaleLeft - subScaleWidth, scaleLeft];

package/es/packages/field-set/index.d.ts

@@ -4,14 +4,6 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<any[]>;
         default: () => never[];
     };
-    menuSource: {
-        type: StringConstructor;
-        default: string;
-    };
-    drawerDirection: {
-        type: StringConstructor;
-        default: string;
-    };
     footerFlag: {
         type: BooleanConstructor;
         default: boolean;
@@ -20,6 +12,10 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    isEdit: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     fieldsMapping: Record<string, string>;
     selectOptions: Record<string, string>[];
@@ -30,14 +26,6 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<any[]>;
             default: () => never[];
         };
-        menuSource: {
-            type: StringConstructor;
-            default: string;
-        };
-        drawerDirection: {
-            type: StringConstructor;
-            default: string;
-        };
         footerFlag: {
             type: BooleanConstructor;
             default: boolean;
@@ -46,6 +34,10 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
+        isEdit: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onOnSave?: ((...args: any[]) => any) | undefined;
         onOnClose?: ((...args: any[]) => any) | undefined;
@@ -68,7 +60,11 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
             fixedShow: boolean;
             fixedWay: "NONE" | "LEFT" | "RIGHT";
             columnWidth: number;
+            editable: boolean;
+            required: boolean;
         }[];
+        widthShow: string;
+        widthLarge: string;
     };
     leftStyle: (ele: {
         [key: string]: any;
@@ -81,6 +77,8 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         fixedShow: boolean;
         fixedWay: "NONE" | "LEFT" | "RIGHT";
         columnWidth: number;
+        editable: boolean;
+        required: boolean;
     }) => {
         background: string | undefined;
     };
@@ -102,7 +100,10 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         fixedShow: boolean;
         fixedWay: "NONE" | "LEFT" | "RIGHT";
         columnWidth: number;
+        editable: boolean;
+        required: boolean;
     }) => void;
+    setWidth: () => void;
     NButton: import("vue").DefineComponent<{
         readonly color: StringConstructor;
         readonly textColor: StringConstructor;
@@ -6979,14 +6980,6 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<any[]>;
         default: () => never[];
     };
-    menuSource: {
-        type: StringConstructor;
-        default: string;
-    };
-    drawerDirection: {
-        type: StringConstructor;
-        default: string;
-    };
     footerFlag: {
         type: BooleanConstructor;
         default: boolean;
@@ -6995,14 +6988,17 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    isEdit: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onOnSave?: ((...args: any[]) => any) | undefined;
     onOnClose?: ((...args: any[]) => any) | undefined;
 }, {
     type: string;
     fields: any[];
-    menuSource: string;
-    drawerDirection: string;
     footerFlag: boolean;
+    isEdit: boolean;
 }>>;
 export default FieldSet;