cnhis-design-vue 3.1.52-beta.32 → 3.1.52-beta.34

package/es/components/table-filter/src/components/render-widget/widgetCfgMaps.d.ts

@@ -477,7 +477,7 @@ export declare const WidgetCfgMaps: Map<string, {
                 type: FunctionConstructor;
             };
             formattedValue: {
-                type: StringConstructor;
+                type: import("vue").PropType<(string | [string, string]) | null | undefined>;
             };
             placeholder: {
                 type: StringConstructor;
@@ -497,7 +497,7 @@ export declare const WidgetCfgMaps: Map<string, {
                     type: FunctionConstructor;
                 };
                 formattedValue: {
-                    type: StringConstructor;
+                    type: import("vue").PropType<(string | [string, string]) | null | undefined>;
                 };
                 placeholder: {
                     type: StringConstructor;
@@ -512,7 +512,7 @@ export declare const WidgetCfgMaps: Map<string, {
             datePickerRef: import("vue").Ref<import("../../../..").AnyObject | null>;
             panelInstRef: import("vue").Ref<null>;
             placeholderRef: import("vue").Ref<any>;
-            currentFormattedValue: import("vue").WritableComputedRef<string | null | undefined>;
+            currentFormattedValue: import("vue").WritableComputedRef<(string | [string, string]) | null | undefined>;
             isDateTime: import("vue").ComputedRef<boolean>;
             formatRef: import("vue").ComputedRef<string>;
             panelFormatRef: import("vue").ComputedRef<string | [string, string]>;
@@ -521,7 +521,7 @@ export declare const WidgetCfgMaps: Map<string, {
             handleConfirm: (target: HTMLInputElement) => void;
             onUpdateShow: (show: boolean) => void;
             onConfirm: (...args: any[]) => Promise<void>;
-            isAllowedInvalidValue: (value?: string) => boolean | "" | undefined;
+            isAllowedInvalidValue: (value: (string | [string, string]) | null | undefined) => boolean | "" | undefined;
             NDatePicker: any;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:formatted-value"[], "update:formatted-value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             updateUnchangedValue: {
@@ -531,7 +531,7 @@ export declare const WidgetCfgMaps: Map<string, {
                 type: FunctionConstructor;
             };
             formattedValue: {
-                type: StringConstructor;
+                type: import("vue").PropType<(string | [string, string]) | null | undefined>;
             };
             placeholder: {
                 type: StringConstructor;
@@ -737,7 +737,7 @@ export declare const WidgetCfgMaps: Map<string, {
                 type: FunctionConstructor;
             };
             formattedValue: {
-                type: StringConstructor;
+                type: import("vue").PropType<(string | [string, string]) | null | undefined>;
             };
             placeholder: {
                 type: StringConstructor;
@@ -757,7 +757,7 @@ export declare const WidgetCfgMaps: Map<string, {
                     type: FunctionConstructor;
                 };
                 formattedValue: {
-                    type: StringConstructor;
+                    type: import("vue").PropType<(string | [string, string]) | null | undefined>;
                 };
                 placeholder: {
                     type: StringConstructor;
@@ -772,7 +772,7 @@ export declare const WidgetCfgMaps: Map<string, {
             datePickerRef: import("vue").Ref<import("../../../..").AnyObject | null>;
             panelInstRef: import("vue").Ref<null>;
             placeholderRef: import("vue").Ref<any>;
-            currentFormattedValue: import("vue").WritableComputedRef<string | null | undefined>;
+            currentFormattedValue: import("vue").WritableComputedRef<(string | [string, string]) | null | undefined>;
             isDateTime: import("vue").ComputedRef<boolean>;
             formatRef: import("vue").ComputedRef<string>;
             panelFormatRef: import("vue").ComputedRef<string | [string, string]>;
@@ -781,7 +781,7 @@ export declare const WidgetCfgMaps: Map<string, {
             handleConfirm: (target: HTMLInputElement) => void;
             onUpdateShow: (show: boolean) => void;
             onConfirm: (...args: any[]) => Promise<void>;
-            isAllowedInvalidValue: (value?: string) => boolean | "" | undefined;
+            isAllowedInvalidValue: (value: (string | [string, string]) | null | undefined) => boolean | "" | undefined;
             NDatePicker: any;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:formatted-value"[], "update:formatted-value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             updateUnchangedValue: {
@@ -791,7 +791,7 @@ export declare const WidgetCfgMaps: Map<string, {
                 type: FunctionConstructor;
             };
             formattedValue: {
-                type: StringConstructor;
+                type: import("vue").PropType<(string | [string, string]) | null | undefined>;
             };
             placeholder: {
                 type: StringConstructor;
@@ -959,7 +959,7 @@ export declare const WidgetCfgMaps: Map<string, {
                 type: FunctionConstructor;
             };
             formattedValue: {
-                type: StringConstructor;
+                type: import("vue").PropType<(string | [string, string]) | null | undefined>;
             };
             placeholder: {
                 type: StringConstructor;
@@ -979,7 +979,7 @@ export declare const WidgetCfgMaps: Map<string, {
                     type: FunctionConstructor;
                 };
                 formattedValue: {
-                    type: StringConstructor;
+                    type: import("vue").PropType<(string | [string, string]) | null | undefined>;
                 };
                 placeholder: {
                     type: StringConstructor;
@@ -994,7 +994,7 @@ export declare const WidgetCfgMaps: Map<string, {
             datePickerRef: import("vue").Ref<import("../../../..").AnyObject | null>;
             panelInstRef: import("vue").Ref<null>;
             placeholderRef: import("vue").Ref<any>;
-            currentFormattedValue: import("vue").WritableComputedRef<string | null | undefined>;
+            currentFormattedValue: import("vue").WritableComputedRef<(string | [string, string]) | null | undefined>;
             isDateTime: import("vue").ComputedRef<boolean>;
             formatRef: import("vue").ComputedRef<string>;
             panelFormatRef: import("vue").ComputedRef<string | [string, string]>;
@@ -1003,7 +1003,7 @@ export declare const WidgetCfgMaps: Map<string, {
             handleConfirm: (target: HTMLInputElement) => void;
             onUpdateShow: (show: boolean) => void;
             onConfirm: (...args: any[]) => Promise<void>;
-            isAllowedInvalidValue: (value?: string) => boolean | "" | undefined;
+            isAllowedInvalidValue: (value: (string | [string, string]) | null | undefined) => boolean | "" | undefined;
             NDatePicker: any;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:formatted-value"[], "update:formatted-value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             updateUnchangedValue: {
@@ -1013,7 +1013,7 @@ export declare const WidgetCfgMaps: Map<string, {
                 type: FunctionConstructor;
             };
             formattedValue: {
-                type: StringConstructor;
+                type: import("vue").PropType<(string | [string, string]) | null | undefined>;
             };
             placeholder: {
                 type: StringConstructor;
@@ -1226,7 +1226,7 @@ export declare const WidgetCfgMaps: Map<string, {
                 type: FunctionConstructor;
             };
             formattedValue: {
-                type: StringConstructor;
+                type: import("vue").PropType<(string | [string, string]) | null | undefined>;
             };
             placeholder: {
                 type: StringConstructor;
@@ -1246,7 +1246,7 @@ export declare const WidgetCfgMaps: Map<string, {
                     type: FunctionConstructor;
                 };
                 formattedValue: {
-                    type: StringConstructor;
+                    type: import("vue").PropType<(string | [string, string]) | null | undefined>;
                 };
                 placeholder: {
                     type: StringConstructor;
@@ -1261,7 +1261,7 @@ export declare const WidgetCfgMaps: Map<string, {
             datePickerRef: import("vue").Ref<import("../../../..").AnyObject | null>;
             panelInstRef: import("vue").Ref<null>;
             placeholderRef: import("vue").Ref<any>;
-            currentFormattedValue: import("vue").WritableComputedRef<string | null | undefined>;
+            currentFormattedValue: import("vue").WritableComputedRef<(string | [string, string]) | null | undefined>;
             isDateTime: import("vue").ComputedRef<boolean>;
             formatRef: import("vue").ComputedRef<string>;
             panelFormatRef: import("vue").ComputedRef<string | [string, string]>;
@@ -1270,7 +1270,7 @@ export declare const WidgetCfgMaps: Map<string, {
             handleConfirm: (target: HTMLInputElement) => void;
             onUpdateShow: (show: boolean) => void;
             onConfirm: (...args: any[]) => Promise<void>;
-            isAllowedInvalidValue: (value?: string) => boolean | "" | undefined;
+            isAllowedInvalidValue: (value: (string | [string, string]) | null | undefined) => boolean | "" | undefined;
             NDatePicker: any;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:formatted-value"[], "update:formatted-value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             updateUnchangedValue: {
@@ -1280,7 +1280,7 @@ export declare const WidgetCfgMaps: Map<string, {
                 type: FunctionConstructor;
             };
             formattedValue: {
-                type: StringConstructor;
+                type: import("vue").PropType<(string | [string, string]) | null | undefined>;
             };
             placeholder: {
                 type: StringConstructor;

package/es/shared/package.json.js

@@ -1 +1 @@
-var e="@cnhis-design-vue/shared",i="3.1.52-beta.32",s="index.ts",n={"naive-ui":"^2.30.0",vue:"^3.2.0"},a={"@vicons/ionicons5":"^0.12.0","lodash-es":"^4.17.21",moment:"^2.29.1","video.js":"^7.19.2","videojs-contrib-hls":"^5.15.0",viewerjs:"^1.10.5","xe-utils":"^3.5.4"},d={name:e,version:"3.1.52-beta.32",private:!0,main:"index.ts",peerDependencies:n,dependencies:a};export{d as default,a as dependencies,s as main,e as name,n as peerDependencies,i as version};
+var e="@cnhis-design-vue/shared",i="3.1.52-beta.34",s="index.ts",n={"naive-ui":"^2.30.0",vue:"^3.2.0"},a={"@vicons/ionicons5":"^0.12.0","lodash-es":"^4.17.21",moment:"^2.29.1","video.js":"^7.19.2","videojs-contrib-hls":"^5.15.0",viewerjs:"^1.10.5","xe-utils":"^3.5.4"},d={name:e,version:"3.1.52-beta.34",private:!0,main:"index.ts",peerDependencies:n,dependencies:a};export{d as default,a as dependencies,s as main,e as name,n as peerDependencies,i as version};

package/es/shared/types/business.d.ts

@@ -12,6 +12,7 @@ export declare type BindEventSettingItem = {
         p_value: string;
         p_name: string;
     }[];
+    compareMap?: Partial<Record<LOW_CODE_VALUE_RELATION, (v1: any, v2: any) => boolean>>;
     [K: string]: unknown;
 };
 export declare type FormOperationalConfig = {
@@ -36,6 +37,7 @@ export declare namespace FormLowCodeReactions {
     type Config = {
         conObj: ConObj[];
     } & Partial<{
+        compareMap: BindEventSettingItem['compareMap'];
         sqlExpression: string;
         showField: string[];
         hideField: string[];

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

@@ -3,7 +3,7 @@ import { MaybeRef } from '@vueuse/core';
 export declare function isMatchLowCodeCondition(value: unknown, condition: {
     con: LOW_CODE_VALUE_RELATION;
     value: unknown;
-}): boolean;
+}, overwriteCompareMap?: BindEventSettingItem['compareMap']): boolean;
 export declare function isMatchLowCodeConditionsWithSqlExpression(formData: AnyObject, config: FormLowCodeReactions.Config): any;
 declare function handleFieldTriggerSetValue(bindEventSetting: BindEventSettingItem, { getter, setter }: {
     setter: (key: string, value: unknown) => void;

package/es/shared/utils/business.js

@@ -1 +1 @@
-import{Path as e}from"@formily/path";import{isArray as r,isString as n,includes as t,negate as o,gt as l,gte as a,isNumber as i,lt as u,lte as c,noop as s,isObject as p}from"lodash-es";import{unref as f}from"vue";function E(e){return null==e||""==e}const m={EQ:(e,r)=>`${e}`===r,NEQ:(e,r)=>`${e}`!==r,CL:(e,o)=>!(!r(e)&&!n(e))&&t(e,o),NC:(e,o)=>!r(e)&&!n(e)||!t(e,o),NULL:E,NOT_NULL:o(E),BIG:l,BIGEQ:a,LESS:(e,r)=>!!(i(e)||n(e)&&e)&&u(e,r),LESSEQ:(e,r)=>!!(i(e)||n(e)&&e)&&c(e,r)};function g(e,r){return(m[r.con]||(()=>!1))(e,`${r.value}`)}function _(t,o){if(!r(o.conObj))return!1;if(!o.sqlExpression||!n(o.sqlExpression))return o.conObj.every((r=>g(e.getIn(t,r.field_key),r)));const l=o.conObj.map((r=>g(e.getIn(t,r.field_key),r)));try{return new Function("return "+o.sqlExpression.replace(/OR/g,"||").replace(/AND/g,"&&").replace(/[a-zA-Z]/g,"").replace(/\d+/g,(e=>l[+e-1]?"true":"false")))()}catch(e){return console.error("表达式错误=>",o.sqlExpression),!1}}const L=Object.freeze({SET_VALUE:function(e,{getter:r,setter:n}){if(!p(e))return;const{results:t=[],params:o=[]}=e;if(!t.length)return;o.every((e=>e&&e.p_name&&g(r(e.p_name),{con:e.p_select,value:e.p_value})))&&t.forEach((e=>n(e.p_name,e.p_value)))},REPEAT_VALIDATE:s,IS_SHOW_FIELD:s,SQLSAVE:s,API:s});function d(e){return L[e]||s}function A(e,t,o){function l(e){return r(e)&&!!e.length}function a(e,r=!0){e.forEach((e=>{const l=e.operationFormParam.reduce(((e,r)=>(e[r=r.replace(/^table\./,"")]=+t(r),e)),{}),a=e.operationalRule.replace(/\${(.+?)}/g,"$1");let u=new Function("table",`return ${a}`)(l);n(u)&&(u=+u),u=i(u)?isNaN(u)?"":u.toFixed(+e.operationalPrecision):"",(r||null==t(e.operationalResult))&&o(e.operationalResult,u)}))}return{operationalFormHandler:function(r){if(!l(f(e)))return;const n=f(e).filter((e=>e.operationFormParam.includes(`table.${r}`)));n.length&&a(n)},triggerAllOperationalFormHandler:function(){l(f(e))&&a(f(e),!1)}}}export{d as getBindEventSettingTrigger,A as getOperationalFormHandler,g as isMatchLowCodeCondition,_ as isMatchLowCodeConditionsWithSqlExpression};
+import{Path as e}from"@formily/path";import{isArray as r,isString as n,includes as t,negate as o,gt as a,gte as l,isNumber as c,lt as i,lte as u,noop as p,isObject as s}from"lodash-es";import{unref as f}from"vue";function m(e){return null==e||""==e}const E={EQ:(e,r)=>`${e}`===r,NEQ:(e,r)=>`${e}`!==r,CL:(e,o)=>!(!r(e)&&!n(e))&&t(e,o),NC:(e,o)=>!r(e)&&!n(e)||!t(e,o),NULL:m,NOT_NULL:o(m),BIG:a,BIGEQ:l,LESS:(e,r)=>!!(c(e)||n(e)&&e)&&i(e,r),LESSEQ:(e,r)=>!!(c(e)||n(e)&&e)&&u(e,r)};function g(e,r,n={}){return(n[r.con]||E[r.con]||(()=>!1))(e,`${r.value}`)}function _(t,o){if(!r(o.conObj))return!1;if(!o.sqlExpression||!n(o.sqlExpression))return o.conObj.every((r=>g(e.getIn(t,r.field_key),r,o.compareMap)));const a=o.conObj.map((r=>g(e.getIn(t,r.field_key),r,o.compareMap)));try{return new Function("return "+o.sqlExpression.replace(/OR/g,"||").replace(/AND/g,"&&").replace(/[a-zA-Z]/g,"").replace(/\d+/g,(e=>a[+e-1]?"true":"false")))()}catch(e){return console.error("表达式错误=>",o.sqlExpression),!1}}const L=Object.freeze({SET_VALUE:function(e,{getter:r,setter:n}){if(!s(e))return;const{results:t=[],params:o=[],compareMap:a={}}=e;if(!t.length)return;o.every((e=>e&&e.p_name&&g(r(e.p_name),{con:e.p_select,value:e.p_value},a)))&&t.forEach((e=>n(e.p_name,e.p_value)))},REPEAT_VALIDATE:p,IS_SHOW_FIELD:p,SQLSAVE:p,API:p});function d(e){return L[e]||p}function A(e,t,o){function a(e){return r(e)&&!!e.length}function l(e,r=!0){e.forEach((e=>{const a=e.operationFormParam.reduce(((e,r)=>(e[r=r.replace(/^table\./,"")]=+t(r),e)),{}),l=e.operationalRule.replace(/\${(.+?)}/g,"$1");let i=new Function("table",`return ${l}`)(a);n(i)&&(i=+i),i=c(i)?isNaN(i)?"":i.toFixed(+e.operationalPrecision):"",(r||null==t(e.operationalResult))&&o(e.operationalResult,i)}))}return{operationalFormHandler:function(r){if(!a(f(e)))return;const n=f(e).filter((e=>e.operationFormParam.includes(`table.${r}`)));n.length&&l(n)},triggerAllOperationalFormHandler:function(){a(f(e))&&l(f(e),!1)}}}export{d as getBindEventSettingTrigger,A as getOperationalFormHandler,g as isMatchLowCodeCondition,_ as isMatchLowCodeConditionsWithSqlExpression};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.52-beta.32",
+	"version": "3.1.52-beta.34",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -63,5 +63,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "698b6e15a5e8374b41dc9be1e9d251a2ee4c18b6"
+	"gitHead": "bf806055a34ef14dd4ca14201cdf37d75eb36b9d"
 }