cnhis-design-vue 3.1.14-beta.0 → 3.1.14-beta.11

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

@@ -1,7 +1,7 @@
 import { AnyObject, ArrayAble } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { GeneralField } from '@formily/core';
-import { InjectionKey, VNode } from 'vue';
+import { FunctionalComponent, InjectionKey, VNode } from 'vue';
 import { AgeContext, FieldItem, IdCardParseInfo } from '../types';
 export declare function formRenderLog(message: string, type?: keyof Console): void;
 export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
@@ -14,7 +14,12 @@ export declare function isMobile(mobile: string): boolean;
 export declare function parseBirthday(birthday: string): AgeContext;
 export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
-export declare function generateUrlParams(field: GeneralField, dependKeys?: string | string[]): AnyObject;
+export declare function traverseDependKey(dependKeys: ArrayAble<string> | Record<string, string> | ArrayAble<{
+    paramName: string;
+    paramValue: string;
+}>, handler: {
+    (dependKey: string, valueKey: string): void;
+}): void;
 export declare function traverseSchema(schema: ISchema, handler: (_s: ISchema) => void): void;
 export declare function uuidGenerator(): string;
 export declare function createSlot(renderer: unknown, props: any): Record<string, () => ArrayAble<VNode>> | {
@@ -27,3 +32,5 @@ export declare function queryInput(decoratorElement?: HTMLElement | null): {
 };
 export declare function getParentLinebar(key: string, fieldList: FieldItem[]): string | null;
 export declare function createLinebarId(id: string): string;
+export declare function fieldKeyEscape(fieldList: FieldItem[]): string;
+export declare function createInputSlot(props: AnyObject): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;

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

@@ -1,11 +1,11 @@
-import { isObject, isFunction } from 'lodash-es';
+import { inject, provide, computed, createVNode, Fragment } from 'vue';
+import { isArray, isObject, isString, isFunction } from 'lodash-es';
 import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
 import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.js';
 import differenceInMonths from '../../../../node_modules/date-fns/esm/differenceInMonths/index.js';
 import differenceInYears from '../../../../node_modules/date-fns/esm/differenceInYears/index.js';
 import '../../../../node_modules/date-fns/esm/parse/_lib/parsers/index.js';
-import { inject, provide } from 'vue';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);
@@ -16,7 +16,9 @@ function arrayed(maybeArray) {
   return [maybeArray];
 }
 function assignUpdateValue(props, field) {
-  const _props = { ...props };
+  const _props = {
+    ...props
+  };
   if (isField(field)) {
     Object.assign(_props, {
       "onUpdate:value"(value) {
@@ -69,17 +71,29 @@ function injectOrProvide(key, creator) {
   }
   return injected;
 }
-function generateUrlParams(field, dependKeys) {
-  const result = {};
-  if (dependKeys) {
-    arrayed(dependKeys).forEach((dependKey) => {
-      const _field = field.query(dependKey).take();
-      if (isField(_field)) {
-        result[dependKey] = _field.value;
-      }
-    });
+function traverseDependKey(dependKeys, handler) {
+  if (!dependKeys)
+    return;
+  Object.entries(createDependKeyMap()).forEach(([dependKey, valueKey]) => {
+    handler(dependKey, valueKey);
+  });
+  function createDependKeyMap() {
+    let result = {};
+    if (isArray(dependKeys)) {
+      dependKeys.forEach((k) => {
+        if (isObject(k)) {
+          result[k.paramName] = k.paramValue;
+        } else {
+          result[k] = k;
+        }
+      });
+    } else if (isObject(dependKeys)) {
+      result = dependKeys;
+    } else if (isString(dependKeys)) {
+      result[dependKeys] = dependKeys;
+    }
+    return result;
   }
-  return result;
 }
 function traverseSchema(schema, handler) {
   handler(schema);
@@ -139,5 +153,20 @@ function getParentLinebar(key, fieldList) {
 function createLinebarId(id) {
   return `id-${id}`;
 }
+function fieldKeyEscape(fieldList) {
+  return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
+}
+function createInputSlot(props) {
+  return computed(() => {
+    const res = {};
+    if (props.prefix) {
+      res.prefix = () => createVNode(Fragment, null, [createSlot(props.prefix, props).default()]);
+    }
+    if (props.suffix) {
+      res.suffix = () => createVNode(Fragment, null, [createSlot(props.suffix, props).default()]);
+    }
+    return res;
+  });
+}
 
-export { arrayed, assignUpdateValue, createLinebarId, createSlot, formRenderLog, generateUrlParams, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };

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

@@ -1,3 +1,18 @@
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}
 .form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
@@ -21,24 +36,11 @@
 .form-render__formItemLabel--text.has-annotation {
   margin-right: 15px;
 }
-.form-render__formItemLabel--icon {
-  display: inline-flex;
-  align-items: center;
-}
 .form-render__formItemLabel--annotation {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
-  cursor: pointer;
-  color: #0067ee;
-  font-size: 16px;
-  user-select: none;
-  display: inline-flex;
-  align-items: center;
-}
-.form-render__formItemLabel--annotation.is-active {
-  color: rgba(255, 152, 40);
 }
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
@@ -132,9 +134,9 @@
 .form-render .n-form-item-label {
   display: inline-flex;
 }
-.form-render .n-form-item-label [form-item-hover-show='true'] {
+.form-render .n-form-item-label [annotation-hover-show='true'] {
   visibility: hidden;
 }
-.form-render .n-form-item-label:hover [form-item-hover-show='true'] {
+.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
   visibility: visible;
 }

package/es/packages/index.css

@@ -18,7 +18,7 @@
   margin-top: 6px;
 }
 .big-table-filter-wrap .sort-item {
-  line-height: 32px;
+  height: 32px;
   padding: 0 13px;
   display: flex;
   align-items: center;
@@ -97,7 +97,7 @@
 }
 .big-table-filter-wrap .checkbox-btn-wrap {
   display: flex;
-  padding: 9px 10px 19px 14px;
+  padding: 9px 10px 9px 14px;
 }
 .big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn {
   width: 56px;
@@ -131,6 +131,16 @@
   width: 25px;
   height: 20px;
 }
+.big-table__separate {
+  padding: 4px;
+}
+.big-table__separatePlaceholder {
+  display: inline-block;
+  visibility: hidden;
+  max-width: 0;
+  word-break: keep-all;
+  width: 0;
+}
 body > .vxe-table--tooltip-wrapper {
   display: none !important;
 }
@@ -139,6 +149,9 @@ body > .vxe-table--tooltip-wrapper {
   /* 行内表单样式 */
   /* 行内表单样式 */
 }
+.custom-big-table .n-input {
+  width: fit-content;
+}
 .custom-big-table .img-wrap {
   padding: 2px 0;
   line-height: 1;
@@ -2643,6 +2656,21 @@ body > .vxe-table--tooltip-wrapper {
   font-size: 14px;
   text-decoration: none !important;
 }
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}
 .form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
@@ -2666,24 +2694,11 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__formItemLabel--text.has-annotation {
   margin-right: 15px;
 }
-.form-render__formItemLabel--icon {
-  display: inline-flex;
-  align-items: center;
-}
 .form-render__formItemLabel--annotation {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
-  cursor: pointer;
-  color: #0067ee;
-  font-size: 16px;
-  user-select: none;
-  display: inline-flex;
-  align-items: center;
-}
-.form-render__formItemLabel--annotation.is-active {
-  color: rgba(255, 152, 40);
 }
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
@@ -2777,10 +2792,10 @@ body > .vxe-table--tooltip-wrapper {
 .form-render .n-form-item-label {
   display: inline-flex;
 }
-.form-render .n-form-item-label [form-item-hover-show='true'] {
+.form-render .n-form-item-label [annotation-hover-show='true'] {
   visibility: hidden;
 }
-.form-render .n-form-item-label:hover [form-item-hover-show='true'] {
+.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
   visibility: visible;
 }
 .c-fabric-chart-popup-tip,

package/es/packages/index.d.ts

@@ -22,6 +22,7 @@ import CShortcutSetter from './shortcut-setter';
 export * from './form-render';
 export * from './shortcut-provider';
 export * from './big-table';
+export * from './button-print';
 declare function install(app: App): void;
 export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, CStepsWheel, Editor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter };
 declare const _default: {

package/es/packages/index.js

@@ -55,6 +55,7 @@ export { useFormContext } from './form-render/src/hooks/useFormContext.js';
 export { ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';
 export { useShortcutSignature } from './shortcut-provider/src/hooks/useShortcutSignature.js';
 export { useColumnConfigAdaptor } from './big-table/src/hooks/useColumnConfigAdaptor.js';
+export { Print } from './button-print/src/utils/print.js';
 
 const components = {
   CGrid: Grid,