cnhis-design-vue 3.3.3-beta.42 → 3.3.3-beta.45

package/es/components/info-header/src/components/infoDescription/DescriptionItem.vue2.js

@@ -8,6 +8,9 @@ import { InjectionInfoHeaderFormRef } from '../../constants/index.js';
 import HiddenContent from './HiddenContent.vue.js';
 import InfoEllipsis from './InfoEllipsis.vue.js';
 import script from '../../../../../shared/components/SlotRender/SlotRender.js';
+import { promiseTimeout } from '@vueuse/shared';
+import { findAncestor } from '../../../../../shared/utils/index.js';
+import { castArray } from 'lodash-es';
 import { useFieldListAdaptor } from '../../../../form-render/src/hooks/useFieldListAdaptor.js';
 import { createObjSchema } from '../../../../form-render/src/utils/schema.js';
 
@@ -73,48 +76,63 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     } = useFieldListAdaptor(collector);
     const formModel = useForm();
     const schema = computed(() => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
       const field = props.infoItem.formField;
       if (!field)
         return {};
+      const onBlur = (_a = field.componentProps) == null ? void 0 : _a.onBlur;
+      const bindOnBlur = async (event) => {
+        if (!props.infoItem.edit)
+          return;
+        await promiseTimeout(50);
+        if (findAncestor(document.querySelector(":focus"), (ele) => ele.getAttribute("__infoHeader") === fieldKey))
+          return;
+        const eventTarget = event.target;
+        if (eventTarget && eventTarget.classList.contains("n-base-select-option"))
+          return;
+        if (!formModel || !formModel.value)
+          return;
+        try {
+          const fieldInstance = formModel.value.query(fieldKey).take();
+          await (fieldInstance && isField(fieldInstance) && fieldInstance.validate());
+          setEdit(false);
+          onBlur == null ? void 0 : onBlur(event);
+        } catch (e) {
+        }
+      };
       const fieldKey = props.infoItem[props.labelField];
       const fieldItem = {
         ...field,
-        html_type: (_a = field.html_type) != null ? _a : "INPUT",
+        html_type: (_b = field.html_type) != null ? _b : "INPUT",
         val_key: fieldKey,
         decoratorProps: {
           showLabel: false,
           ...field.decoratorProps,
           style: {
             marginBottom: "-12px",
-            ...(_b = field.decoratorProps) == null ? void 0 : _b.style
+            ...(_c = field.decoratorProps) == null ? void 0 : _c.style
           },
-          async onClickOutside(event) {
-            if (!props.infoItem.edit)
-              return;
-            const eventTarget = event.target;
-            if (eventTarget && eventTarget.classList.contains("n-base-select-option"))
-              return;
-            if (!formModel || !formModel.value)
-              return;
-            try {
-              const fieldInstance = formModel.value.query(fieldKey).take();
-              await (fieldInstance && isField(fieldInstance) && fieldInstance.validate());
-              setEdit(false);
-            } catch (e) {
-            }
-          }
+          __infoHeader: fieldKey
         },
         componentProps: {
           size: "tiny",
           clearable: true,
+          onBlur: bindOnBlur,
           ...field.componentProps,
           style: {
-            fontWeight: ((_c = props.infoItem) == null ? void 0 : _c.bold) ? 700 : 500,
-            ...(_d = field.componentProps) == null ? void 0 : _d.style
+            fontWeight: ((_d = props.infoItem) == null ? void 0 : _d.bold) ? 700 : 500,
+            ...(_e = field.componentProps) == null ? void 0 : _e.style
           }
         }
       };
+      if (fieldItem.suffixConfig) {
+        castArray(field.suffixConfig).forEach((item) => {
+          item.componentProps = {
+            ...item.componentProps,
+            onBlur: bindOnBlur
+          };
+        });
+      }
       pauseTracking();
       fieldItem.default_val = props.infoItem[props.valueField];
       enableTracking();
@@ -122,10 +140,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return createObjSchema(fields);
     });
     watch(() => props.width, (width) => {
-      var _a;
+      var _a, _b;
       if (!width || !props.infoItem.formField)
         return;
-      (_a = formRenderRef.value) == null ? void 0 : _a.setFieldState(props.infoItem[props.labelField], (state) => {
+      const parentNode = (_a = formRenderRef.value) == null ? void 0 : _a.formModel.query(props.infoItem[props.labelField] + "-~").take();
+      if (parentNode) {
+        parentNode.componentProps.style = {
+          ...parentNode.componentProps.style,
+          maxWidth: width + "px"
+        };
+        return;
+      }
+      (_b = formRenderRef.value) == null ? void 0 : _b.setFieldState(props.infoItem[props.labelField], (state) => {
         if (!state.componentProps)
           return;
         state.componentProps.style = {
@@ -162,7 +188,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("section", {
         onDblclick: _cache[0] || (_cache[0] = ($event) => onItemDblclick(__props.infoItem)),
-        onClick: _cache[1] || (_cache[1] = ($event) => onItemClick(__props.infoItem))
+        onClick: _cache[1] || (_cache[1] = ($event) => onItemClick(__props.infoItem)),
+        style: {
+          "min-height": "20px"
+        }
       }, [__props.infoItem.slot ? (openBlock(), createBlock(unref(script), {
         key: 0,
         renderer: __props.infoItem.slot,

package/es/env.d.ts

@@ -1,25 +1,25 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TYPE: string;
-  // 更多环境变量...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
-
-declare module '*.vue' {
-// @ts-ignore
-  import type { App, defineComponent } from 'vue';
-  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
-  // // const component: DefineComponent<{}, {}, any>
-  const component: ReturnType<typeof defineComponent> & {
-    install(app: App): void;
-  };
-  // @ts-ignore
-  export default component;
-}
-
-declare module '*.js';
-
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_APP_TYPE: string;
+  // 更多环境变量...
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
+declare module '*.vue' {
+// @ts-ignore
+  import type { App, defineComponent } from 'vue';
+  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  // // const component: DefineComponent<{}, {}, any>
+  const component: ReturnType<typeof defineComponent> & {
+    install(app: App): void;
+  };
+  // @ts-ignore
+  export default component;
+}
+
+declare module '*.js';
+

package/es/shared/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.3.3-beta.42",
+	"version": "3.3.3-beta.45",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -74,5 +74,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "8e38f2480288b70e5e6fdb233ad1a8541fd792fe"
+	"gitHead": "0e34bd7613d179f6970d9ededc7d08273ea24162"
 }