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

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

@@ -329,6 +329,14 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
+            beforeEditMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -327,6 +327,14 @@ declare const _default: import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
+            beforeEditMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, openBlock, createBlock, unref, withCtx, createVNode, withModifiers } from 'vue';
+import { defineComponent, ref, watch, onDeactivated, openBlock, createBlock, unref, withCtx, createVNode, withModifiers } from 'vue';
 import script from '../../../../../shared/components/SlotRender/SlotRender.js';
 import { cloneDeep, isObject, isArray } from 'lodash-es';
 import { NPopover, NInput } from 'naive-ui';
@@ -57,6 +57,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       background: "white",
       "border-radius": "4px"
     };
+    onDeactivated(() => {
+      onClose(getRowData(props.row));
+    });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(NPopover), {
         ref_key: "popoverRef",

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

@@ -1,4 +1,4 @@
-import { useMemoize } from '@vueuse/core';
+import { getStringWidth } from '../../../../shared/utils/index2.js';
 import { isNumber, isArray, cloneDeep, isString } from 'lodash-es';
 import { ref, computed, provide, watch, nextTick } from 'vue';
 import { InjectionSeparateHandle } from '../constants/index2.js';
@@ -20,46 +20,6 @@ class SeparateHandle {
     this.callbacks.forEach((cb) => cb());
   }
 }
-const getStringWidth = /* @__PURE__ */ useMemoize(function(str) {
-  if (!str)
-    return 0;
-  return [...str].reduce((width, char) => {
-    if (/[a-z]/.test(char)) {
-      return width + 8;
-    }
-    if (/[A-Z]/.test(char)) {
-      return width + 12;
-    }
-    if (/\d/.test(char)) {
-      return width + 9;
-    }
-    if (/\./.test(char)) {
-      return width + 4;
-    }
-    if (/[\u4e00-\u9fa5]/.test(char)) {
-      return width + 15;
-    }
-    if (/-/.test(char)) {
-      return width + 4;
-    }
-    if (/[（）]/.test(char)) {
-      return width + 14;
-    }
-    if (/[)(]/.test(char)) {
-      return width + 5;
-    }
-    if (/-/.test(char)) {
-      return width + 10;
-    }
-    if (/%/.test(char)) {
-      return width + 14;
-    }
-    if (/‰/.test(char)) {
-      return width + 16;
-    }
-    return width + 6;
-  }, 0);
-});
 const separateDataMap = ref(/* @__PURE__ */ new WeakMap());
 function useSeparateMap() {
   function getRowData(row) {

package/es/components/field-set/src/FieldSet.js

@@ -118,7 +118,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               Reflect.deleteProperty(item, key);
             }
           }
-          item.columnWidth = +item.columnWidth;
+          if (!Reflect.has(item, "columnWidth")) {
+            item.columnWidth = null;
+          } else {
+            item.columnWidth = +item.columnWidth;
+          }
           if (!Reflect.has(item, "alias")) {
             item.alias = "";
           }

package/es/components/form-render/src/hooks/useFormContext2.js

@@ -1,3 +1,4 @@
+import { uuidGenerator } from '../../../../shared/utils/index2.js';
 import { isObject } from '@vue/shared';
 import { cloneDeep } from 'lodash-es';
 import { provide, computed, readonly } from 'vue';
@@ -6,7 +7,7 @@ import '../../index2.js';
 import * as index from '../components/renderer/index2.js';
 import { useFormRenderLifeCycle } from './useFormRenderLifeCycle2.js';
 import { usePresetScope } from './usePresetScope2.js';
-import { injectOrProvide, uuidGenerator, presetRequestHandler } from '../utils/index.js';
+import { injectOrProvide, presetRequestHandler } from '../utils/index.js';
 import { InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionAnnotation, InjectAsyncQueue, InjectionSchemaField } from '../constants/index2.js';
 import { useBusinessBinding } from './useBusinessBinding2.js';
 import { useChangeContext } from './useChangeContext2.js';

package/es/components/form-render/src/utils/index.d.ts

@@ -8,7 +8,6 @@ export declare function formRenderLog(message: string): void;
 export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function parseNumberFromMaybeString<T>(value: T): T extends number | string ? number : T;
-export declare function uuidGenerator(): string;
 export declare function createSlot(renderer: unknown, props: AnyObject): Record<string, () => ArrayAble<VNode>> | {
     default(): any;
 };

package/es/components/form-render/src/utils/index.js

@@ -50,15 +50,6 @@ function parseNumberFromMaybeString(value) {
     return +value;
   return value;
 }
-function uuidGenerator() {
-  if (window.isSecureContext && window.crypto)
-    return `key${window.crypto.randomUUID()}`;
-  const uuid = "xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-    const r = Math.random() * 16 | 0, v = c == "x" ? r : r & 3 | 8;
-    return v.toString(16);
-  });
-  return `key${uuid}`;
-}
 function createSlot(renderer, props) {
   if (isObject(renderer) && !isFunction(renderer)) {
     const result = {};
@@ -134,4 +125,4 @@ function optionMatcher(options, input, key, matcherOption = {
   }
 }
 
-export { createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, uuidGenerator };
+export { createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler };