cnhis-design-vue 3.1.14-beta.7 → 3.1.14-beta.9

package/es/packages/big-table/src/hooks/useSeparateRow.js

@@ -1,5 +1,5 @@
 import { useMemoize } from '@vueuse/core';
-import { isNumber, isString } from 'lodash-es';
+import { isNumber, isArray, cloneDeep, isString } from 'lodash-es';
 import { ref, computed, provide, watch, nextTick } from 'vue';
 import { InjectionSeparateHandle } from '../../../../packages/big-table/src/constants';
 
@@ -17,7 +17,6 @@ class SeparateHandle {
     this.callbacks.clear();
   }
   trigger() {
-    console.log("trigger");
     this.callbacks.forEach((cb) => cb());
   }
 }
@@ -38,15 +37,15 @@ const getStringWidth = /* @__PURE__ */ useMemoize(function(str) {
       return width + 4;
     }
     if (/[\u4e00-\u9fa5]/.test(char)) {
-      return width + 16;
+      return width + 15;
     }
     if (/-/.test(char)) {
       return width + 4;
     }
-    if (/（|）/.test(char)) {
+    if (/[（）]/.test(char)) {
       return width + 14;
     }
-    if (/\(|\)/.test(char)) {
+    if (/[)(]/.test(char)) {
       return width + 5;
     }
     if (/-/.test(char)) {
@@ -68,7 +67,7 @@ function useSeparateMap() {
   }
   return { separateDataMap, getRowData };
 }
-function useSeparateRow(getColumnConfig, $VXETable) {
+function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
   const needSeparateColumn = computed(() => {
     return getColumnConfig().filter((column) => column.formType === "separate");
   });
@@ -77,11 +76,11 @@ function useSeparateRow(getColumnConfig, $VXETable) {
       return data;
     }
     return data.reduce(async (res, row, dataIndex) => {
-      let parsedRowData = [];
+      const parsedRowData = [];
       for (const column of needSeparateColumn.value) {
         parsedRowData.push({
           columnName: column.columnName,
-          data: contentSeparate(row[column.columnName], await getColumnRenderWidth(column))
+          data: contentSeparate(row[column.columnName], column.columnName, await getColumnRenderWidth(column))
         });
       }
       (await res).push(...Array.from({ length: getColumnInfoMaxLength(parsedRowData) }).map((_, index) => {
@@ -129,10 +128,15 @@ function useSeparateRow(getColumnConfig, $VXETable) {
       }
     }
   }
-  function contentSeparate(value, width) {
+  function contentSeparate(value, columnName, width) {
+    if (isArray(value))
+      return value.map((row) => {
+        var _a, _b, _c;
+        return (_c = (_b = (_a = getFieldItem(columnName)) == null ? void 0 : _a.separateFormatter) == null ? void 0 : _b.call(_a, cloneDeep(row))) != null ? _c : row;
+      });
     if (!isString(value) || !isNumber(width))
       return [value];
-    width -= 20;
+    width -= 24;
     return [...value].reduce((res, char) => {
       const latestString = res[res.length - 1];
       if (getStringWidth(latestString + char) > width) {

package/es/packages/big-table/src/utils.js

@@ -418,7 +418,7 @@ const setFilterStatus = (state, props) => {
         state.filterFields[item.field_key]["CONVERT"] = [];
         return false;
       }
-      const value = item.value.map((item2) => JSON.stringify(item2));
+      const value = item.value;
       state.filterFields[item.field_key]["CONVERT"] = value;
     }
   });

package/es/packages/big-table/style/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;
 }

package/es/packages/fabric-chart/index.d.ts

@@ -26,9 +26,11 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
     gridXNumber: import("vue").ComputedRef<number>;
     gridYNumber: import("vue").ComputedRef<number>;
     endX: import("vue").ComputedRef<number>;
+    endXLimit: import("vue").ComputedRef<number>;
     originX: import("vue").ComputedRef<any>;
     endY: import("vue").ComputedRef<number>;
     originY: import("vue").ComputedRef<number>;
+    originYLimit: import("vue").ComputedRef<number>;
     xCellWidth: import("vue").ComputedRef<number>;
     yCellHeight: import("vue").ComputedRef<number>;
     iconsWidth: import("vue").ComputedRef<any>;

package/es/packages/fabric-chart/src/FabricChart.vue.d.ts

@@ -26,9 +26,11 @@ declare const _default: import("vue").DefineComponent<{
     gridXNumber: import("vue").ComputedRef<number>;
     gridYNumber: import("vue").ComputedRef<number>;
     endX: import("vue").ComputedRef<number>;
+    endXLimit: import("vue").ComputedRef<number>;
     originX: import("vue").ComputedRef<any>;
     endY: import("vue").ComputedRef<number>;
     originY: import("vue").ComputedRef<number>;
+    originYLimit: import("vue").ComputedRef<number>;
     xCellWidth: import("vue").ComputedRef<number>;
     yCellHeight: import("vue").ComputedRef<number>;
     iconsWidth: import("vue").ComputedRef<any>;

package/es/packages/fabric-chart/src/FabricChart.vue_vue_type_script_setup_true_lang.js

@@ -54,11 +54,11 @@ var script = /* @__PURE__ */ defineComponent({
     });
     const gridXNumber = computed(() => {
       const { grid } = props.data;
-      return grid.mainXCell * grid.subXCell;
+      return grid.mainXCell * grid.subXCell + grid.surplusXCell;
     });
     const gridYNumber = computed(() => {
       const { grid } = props.data;
-      return grid.mainYCell * grid.subYCell;
+      return grid.mainYCell * grid.subYCell + grid.surplusYCell;
     });
     const endX = computed(() => {
       const { width, right = null, top } = props.data;
@@ -67,6 +67,10 @@ var script = /* @__PURE__ */ defineComponent({
       const endWidth = right.width || 50;
       return width - endWidth;
     });
+    const endXLimit = computed(() => {
+      const { grid } = props.data;
+      return endX.value - grid.surplusXCell * xCellWidth.value;
+    });
     const originX = computed(() => {
       const { top, left } = props.data;
       const originX2 = top.titleWidth + iconsWidth.value;
@@ -86,6 +90,10 @@ var script = /* @__PURE__ */ defineComponent({
       const topHeight = dateHeight.value + dayHeight + xScaleHeight + hospitalDaysHeight.value + operationDaysHeight.value;
       return topHeight;
     });
+    const originYLimit = computed(() => {
+      const { grid } = props.data;
+      return originY.value + grid.surplusYCell * yCellHeight.value;
+    });
     const xCellWidth = computed(() => {
       return (endX.value - originX.value) / gridXNumber.value;
     });
@@ -178,8 +186,8 @@ var script = /* @__PURE__ */ defineComponent({
         endY: endY.value
       };
       if (painIndex.value === 0) {
-        obj.originY = originY.value;
-        obj.endY = originY.value + painHeight.value;
+        obj.originY = originYLimit.value;
+        obj.endY = originYLimit.value + painHeight.value;
       } else if (painIndex.value === left.yScaleValue.length - 1) {
         obj.originY = endY.value - painHeight.value;
         obj.endY = endY.value;
@@ -193,10 +201,10 @@ var script = /* @__PURE__ */ defineComponent({
         endY: endY.value
       };
       if (painIndex.value === 0) {
-        obj.originY = originY.value + painHeight.value;
+        obj.originY = originYLimit.value + painHeight.value;
         obj.endY = endY.value;
       } else if (painIndex.value === left.yScaleValue.length - 1) {
-        obj.originY = originY.value;
+        obj.originY = originYLimit.value;
         obj.endY = endY.value - painHeight.value;
       }
       return obj;
@@ -240,7 +248,9 @@ var script = /* @__PURE__ */ defineComponent({
       iconsWidth: iconsWidth.value,
       originX: originX.value,
       originY: originY.value,
+      originYLimit: originYLimit.value,
       endX: endX.value,
+      endXLimit: endXLimit.value,
       endY: endY.value,
       xCellWidth: xCellWidth.value,
       yCellHeight: yCellHeight.value,

package/es/packages/fabric-chart/src/hooks/useDraw.js

@@ -62,6 +62,7 @@ function drawPoint(type = "circle", style) {
     originY: "center",
     hasControls: false,
     hasBorders: false,
+    hoverCursor: "pointer",
     ...style
   };
   const createCircleBorder = () => {

package/es/packages/fabric-chart/src/hooks/useLeft.js

@@ -9,13 +9,13 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     originX,
     endX,
     yCellHeight,
-    borderStyle,
     left,
     vitalSignsOriginY,
     painOriginY,
     painHeight,
     iconsWidth,
-    itemList
+    itemList,
+    painIndex
   } = propItems;
   const mainScaleWidth = 9;
   const subScaleWidth = 5;
@@ -86,7 +86,7 @@ ${item.title.slice(-2)}`,
     title.sendToBack();
   }
   function drawScaleValue() {
-    let groupList = [];
+    const groupList = [];
     const column = !painHeight ? left.yScaleValue.length : left.yScaleValue.length - 1;
     const colWidth = (originX - iconsWidth) / column;
     const residue = (originX - iconsWidth) % column;
@@ -96,10 +96,17 @@ ${item.title.slice(-2)}`,
         drwaPainScaleValue(item);
         return;
       }
-      let list = [];
+      const list = [];
+      function createLine(points) {
+        const line2 = new fabric.Line(points, {
+          ...defaultBorderStyle,
+          ...item.style
+        });
+        list.push(line2);
+      }
       const rectWidth = index === 0 ? firstColWidth : colWidth;
       const rectLeft = index === 0 ? iconsWidth : firstColWidth + iconsWidth + (index - 1) * colWidth;
-      const line = index > 0 ? new fabric.Line([rectLeft, vitalSignsOriginY.originY, rectLeft, vitalSignsOriginY.endY], {
+      const line = index > 0 ? new fabric.Line([rectLeft, painIndex == 0 ? vitalSignsOriginY.originY : originY, rectLeft, vitalSignsOriginY.endY], {
         ...defaultBorderStyle
       }) : null;
       line && list.push(line);
@@ -118,13 +125,6 @@ ${item.title.slice(-2)}`,
           if (item.showScale && i !== item.list.length - 1) {
             for (let j = 0; j < 5; j++) {
               if (j > 0 || !item.showNumber || position !== "center") {
-                let createLine = function(points) {
-                  const line2 = new fabric.Line(points, {
-                    ...defaultBorderStyle,
-                    ...item.style
-                  });
-                  list.push(line2);
-                };
                 const x1 = j == 0 ? lineXMain[0] : lineXSub[0];
                 const x2 = j == 0 ? lineXMain[1] : lineXSub[1];
                 const y = top - j * spaceScale;
@@ -164,9 +164,9 @@ ${item.title.slice(-2)}`,
     group && group.sendToBack();
   }
   function drawIcons() {
-    let list = JSON.parse(JSON.stringify(itemList));
+    const list = JSON.parse(JSON.stringify(itemList));
     let topY = endY;
-    let leftX = iconsWidth - left.icons.marginRight;
+    const leftX = iconsWidth - left.icons.marginRight;
     list.reverse().forEach((item, index) => {
       topY -= 10;
       let title = item.title.replace(/(.{2})/g, "$1\n");

package/es/packages/fabric-chart/src/hooks/useRight.js

@@ -3,25 +3,14 @@ import { fabric } from '../utils/index.js';
 import { defaultBorderStyle, defaultRectStyle, defaultStyle } from './useDraw.js';
 
 function useRight(canvas, propItems) {
-  const {
-    endX,
-    endY,
-    temperatureYCell,
-    canvasWidth,
-    canvasHeight,
-    left,
-    right,
-    breathingHeight,
-    vitalSignsOriginY,
-    painOriginY
-  } = propItems;
+  const { endX, endY, temperatureYCell, canvasWidth, canvasHeight, left, right, breathingHeight, vitalSignsOriginY } = propItems;
   function drawScaleValue() {
     var _a, _b, _c;
     if (!right) {
       canvas.value.add(new fabric.Line([canvasWidth - 1, 0, canvasWidth - 1, canvasHeight], defaultBorderStyle));
       return false;
     }
-    let list = [];
+    const list = [];
     list.push(new fabric.Rect({
       ...defaultRectStyle,
       width: canvasWidth - endX - 1,

package/es/packages/fabric-chart/src/hooks/useTop.js

@@ -1,24 +1,23 @@
 import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
-import { defaultStyle, drawTextGroup, defaultTextStyle, defaultRectStyle } from './useDraw.js';
+import { defaultBorderStyle, defaultStyle, drawTextGroup, defaultTextStyle, defaultRectStyle } from './useDraw.js';
 
 function useTop(canvas, propItems) {
   const {
-    originY,
     grid,
     originX,
     xCellWidth,
     gridXNumber,
     top,
-    dateHeight,
-    hospitalDaysHeight,
-    operationDaysHeight,
     xScalevalueHeight,
     iconsWidth,
-    topList
+    topList,
+    endXLimit,
+    canvasWidth
   } = propItems;
   function drawTop() {
-    let list = [];
+    const list = [];
+    endXLimit && list.push(new fabric.Line([endXLimit, 0, canvasWidth, 0], defaultBorderStyle));
     let topY = 0;
     topList.forEach((item, index) => {
       if (index > 0) {
@@ -53,7 +52,7 @@ function useTop(canvas, propItems) {
       top: topY
     });
     list.push(title);
-    let timeList = [];
+    const timeList = [];
     for (let j = 0; j < grid.mainXCell; j++) {
       timeList.push(top.xScalevalue.list);
     }
@@ -80,7 +79,7 @@ function useTop(canvas, propItems) {
       return false;
     const height = top.dayHeight;
     const width = xCellWidth * grid.subSecondXCell;
-    const dayList = gridXNumber / grid.subSecondXCell;
+    const dayList = (gridXNumber - grid.surplusXCell) / grid.subSecondXCell;
     for (let i = 0; i < dayList; i++) {
       const left = originX + i * width;
       const value = i % 2 === 0 ? "\u4E0A\u5348" : "\u4E0B\u5348";
@@ -99,7 +98,7 @@ function useTop(canvas, propItems) {
     }
   }
   function drawDate(item, list, topY) {
-    let height = propItems[`${item.key}Height`];
+    const height = propItems[`${item.key}Height`];
     const title = drawTextGroup({
       width: originX - iconsWidth,
       height,

package/es/packages/fabric-chart/src/interface.d.ts

@@ -14,6 +14,8 @@ interface IGrid {
     subSecondXCell: number;
     mainYCell: number;
     subYCell: number;
+    surplusXCell: number;
+    surplusYCell: number;
     mainLineStyle?: ImainLineStyle;
     subLineStyle?: fabric.ILineOptions;
     subSecondLineStyle?: fabric.ILineOptions;
@@ -45,7 +47,9 @@ export interface IPropItems {
     iconsWidth: number;
     originX: number;
     originY: number;
+    originYLimit: number;
     endX: number;
+    endXLimit: number;
     endY: number;
     xCellWidth: number;
     yCellHeight: number;

package/es/packages/form-render/src/components/renderer/cascader.d.ts

@@ -8,7 +8,7 @@ declare type DependKeyObj = {
 declare type UrlConfig = {
     method: FormRequestType;
     nameKey: string;
-    dependKey: ArrayAble<string> | ArrayAble<DependKeyObj>;
+    dependKey: ArrayAble<string> | Record<string, string> | ArrayAble<DependKeyObj>;
     url: string;
     valueKey: string;
 };

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

@@ -1,8 +1,8 @@
 import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { isObject, isString } from 'lodash-es';
+import { isObject } from 'lodash-es';
 import { InjectAsyncQueue } from '../../constants/index.js';
-import { assignUpdateValue, formRenderLog, arrayed } from '../../utils/index.js';
+import { assignUpdateValue, formRenderLog, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCascader } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
@@ -74,12 +74,8 @@ const script = defineComponent({
           lvlnr: deep + 1 + ""
         };
         if (option2 && config2.dependKey) {
-          arrayed(config2.dependKey).forEach((key) => {
-            if (isString(key)) {
-              params[key] = option2[valueKey.value];
-            } else if (isObject(key)) {
-              params[key.paramName] = option2[key.paramValue];
-            }
+          traverseDependKey(config2.dependKey, (dependKey, valueKey2) => {
+            params[valueKey2] = option2[dependKey];
           });
         }
         return {

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

@@ -1,5 +1,5 @@
-import { defineComponent, computed, createVNode, Fragment } from 'vue';
-import { createSlot, assignUpdateValue } from '../../utils/index.js';
+import { defineComponent, createVNode } from 'vue';
+import { createInputSlot, assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
 
@@ -13,21 +13,10 @@ const script = defineComponent({
       type: String
     }
   },
-  setup(props, {
-    attrs
-  }) {
-    const _slots = 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;
-    });
+  setup(props) {
+    const _slots = createInputSlot(props);
     return () => {
-      return createVNode(NInput, attrs, _slots.value);
+      return createVNode(NInput, null, _slots.value);
     };
   }
 });

package/es/packages/form-render/src/components/renderer/inputNumber.d.ts

@@ -1,5 +1,17 @@
 export declare const INPUT_NUMBER: import("vue").DefineComponent<{
     onChange: {};
+    prefix: {
+        type: StringConstructor;
+    };
+    suffix: {
+        type: StringConstructor;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     onChange: {};
+    prefix: {
+        type: StringConstructor;
+    };
+    suffix: {
+        type: StringConstructor;
+    };
 }>>, {}>;

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

@@ -1,15 +1,22 @@
 import { defineComponent, createVNode } from 'vue';
-import { assignUpdateValue } from '../../utils/index.js';
+import { createInputSlot, assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInputNumber } from 'naive-ui';
 
 const script = defineComponent({
   props: {
-    onChange: {}
+    onChange: {},
+    prefix: {
+      type: String
+    },
+    suffix: {
+      type: String
+    }
   },
-  setup(_) {
+  setup(props) {
+    const _slots = createInputSlot(props);
     return () => {
-      return createVNode(NInputNumber, null, null);
+      return createVNode(NInputNumber, null, _slots.value);
     };
   }
 });

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

@@ -2,7 +2,7 @@ import { defineComponent, ref, inject, computed, watch, nextTick, createVNode }
 import { isField } from '@formily/core';
 import { cloneDeep } from 'lodash-es';
 import { InjectAsyncQueue, InjectionFormItemDepsCollector, InjectionChangeContextCollector } from '../../constants/index.js';
-import { assignUpdateValue, formRenderLog, generateUrlParams } from '../../utils/index.js';
+import { assignUpdateValue, formRenderLog, traverseDependKey } from '../../utils/index.js';
 import { isObject } from '@vueuse/core';
 import { connect, mapProps } from '@formily/vue';
 import { NSelect } from 'naive-ui';
@@ -65,9 +65,16 @@ const script = defineComponent({
         remoteOptions.value = null;
       }
       function createParams(config2, field2) {
+        const _params = {};
+        traverseDependKey(config2.dependKey, (dependKey, valueKey2) => {
+          const _field = field2.query(dependKey).take();
+          if (isField(_field)) {
+            _params[valueKey2] = _field.value;
+          }
+        });
         return {
           ...config2,
-          params: Object.assign({}, config2.params, generateUrlParams(field2, config2.dependKey))
+          params: Object.assign({}, config2.params, _params)
         };
       }
     }

package/es/packages/form-render/src/hooks/useFieldListAdaptor.js

@@ -108,7 +108,9 @@ function useFieldListAdaptor(collector, uuid) {
     Object.assign(schema["x-component-props"], {
       precision: decimal_length || (validate == null ? void 0 : validate.decimal_length),
       max: validate == null ? void 0 : validate.max_value,
-      min: validate == null ? void 0 : validate.min_value
+      min: validate == null ? void 0 : validate.min_value,
+      prefix: item.prefix,
+      suffix: item.suffix
     });
     return schema;
   };

package/es/packages/form-render/src/types/fieldItem.d.ts

@@ -64,7 +64,7 @@ export declare type FieldItem = {
     urlConfig: Partial<{
         url: string;
         method: 'post' | 'get' | 'put' | 'patch' | 'delete';
-        dependKey: string | string[];
+        dependKey: string | string[] | Record<string, string>;
         params: AnyObject;
         nameKey: string;
         valueKey: string;

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>> | {
@@ -28,3 +33,4 @@ 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<{}, {}>>>;