cnhis-design-vue 3.3.3-beta.57 → 3.3.3-beta.59

package/es/components/field-set/src/FieldColor.vue.d.ts

@@ -539,9 +539,9 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         developMode: boolean;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/FieldFilter.vue.d.ts

@@ -568,9 +568,9 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         developMode: boolean;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -759,9 +759,9 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         developMode: boolean;
         draggable: boolean;
-        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
+        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/components/table-row.vue.d.ts

@@ -384,9 +384,9 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     developMode: boolean;
     draggable: boolean;
-    isHighlightRow: boolean;
     idx: number;
     isHighlight: boolean;
+    isHighlightRow: boolean;
     isFieldSet: boolean;
     fieldDescribeMode: "column" | "tooltip";
     hideExpressionOption: AnyObject[];

package/es/components/index.d.ts

@@ -65,6 +65,7 @@ export * from './audio-sdk';
 export * from './step-notice';
 export * from './info-header';
 export * from './vertify';
+export * from './keyboard';
 declare function install(app: App): void;
 export { CGrid, CBigTable, CFieldSet, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CInfoHeader, CTimeLine, CBaseSearch, CQuickSearch, CClassification, CBpmnWorkflow, CStepsWheel, CEditor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter, CFormConfig, CIhoTable, CKeyboard, CSearchCascader, CRecommendSearch, CDatePicker, CTimePicker, CConfigProvider, CPictureClipper, CTableExportField, CExpandField, CIhoChat, CCallback, CSliderTree, CBodySelect, CDefaultPage, CStepNotice, CToothBitmap, CCardRender, CBranchNotice, CFieldEditor, CAudioSdk };
 declare const _default: {

package/es/components/keyboard/index.d.ts

@@ -92,12 +92,16 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
     popoverRef: import("vue").Ref<any>;
     englishKeyboardRef: import("vue").Ref<HTMLDivElement | undefined>;
     keyboardDragRef: import("vue").Ref<HTMLElement | undefined>;
+    numberPanelRef: import("vue").Ref<import("./src/types").KeyboardInstance | undefined>;
     currentValue: import("vue").Ref<any>;
+    draggableInstance: null;
     _style: import("vue").ComputedRef<string> | undefined;
     init: () => import("vue").ComputedRef<string> | undefined;
     keydown: (key: string | number) => void;
     onChange: (value: number) => void;
     select: () => void;
+    setPosition: (position: import("@vueuse/core").Position) => void;
+    getPosition: () => import("@vueuse/core").Position;
     NPopover: any;
     NInputNumber: any;
     NIcon: any;
@@ -185,6 +189,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
         denominatorValueStatus: import("vue").Ref<import("naive-ui/es/form/src/interface").FormValidationStatus>;
         keyboardRef: import("vue").Ref<HTMLElement | null>;
         inputRef: any;
+        draggableInstance: null;
         style: import("vue").ComputedRef<string> | undefined;
         init: () => import("vue").ComputedRef<string> | undefined;
         setFocus: () => Promise<void>;
@@ -196,6 +201,8 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
         calculateFraction: () => void;
         setInputStatus: (valueRef: import("vue").Ref<string>, statusRef: import("vue").Ref<string>, isInteger?: boolean | undefined) => true | undefined;
         setInputValueStatus: () => void;
+        setPosition: (position: import("@vueuse/core").Position) => void;
+        getPosition: () => import("@vueuse/core").Position;
         NIcon: any;
         NSpace: any;
         ArrowUndoSharp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
@@ -341,3 +348,4 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
     moveOffset: import("@vueuse/core").Position;
 }>>;
 export default Keyboard;
+export type { KeyboardInstance } from './src/types';

package/es/components/keyboard/src/Keyboard.vue.d.ts

@@ -1,5 +1,6 @@
 import { PropType } from 'vue';
 import { Position } from '@vueuse/core';
+import type { KeyboardInstance } from './types';
 declare const _default: import("vue").DefineComponent<{
     mode: {
         type: PropType<"number" | "day" | "dose" | "english">;
@@ -93,12 +94,16 @@ declare const _default: import("vue").DefineComponent<{
     popoverRef: import("vue").Ref<any>;
     englishKeyboardRef: import("vue").Ref<HTMLDivElement | undefined>;
     keyboardDragRef: import("vue").Ref<HTMLElement | undefined>;
+    numberPanelRef: import("vue").Ref<KeyboardInstance | undefined>;
     currentValue: import("vue").Ref<any>;
+    draggableInstance: null;
     _style: import("vue").ComputedRef<string> | undefined;
     init: () => import("vue").ComputedRef<string> | undefined;
     keydown: (key: string | number) => void;
     onChange: (value: number) => void;
     select: () => void;
+    setPosition: (position: Position) => void;
+    getPosition: () => Position;
     NPopover: any;
     NInputNumber: any;
     NIcon: any;
@@ -186,6 +191,7 @@ declare const _default: import("vue").DefineComponent<{
         denominatorValueStatus: import("vue").Ref<import("naive-ui/es/form/src/interface").FormValidationStatus>;
         keyboardRef: import("vue").Ref<HTMLElement | null>;
         inputRef: any;
+        draggableInstance: null;
         style: import("vue").ComputedRef<string> | undefined;
         init: () => import("vue").ComputedRef<string> | undefined;
         setFocus: () => Promise<void>;
@@ -197,6 +203,8 @@ declare const _default: import("vue").DefineComponent<{
         calculateFraction: () => void;
         setInputStatus: (valueRef: import("vue").Ref<string>, statusRef: import("vue").Ref<string>, isInteger?: boolean | undefined) => true | undefined;
         setInputValueStatus: () => void;
+        setPosition: (position: Position) => void;
+        getPosition: () => Position;
         NIcon: any;
         NSpace: any;
         ArrowUndoSharp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

package/es/components/keyboard/src/Keyboard.vue2.js

@@ -94,28 +94,26 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const popoverRef = ref();
     const englishKeyboardRef = ref();
     const keyboardDragRef = ref();
+    const numberPanelRef = ref();
     const currentValue = ref();
+    let draggableInstance = null;
     const _style = init();
     function init() {
       if (props.defaultValue) {
         currentValue.value = props.defaultValue;
       }
       if (isDefault.value && props.drag) {
-        const {
-          x,
-          y,
-          style: style2
-        } = useDraggable(englishKeyboardRef, {
+        draggableInstance = useDraggable(englishKeyboardRef, {
           initialValue: props.positionInitialValue,
           preventDefault: true,
           handle: keyboardDragRef,
-          onMove: (position, event) => {
+          onMove: (position) => {
             var _a, _b, _c, _d;
             position.x += (_b = (_a = props.moveOffset) == null ? void 0 : _a.x) != null ? _b : 0;
             position.y += (_d = (_c = props.moveOffset) == null ? void 0 : _c.y) != null ? _d : 0;
           }
         });
-        return style2;
+        return draggableInstance.style;
       }
     }
     function keydown(key) {
@@ -134,8 +132,32 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     function select() {
       toSelectInputContent.value = Date.now();
     }
+    function setPosition(position) {
+      if (draggableInstance) {
+        draggableInstance.x.value = position.x;
+        draggableInstance.y.value = position.y;
+      } else if (numberPanelRef.value) {
+        numberPanelRef.value.setPosition(position);
+      }
+    }
+    function getPosition() {
+      if (draggableInstance) {
+        return {
+          x: draggableInstance.x.value,
+          y: draggableInstance.y.value
+        };
+      } else if (numberPanelRef.value) {
+        return numberPanelRef.value.getPosition();
+      }
+      return {
+        x: 0,
+        y: 0
+      };
+    }
     expose({
-      select
+      select,
+      setPosition,
+      getPosition
     });
     return (_ctx, _cache) => {
       return !unref(isDefault) && !__props.panel ? (openBlock(), createBlock(unref(NPopover), {
@@ -162,7 +184,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, null, 8, ["mode", "defaultValue"])]),
         _: 1
       }, 8, ["style"])) : !unref(isDefault) && __props.panel ? (openBlock(), createBlock(NumberPanel, mergeProps({
-        key: 1
+        key: 1,
+        ref_key: "numberPanelRef",
+        ref: numberPanelRef
       }, unref(moveNumberPaneOptions), {
         style: unref(cssVars)
       }), null, 16, ["style"])) : (openBlock(), createElementBlock("div", {

package/es/components/keyboard/src/components/NumberPanel.vue.d.ts

@@ -81,6 +81,7 @@ declare const _default: import("vue").DefineComponent<{
     denominatorValueStatus: Ref<FormValidationStatus>;
     keyboardRef: Ref<HTMLElement | null>;
     inputRef: any;
+    draggableInstance: null;
     style: import("vue").ComputedRef<string> | undefined;
     init: () => import("vue").ComputedRef<string> | undefined;
     setFocus: () => Promise<void>;
@@ -92,6 +93,8 @@ declare const _default: import("vue").DefineComponent<{
     calculateFraction: () => void;
     setInputStatus: (valueRef: Ref<string>, statusRef: Ref<string>, isInteger?: boolean) => true | undefined;
     setInputValueStatus: () => void;
+    setPosition: (position: Position) => void;
+    getPosition: () => Position;
     NIcon: any;
     NSpace: any;
     ArrowUndoSharp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

package/es/components/keyboard/src/components/NumberPanel.vue2.js

@@ -54,6 +54,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   },
   emits: ["change"],
   setup(__props, {
+    expose,
     emit
   }) {
     const props = __props;
@@ -76,25 +77,22 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const denominatorValueStatus = ref("success");
     const keyboardRef = ref(null);
     const inputRef = ref(null);
+    let draggableInstance = null;
     const style = init();
     function init() {
       if (props.defaultValue) {
         inputValue.value = props.defaultValue.toString();
       }
       if (props.drag) {
-        const {
-          x,
-          y,
-          style: style2
-        } = useDraggable(keyboardRef, {
+        draggableInstance = useDraggable(keyboardRef, {
           initialValue: props.positionInitialValue,
-          onMove: (position, event) => {
+          onMove: (position) => {
             var _a, _b, _c, _d;
             position.x += (_b = (_a = props.moveOffset) == null ? void 0 : _a.x) != null ? _b : 0;
             position.y += (_d = (_c = props.moveOffset) == null ? void 0 : _c.y) != null ? _d : 0;
           }
         });
-        return style2;
+        return draggableInstance.style;
       }
     }
     async function setFocus() {
@@ -211,6 +209,28 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     function setInputValueStatus() {
       inputValueStatus.value = !inputValue.value ? "error" : "success";
     }
+    function setPosition(position) {
+      if (draggableInstance) {
+        draggableInstance.x.value = position.x;
+        draggableInstance.y.value = position.y;
+      }
+    }
+    function getPosition() {
+      if (draggableInstance) {
+        return {
+          x: draggableInstance.x.value,
+          y: draggableInstance.y.value
+        };
+      }
+      return {
+        x: 0,
+        y: 0
+      };
+    }
+    expose({
+      setPosition,
+      getPosition
+    });
     watch(() => props.value, (value) => inputValue.value = (value || "").toString(), {
       immediate: true
     });

package/es/components/keyboard/src/types.d.ts

@@ -0,0 +1,17 @@
+import type { Position } from '@vueuse/core';
+export interface KeyboardInstance {
+    /**
+     * 选择输入内容
+     */
+    select: () => void;
+    /**
+     * 手动设置键盘位置
+     * @param position 目标位置 { x: number, y: number }
+     */
+    setPosition: (position: Position) => void;
+    /**
+     * 获取当前键盘位置
+     * @returns 当前位置 { x: number, y: number }
+     */
+    getPosition: () => Position;
+}

package/es/components/keyboard/src/types.js

@@ -0,0 +1 @@
+

package/es/components/vertify/src/components/IdentityVerification.vue2.js

@@ -107,7 +107,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         message.success((data == null ? void 0 : data.msg) || (data == null ? void 0 : data.message));
         emit("success", {
           empNo: toRaw(form.account),
-          busPassword: toRaw(form.password)
+          busPassword: toRaw(form.password),
+          token: (data == null ? void 0 : data.data) || ""
         });
       } catch (error) {
         message.error(error == null ? void 0 : error.message);

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-beta.57";
+var version = "3.3.3-beta.59";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/es/shared/utils/fabricjs/index.js

@@ -12884,7 +12884,7 @@ fabric.Image.filters.BaseFilter.fromObject = function(object, callback) {
         }
       },
       _setTextStyles: function(ctx, charStyle, forMeasuring) {
-        ctx.textBaseline = "alphabetical";
+        ctx.textBaseline = "alphabetic";
         if (this.path) {
           switch (this.pathAlign) {
             case "center":

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.3.3-beta.57",
+	"version": "3.3.3-beta.59",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -74,5 +74,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "b23d52297f4db2219ed53d4026f16ae90ca52799"
+	"gitHead": "240508e2ba7310ed5e84ef48c54cd7222143a0e8"
 }