cnhis-design-vue 3.4.0-release.3 → 3.4.0-release.7

package/es/shared/components/InputNumberSlash/InputNumberSlash.d.ts

@@ -17,6 +17,13 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     precision: {
         type: NumberConstructor;
     };
+    parse: {
+        type: PropType<(v: string) => string>;
+        default: {
+            <T>(value: T): T;
+            (): undefined;
+        };
+    };
     whiteList: {
         type: PropType<string[]>;
     };
@@ -47,6 +54,13 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     precision: {
         type: NumberConstructor;
     };
+    parse: {
+        type: PropType<(v: string) => string>;
+        default: {
+            <T>(value: T): T;
+            (): undefined;
+        };
+    };
     whiteList: {
         type: PropType<string[]>;
     };
@@ -64,6 +78,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     onSelect?: ((...args: any[]) => any) | undefined;
 }>, {
     onChange: AnyFn;
+    parse: (v: string) => string;
     slashSymbol: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/shared/components/InputNumberSlash/InputNumberSlash.js

@@ -1,6 +1,6 @@
 import { defineComponent, computed, ref, watch, createVNode, mergeProps } from 'vue';
 import { findAncestor } from '../../utils/index.js';
-import { isArray, isString, isNumber, isObject } from 'lodash-es';
+import { identity, isArray, isString, isNumber, isObject } from 'lodash-es';
 import { NInput, NDropdown } from 'naive-ui';
 import '../../../components/form-render/index.js';
 import { createInputSlot } from '../../../components/form-render/src/utils/index.js';
@@ -23,6 +23,10 @@ var script = /* @__PURE__ */ defineComponent({
     precision: {
       type: Number
     },
+    parse: {
+      type: Function,
+      default: identity
+    },
     whiteList: {
       type: Array
     },
@@ -73,15 +77,25 @@ var script = /* @__PURE__ */ defineComponent({
         return tempValue.value;
       },
       set(v) {
-        if (v == null)
-          return tempValue.value = "";
-        if (isNumber(v))
-          return tempValue.value = v + "";
-        if (!isString(v))
-          return;
-        if (v.endsWith(props.slashSymbol))
-          return tempValue.value = props.slashSymbol;
-        tempValue.value = whiteListOptions.value.some((option) => option.label === v) || validNumberReg.test(v) ? v : "";
+        let res = "";
+        switch (true) {
+          case v == null:
+            res = "";
+            break;
+          case isNumber(v):
+            res = props.parse(v + "");
+            break;
+          case !isString(v):
+            return;
+          default: {
+            if (v.endsWith(props.slashSymbol)) {
+              res = props.slashSymbol;
+            } else {
+              res = whiteListOptions.value.some((option) => option.label === v) || validNumberReg.test(v) ? props.parse(v) : "";
+            }
+          }
+        }
+        tempValue.value = res;
       }
     });
     watch(() => props.value, (v) => valueRef.value = v, {

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-release.3";
+var version = "3.4.0-release.7";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

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

@@ -88,19 +88,20 @@ export declare namespace LowCodeTypes {
         __oppositeBindField: reactionConfig;
         __oppositeTargetField: reactionConfig;
     }>;
-    type reactionActionType = 'show' | 'hide' | 'required' | 'notRequired' | 'enabled' | 'disabled';
+    type reactionActionType = 'show' | 'hide' | 'required' | 'notRequired' | 'enabled' | 'disabled' | 'setValue';
     type reactionAction = {
         action: reactionActionType;
         fields: string[];
         actionConfig?: Partial<{
             restoreDefault: boolean;
             restoreEmpty: boolean;
+            value: unknown;
         }>;
     };
     type LowCodeConditions = {
         field: string;
         type: VALUE_RELATION;
-        valueType?: 'const' | 'field';
+        valueType?: 'const' | 'field' | 'range';
         value?: any;
     };
     type newReactionConfig = {

package/es/shared/utils/business.js

@@ -66,10 +66,26 @@ function isMatchNewLowCodeConditionsWithSqlExpression(formData, config) {
         config.compareMap
       );
     }
+    if (condition.valueType === "range") {
+      return isInRange(value, condition.value);
+    }
     return isMatchLowCodeCondition(value, { con: condition.type, value: condition.value }, config.compareMap);
   });
   return isConditionsMatchSqlExpression(conditions, config.sqlExpression);
 }
+function isInRange(value, range) {
+  if (!isArray(range) || range.length !== 2)
+    return false;
+  const [min, max] = range.map((v) => +v);
+  if (Number.isNaN(min) || Number.isNaN(max))
+    return false;
+  if (!isNumber(value) && !isString(value))
+    return false;
+  const numberValue = +value;
+  if (Number.isNaN(numberValue))
+    return false;
+  return numberValue >= min && numberValue <= max;
+}
 function handleFieldTriggerSetValue(bindEventSetting, {
   getter,
   setter

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-release.3",
+	"version": "3.4.0-release.7",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -30,6 +30,7 @@
 		"@formily/path": "2.1.9",
 		"@formily/reactive": "2.1.9",
 		"@formily/vue": "2.1.9",
+		"@microsoft/fetch-event-source": "^2.0.1",
 		"@vicons/carbon": "^0.12.0",
 		"@vicons/ionicons5": "^0.12.0",
 		"@vueuse/core": "^8.6.0",
@@ -50,7 +51,6 @@
 		"min-dash": "^3.8.1",
 		"min-dom": "^3.2.1",
 		"moment": "^2.29.1",
-		"naive-ui": "^2.34.0",
 		"socket.io-client": "^4.7.3",
 		"sockjs-client": "^1.6.1",
 		"sortablejs": "^1.15.0",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "08d9de65258ce0b501fa312937c194038d0d32b9"
+	"gitHead": "c28e101aa2fe262030e4b9019ce749b423c2019e"
 }