cnhis-design-vue 3.1.17-beta.7 → 3.1.17

package/es/packages/form-config/style/index.css

@@ -6,6 +6,7 @@
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
   width: 200px;
 }
 .form-config__materialHeader {
@@ -18,6 +19,8 @@
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
+  border: 1px dashed rgba(128, 128, 128, 0.35);
   overflow-y: auto;
   max-height: var(--max-height);
   min-height: 200px;
@@ -27,12 +30,14 @@
 }
 .form-config__materialContentItem {
   cursor: move;
+  justify-content: flex-start;
   grid-column: span var(--item-column) / span var(--item-column);
 }
 .form-config__displayWrapper {
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
   min-width: 400px;
   flex: 1;
   padding: 16px 0;
@@ -47,6 +52,8 @@
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
+  border: 1px dashed rgba(128, 128, 128, 0.35);
   overflow-y: auto;
   max-height: var(--max-height);
   height: fit-content;
@@ -62,6 +69,7 @@
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
   width: 240px;
 }
 .form-config__configHeader {
@@ -74,7 +82,10 @@
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
+  border: 1px dashed rgba(128, 128, 128, 0.35);
   overflow-y: auto;
+  border: none;
   max-height: var(--max-height);
 }
 .form-config__renderer {
@@ -87,7 +98,7 @@
   width: 100%;
   display: flex;
   align-items: center;
-  padding: 8px;
+  padding: 8px 0;
   box-sizing: border-box;
   user-select: none;
   position: relative;
@@ -143,5 +154,5 @@
   visibility: hidden;
   top: 50%;
   transform: translateY(-50%);
-  right: 5px;
+  right: 4px;
 }

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

@@ -4,7 +4,7 @@ import { useField, connect, mapProps } from '@formily/vue';
 import { NFormItem } from 'naive-ui';
 import AnnotationEdit from '../../../../../packages/annotation-edit';
 import { InjectionAnnotation, InjectionFormUUID } from '../../../../../packages/form-render/src/constants';
-import { elementIdEscape } from '../../../../../packages/form-render/src/utils';
+import { dotEscape } from '../../../../../packages/form-render/src/utils';
 
 const script = defineComponent({
   props: {
@@ -42,7 +42,7 @@ const script = defineComponent({
     const field = useField();
     const uuid = inject(InjectionFormUUID);
     const id = computed(() => {
-      return elementIdEscape(`${uuid}-${field.value.path.toString()}`);
+      return dotEscape(`${uuid}-${field.value.path.toString()}`);
     });
     function renderLabel() {
       return showLabel.value ? createVNode("section", {

package/es/packages/form-render/src/utils/dom.js

@@ -1,7 +1,7 @@
-import { elementIdEscape } from '../../../../packages/form-render/src/utils/schema';
+import { dotEscape } from '../../../../packages/form-render/src/utils/schema';
 
 function queryDecorator(key, wrapperElement, formUUID) {
-  return wrapperElement.querySelector(elementIdEscape(`#${formUUID}-${key}`));
+  return wrapperElement.querySelector(dotEscape(`#${formUUID}-${key}`));
 }
 function queryInput(decoratorElement) {
   var _a;

package/es/packages/form-render/src/utils/index.js

@@ -4,7 +4,7 @@ import { isObject } from '@vue/shared';
 import { isNumber, isString, isFunction } from 'lodash-es';
 export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './business.js';
 export { queryDecorator, queryInput } from './dom.js';
-export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './schema.js';
+export { assignUpdateValue, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './schema.js';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);

package/es/packages/form-render/src/utils/schema.d.ts

@@ -4,7 +4,7 @@ import { ISchema } from '@formily/json-schema/esm/types';
 import { DependKeyType, FieldItem } from '../../../../../es/packages/form-render';
 export declare function traverseSchema(schema: ISchema, handler: (_s: ISchema) => void): void;
 export declare function fieldKeyEscape(fieldList: FieldItem[]): string;
-export declare function elementIdEscape(id: string): string;
+export declare function dotEscape(id: string): string;
 export declare function createLinebarId(id: string): string;
 export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
     (dependKey: string, valueKey: string, required?: boolean): void;

package/es/packages/form-render/src/utils/schema.js

@@ -11,13 +11,13 @@ function traverseSchema(schema, handler) {
   }
 }
 function fieldKeyEscape(fieldList) {
-  return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
+  return dotEscape(fieldList.map((f) => f.val_key).join("-"));
 }
-function elementIdEscape(id) {
+function dotEscape(id) {
   return id.replace(/[.]/g, "-");
 }
 function createLinebarId(id) {
-  return elementIdEscape(`id-${id}`);
+  return dotEscape(`id-${id}`);
 }
 function traverseDependKey(dependKeys, handler) {
   if (!dependKeys)
@@ -83,4 +83,4 @@ function createObjSchema(properties) {
   return { type: "object", properties };
 }
 
-export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema };
+export { assignUpdateValue, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema };

package/es/packages/index.css

@@ -538,6 +538,12 @@ body > .vxe-table--tooltip-wrapper {
   margin-right: 6px;
   box-shadow: 0px 2px 4px 0px rgba(99, 129, 249, 0.5);
 }
+.custom-big-table .vxe-table--render-default .vxe-table--fixed-left-wrapper.scrolling--middle {
+  box-shadow: 4px 0 4px 0 rgba(0, 0, 0, 0.12);
+}
+.custom-big-table .vxe-table--render-default .vxe-table--fixed-right-wrapper.scrolling--middle {
+  box-shadow: -4px 0 4px 0 rgba(0, 0, 0, 0.12);
+}
 .annotation-edit {
   cursor: pointer;
   color: #0067ee;
@@ -1096,10 +1102,10 @@ body > .vxe-table--tooltip-wrapper {
 }
 .c-field-set .width-show {
   display: inline-block;
-  width: 10%;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  width: var(--width-show);
 }
 .c-field-set .drag-icon-wrap {
   width: 5% !important;
@@ -1108,30 +1114,30 @@ body > .vxe-table--tooltip-wrapper {
 }
 .c-field-set .width-showed {
   display: inline-block;
-  width: 15%;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  width: 15%;
 }
 .c-field-set .width-showed select {
   width: 90% !important;
 }
 .c-field-set .width-word {
   display: inline-block;
-  width: 20%;
-  line-height: 52px;
   overflow: hidden;
   white-space: nowrap;
+  width: var(--width-large);
+  line-height: 52px;
 }
 .c-field-set .width-word input {
   width: 90% !important;
 }
 .c-field-set .width-large {
   display: inline-block;
-  width: 20%;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  width: var(--width-large);
 }
 .dropdown-button {
   color: #212121;
@@ -3188,6 +3194,7 @@ body > .vxe-table--tooltip-wrapper {
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
   width: 200px;
 }
 .form-config__materialHeader {
@@ -3200,6 +3207,8 @@ body > .vxe-table--tooltip-wrapper {
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
+  border: 1px dashed rgba(128, 128, 128, 0.35);
   overflow-y: auto;
   max-height: var(--max-height);
   min-height: 200px;
@@ -3209,12 +3218,14 @@ body > .vxe-table--tooltip-wrapper {
 }
 .form-config__materialContentItem {
   cursor: move;
+  justify-content: flex-start;
   grid-column: span var(--item-column) / span var(--item-column);
 }
 .form-config__displayWrapper {
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
   min-width: 400px;
   flex: 1;
   padding: 16px 0;
@@ -3229,6 +3240,8 @@ body > .vxe-table--tooltip-wrapper {
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
+  border: 1px dashed rgba(128, 128, 128, 0.35);
   overflow-y: auto;
   max-height: var(--max-height);
   height: fit-content;
@@ -3244,6 +3257,7 @@ body > .vxe-table--tooltip-wrapper {
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
   width: 240px;
 }
 .form-config__configHeader {
@@ -3256,7 +3270,10 @@ body > .vxe-table--tooltip-wrapper {
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
+  border-radius: 8px;
+  border: 1px dashed rgba(128, 128, 128, 0.35);
   overflow-y: auto;
+  border: none;
   max-height: var(--max-height);
 }
 .form-config__renderer {
@@ -3269,7 +3286,7 @@ body > .vxe-table--tooltip-wrapper {
   width: 100%;
   display: flex;
   align-items: center;
-  padding: 8px;
+  padding: 8px 0;
   box-sizing: border-box;
   user-select: none;
   position: relative;
@@ -3325,5 +3342,5 @@ body > .vxe-table--tooltip-wrapper {
   visibility: hidden;
   top: 50%;
   transform: translateY(-50%);
-  right: 5px;
+  right: 4px;
 }

package/es/packages/scale-view/src/hooks/use-component.d.ts

@@ -8002,6 +8002,7 @@ export declare const componentMap: {
             onExplicitOnChange?: ((...args: any[]) => any) | undefined;
             onUpdateLabelData?: ((...args: any[]) => any) | undefined;
         }, {
+            isEdit: boolean;
             item: any;
             isLock: boolean;
             sourceType: string;
@@ -8009,7 +8010,6 @@ export declare const componentMap: {
             explicit: boolean;
             deleteLabel: Function;
             saveLabelItem: Function;
-            isEdit: boolean;
         }>;
         handleLabelColor: typeof import("../../../../src/utils/vexutils").handleLabelColor;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onChange" | "scaleChange" | "vodFileList")[], "onChange" | "scaleChange" | "vodFileList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/packages/select-label/index.d.ts

@@ -7505,6 +7505,7 @@ declare const SelectLabel: SFCWithInstall<import("vue").DefineComponent<{
         onExplicitOnChange?: ((...args: any[]) => any) | undefined;
         onUpdateLabelData?: ((...args: any[]) => any) | undefined;
     }, {
+        isEdit: boolean;
         item: any;
         isLock: boolean;
         sourceType: string;
@@ -7512,7 +7513,6 @@ declare const SelectLabel: SFCWithInstall<import("vue").DefineComponent<{
         explicit: boolean;
         deleteLabel: Function;
         saveLabelItem: Function;
-        isEdit: boolean;
     }>;
     handleLabelColor: typeof import("../../src/utils/vexutils").handleLabelColor;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onChange" | "scaleChange" | "vodFileList")[], "onChange" | "scaleChange" | "vodFileList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -12172,6 +12172,7 @@ declare const LabelFormContent: SFCWithInstall<import("vue").DefineComponent<{
     onExplicitOnChange?: ((...args: any[]) => any) | undefined;
     onUpdateLabelData?: ((...args: any[]) => any) | undefined;
 }, {
+    isEdit: boolean;
     item: any;
     isLock: boolean;
     sourceType: string;
@@ -12179,7 +12180,6 @@ declare const LabelFormContent: SFCWithInstall<import("vue").DefineComponent<{
     explicit: boolean;
     deleteLabel: Function;
     saveLabelItem: Function;
-    isEdit: boolean;
 }>>;
 export default SelectLabel;
 export { LabelFormContent as CLabelFormContent };

package/es/packages/select-label/src/LabelFormContent.vue.d.ts

@@ -4580,6 +4580,7 @@ declare const _default: import("vue").DefineComponent<{
     onExplicitOnChange?: ((...args: any[]) => any) | undefined;
     onUpdateLabelData?: ((...args: any[]) => any) | undefined;
 }, {
+    isEdit: boolean;
     item: any;
     isLock: boolean;
     sourceType: string;
@@ -4587,6 +4588,5 @@ declare const _default: import("vue").DefineComponent<{
     explicit: boolean;
     deleteLabel: Function;
     saveLabelItem: Function;
-    isEdit: boolean;
 }>;
 export default _default;

package/es/packages/select-label/src/SelectLabel.vue.d.ts

@@ -7515,6 +7515,7 @@ declare const _default: import("vue").DefineComponent<{
         onExplicitOnChange?: ((...args: any[]) => any) | undefined;
         onUpdateLabelData?: ((...args: any[]) => any) | undefined;
     }, {
+        isEdit: boolean;
         item: any;
         isLock: boolean;
         sourceType: string;
@@ -7522,7 +7523,6 @@ declare const _default: import("vue").DefineComponent<{
         explicit: boolean;
         deleteLabel: Function;
         saveLabelItem: Function;
-        isEdit: boolean;
     }>;
     handleLabelColor: typeof handleLabelColor;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onChange" | "scaleChange" | "vodFileList")[], "onChange" | "scaleChange" | "vodFileList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.17-beta.7",
+  "version": "3.1.17",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",