cnhis-design-vue 3.1.36-beta.6 → 3.1.36-beta.8

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

@@ -18,7 +18,7 @@ export { useCommonInjection, useSelectOptionProps } from './src/hooks/useCommonI
 export { useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './src/hooks/useFormRenderOptions.js';
 export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcherWithKeyword, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './src/utils/index.js';
 export * from '@formily/core';
-export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './src/utils/business.js';
+export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAgeFromContext, parseBirthday, parseIdCard, transformDateFormat } from './src/utils/business.js';
 export { findNextWidget, queryDecorator, queryInput } from './src/utils/dom.js';
 export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, createVisitedSetter, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './src/utils/schema.js';
 

package/es/components/form-render/src/components/renderer/formItem.js

@@ -1,5 +1,5 @@
 import { defineComponent, inject, computed, createVNode, mergeProps } from 'vue';
-import { widthAppend } from '../../../../../shared/utils/index.js';
+import { arrayed, widthAppend } from '../../../../../shared/utils/index.js';
 import { isVoidField } from '@formily/core';
 import { useField, connect, mapProps } from '@formily/vue';
 import { isString } from 'lodash-es';
@@ -92,7 +92,7 @@ const script = defineComponent({
 const FORM_ITEM = connect(script, mapProps({
   title: "label"
 }, (props, field) => {
-  const feedback = !isVoidField(field) ? field.selfErrors.length ? parseFeedback(field.selfErrors, props.fieldItem) : void 0 : void 0;
+  const feedback = !isVoidField(field) ? arrayed(field.selfErrors).length ? parseFeedback(arrayed(field.selfErrors), props.fieldItem) : void 0 : void 0;
   return {
     ...props,
     fieldItem: void 0,

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

@@ -4,7 +4,7 @@ import { format } from 'date-fns';
 import { isFunction, isNumber } from 'lodash-es';
 import { FIELD_BUSINESS_TYPE } from '../constants/index.js';
 import '../utils/index.js';
-import { isIdCard, parseIdCard, parseAge2FromContext, parseBirthday, parseAge2Birthday } from '../utils/business.js';
+import { isIdCard, parseIdCard, parseAgeFromContext, parseBirthday, parseAge2Birthday } from '../utils/business.js';
 
 class BusinessCollector {
   constructor(formModel, businessFormatter) {
@@ -85,7 +85,7 @@ function useBusinessBinding() {
       return;
     }
     const info = parseIdCard(idCard);
-    const { age, ageUnit } = parseAge2FromContext(info);
+    const { age, ageUnit } = parseAgeFromContext(info);
     this.setValueByType(FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit);
     this.setValueByType(FIELD_BUSINESS_TYPE.AGE, age);
     this.setValueByType(FIELD_BUSINESS_TYPE.SEX, info.sex);
@@ -95,7 +95,7 @@ function useBusinessBinding() {
     const birthday = this.getValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY);
     if (!isString(birthday))
       return;
-    const { age, ageUnit } = parseAge2FromContext(parseBirthday(birthday));
+    const { age, ageUnit } = parseAgeFromContext(parseBirthday(birthday));
     this.setValueByType(FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit);
     this.setValueByType(FIELD_BUSINESS_TYPE.AGE, age);
   }

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

@@ -6,7 +6,7 @@ export declare function isIdCard(idCardNo: string): boolean;
 export declare function isMobile(mobile: string): boolean;
 export declare function parseBirthday(birthday: string): AgeContext;
 export declare function parseAge2Birthday(age: number, ageUnit: string, formatter?: string): string;
-export declare function parseAge2FromContext(context: AgeContext): {
+export declare function parseAgeFromContext(context: AgeContext): {
     ageUnit: FIELD_AGE_UNIT;
     age: number;
 };

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

@@ -95,8 +95,10 @@ function parseAge2Birthday(age, ageUnit, formatter = "yyyy-MM-dd HH:mm") {
     return date;
   }
 }
-function parseAge2FromContext(context) {
-  return context.hours < 24 ? { ageUnit: FIELD_AGE_UNIT.HOUR, age: context.hours < 2 ? 1 : context.hours } : context.day < 30 ? { ageUnit: FIELD_AGE_UNIT.DAY, age: context.day } : context.day < 365 ? { ageUnit: FIELD_AGE_UNIT.MONTH, age: context.month } : { ageUnit: FIELD_AGE_UNIT.YEAR, age: context.year };
+function parseAgeFromContext(context) {
+  const result = context.hours < 24 ? { ageUnit: FIELD_AGE_UNIT.HOUR, age: Math.max(context.hours, 1) } : context.day < 30 ? { ageUnit: FIELD_AGE_UNIT.DAY, age: Math.max(context.day, 1) } : context.day < 365 ? { ageUnit: FIELD_AGE_UNIT.MONTH, age: Math.max(context.month, 1) } : { ageUnit: FIELD_AGE_UNIT.YEAR, age: Math.max(context.year, 1) };
+  result.age = Math.max(result.age, 1);
+  return result;
 }
 const businessDateMatcher = /^(\d{4})-?(\d{2})-?(\d{2})?\s?(\d{2})?:?(\d{2})?:?(\d{2})?$/;
 function businessDateParser(dateString) {
@@ -109,4 +111,4 @@ function businessDateParser(dateString) {
   return new Date(`${year}-${month}-${day || "01"} ${hour || "00"}:${minute || "00"}:${second || "00"}`);
 }
 
-export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat };
+export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAgeFromContext, parseBirthday, parseIdCard, transformDateFormat };

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

@@ -15,8 +15,9 @@ import * as defaultRendererPlugin from './rendererPlugins/widgets/defaultRendere
 import * as labelRendererPlugin from './rendererPlugins/widgets/labelRendererPlugin.js';
 import * as pictureRendererPlugin from './rendererPlugins/widgets/pictureRendererPlugin.js';
 import * as seqRendererPlugin from './rendererPlugins/widgets/seqRendererPlugin.js';
-import * as index$8 from './rowGroupSettingPlugin/index.js';
-import * as index$9 from './virtualTreePlugin/index.js';
+import * as index$8 from './rowClickPlugin/index.js';
+import * as index$9 from './rowGroupSettingPlugin/index.js';
+import * as index$a from './virtualTreePlugin/index.js';
 import { separateMetaModule } from '../../../../shared/utils/index.js';
 
 const modules = Object.assign({
@@ -37,8 +38,9 @@ const modules = Object.assign({
   "./rendererPlugins/widgets/labelRendererPlugin.tsx": labelRendererPlugin,
   "./rendererPlugins/widgets/pictureRendererPlugin.tsx": pictureRendererPlugin,
   "./rendererPlugins/widgets/seqRendererPlugin.tsx": seqRendererPlugin,
-  "./rowGroupSettingPlugin/index.ts": index$8,
-  "./virtualTreePlugin/index.ts": index$9
+  "./rowClickPlugin/index.ts": index$8,
+  "./rowGroupSettingPlugin/index.ts": index$9,
+  "./virtualTreePlugin/index.ts": index$a
 });
 var PluginPresets = separateMetaModule(modules);
 

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

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

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

@@ -0,0 +1,34 @@
+import { onBeforeUnmount } from 'vue';
+import '../../../index.js';
+import { defineTablePlugin } from '../../hooks/useTablePlugin.js';
+
+function rowClickPlugin() {
+  const pluginName = "rowClickPlugin";
+  const lockMap = /* @__PURE__ */ new Map();
+  return defineTablePlugin({
+    name: pluginName,
+    apply(hooks) {
+      hooks.eventHooks.onCurrentChange.tap(pluginName, (_, { uuid }) => {
+        if (!uuid)
+          return;
+        lockMap.set(uuid, true);
+      });
+      hooks.eventHooks.onCellClick.tap(pluginName, async ({ $table }, { uuid }) => {
+        if (!uuid)
+          return;
+        if (lockMap.get(uuid)) {
+          lockMap.set(uuid, false);
+          return;
+        }
+        $table.clearCurrentRow();
+      });
+      hooks.setupHooks.setup.tap(pluginName, (config) => {
+        onBeforeUnmount(() => {
+          config.value.uuid && lockMap.delete(config.value.uuid);
+        });
+      });
+    }
+  });
+}
+
+export { rowClickPlugin };

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

@@ -86,6 +86,7 @@ export declare type IhoTableFormChangePayload = {
     value: unknown;
     index: number;
     type?: string;
+    oldValue?: unknown;
 };
 export declare type IhoTableEmits = <T extends typeof IhoTableEventNameTuple[number]>(event: T, ...args: IhoTableEmitPayload<T>) => void;
 export declare type EventListenerToEventName<T extends string> = T extends `on${infer R}` ? R extends `${infer F}${infer L}` ? `${Lowercase<F>}${L}` : never : never;

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

@@ -43,7 +43,6 @@ async function getColumnRenderWidth(column, $table) {
   if (!prev) {
     await promiseTimeout(0);
   }
-  console.log("get_width=>", column.field);
   return getRenderWidth() || getColumnWidth();
   function getRenderWidth() {
     var _a, _b;

package/es/components/index.js

@@ -62,7 +62,7 @@ export { useAnchor } from './form-render/src/hooks/useAnchor.js';
 export { useFormContext } from './form-render/src/hooks/useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './form-render/src/hooks/useCommonInjection.js';
 export { useAutographOptions, useRecommendOptions, useUrlConfigOptions } from './form-render/src/hooks/useFormRenderOptions.js';
-export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './form-render/src/utils/business.js';
+export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAgeFromContext, parseBirthday, parseIdCard, transformDateFormat } from './form-render/src/utils/business.js';
 export { findNextWidget, queryDecorator, queryInput } from './form-render/src/utils/dom.js';
 export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, createVisitedSetter, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './form-render/src/utils/schema.js';
 export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcherWithKeyword, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './form-render/src/utils/index.js';

package/package.json

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