cnhis-design-vue 3.1.37-beta.0 → 3.1.37-beta.2

package/es/components/button-print/src/utils/print.js

@@ -1,5 +1,4 @@
 import axios from 'axios';
-import { isArray } from 'lodash-es';
 import { IdentityVerificationDialog, PreviewDialog } from './dialog.js';
 import { isIReport, useBrowserPrint } from './browserPrint.js';
 import { getCurrentInstance } from 'vue';
@@ -318,11 +317,7 @@ class Print {
           onReject(null);
         if (isIReport(params.formatId))
           return onResolve(res);
-        onResolve(await this._downloadPDF(getFiledir(res.filedir)));
-        function getFiledir(filedir) {
-          const result = JSON.parse(filedir);
-          return isArray(result) ? result[0] || "" : "";
-        }
+        onResolve(await this._downloadPDF(res.filedir));
       },
       (err) => onReject(err),
       "downloadPDF"

package/es/components/fabric-chart/src/FabricChart.vue.js

@@ -3,32 +3,32 @@ import { fabric } from './utils/index.js';
 import PopupTip from './components/PopupTip.vue.js';
 import PopupMenu from './components/PopupMenu.js';
 import useTemperatureChart from './hooks/useTemperatureChart.js';
+import useBirthProcessChart from './hooks/useBirthProcessChart.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FabricChart",
   props: {
-    mode: { type: String, default: "temperature" },
+    type: { type: String, default: "temperature" },
     data: { type: Object, required: true },
     addRenderItem: { type: Function }
   },
   emits: [
     "change",
     "add",
-    "delete",
+    "remove",
     "select"
   ],
   setup(__props, { expose, emit: emits }) {
     const props = __props;
-    computed(() => props.mode === "temperature");
+    const isTemperature = computed(() => props.type === "temperature");
     const canvasRef = ref(null);
     const canvas = ref();
-    const { propItems, redrawPoints, select, pointTipProps, pointMenuProps, clickMenu } = useTemperatureChart(
-      canvas,
-      props,
-      emits,
-      canvasRef
-    );
+    const { propItems, redrawPoints, select, pointTipProps, pointMenuProps, clickMenu } = init();
+    function init() {
+      const params = [canvas, props, emits, canvasRef];
+      return isTemperature.value ? useTemperatureChart(...params) : useBirthProcessChart(...params);
+    }
     onMounted(() => {
       canvas.value = new fabric.Canvas(canvasRef.value, {
         width: propItems.canvasWidth,

package/es/components/fabric-chart/src/hooks/useBirthProcess.js

@@ -1,15 +1,13 @@
-import { reactive, onMounted, nextTick } from 'vue';
 import { useBirthProcessCumputedPoint } from './useCumputedPoint.js';
 import useGrid from './useGrid.js';
-import { drawLine, drawPoint, drawText, defaultTextStyle, defaultRectStyle } from './useDraw.js';
+import { drawLine, drawPoint, defaultTextStyle, drawText, defaultRectStyle } from './useDraw.js';
 import { fabric } from '../utils/index.js';
 import { getIndex, isEffectiveNode } from '../utils/utils.js';
-import { useCommon } from './useCommon.js';
 import { cloneDeep } from 'lodash-es';
 
-function useBirthProcess(canvas, propItems, emits) {
+function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps, commonFunc) {
   const { cumputedX, cumputedY, getXValue, getYValue } = useBirthProcessCumputedPoint(propItems);
-  const { getEqualXTypes } = useCommon(canvas);
+  const { getEqualXTypes, repeatTip } = commonFunc;
   const {
     xAxis,
     grid,
@@ -30,20 +28,18 @@ function useBirthProcess(canvas, propItems, emits) {
     event,
     originYCervix
   } = propItems;
-  const pointTipProps = reactive({
-    show: false,
-    point: { x: 0, y: 0 },
-    list: []
-  });
-  const pointMenuProps = reactive({
-    show: false,
-    point: { x: 0, y: 0 },
-    list: [],
-    target: null
-  });
   const yScaleValue = cloneDeep(scaleValues);
   const gridPoints = /* @__PURE__ */ new Set();
   useGrid(canvas, propItems, true);
+  init();
+  function init() {
+    drawYScale();
+    drawXScale();
+    drawBorder();
+    drawPolyLine();
+    setCanvasEvent();
+    drawIcons();
+  }
   function drawPolyLine() {
     yScaleValue.forEach((item, dataIndex) => {
       var _a;
@@ -161,8 +157,8 @@ function useBirthProcess(canvas, propItems, emits) {
     const { dataIndex, data, index, key } = params;
     const item = yScaleValue.find((v) => v.key === key);
     switch (mode) {
-      case "delete":
-        item.data.splice(index, 0);
+      case "remove":
+        item.data.splice(index, 1);
         break;
       case "change":
         item.data[index] = data;
@@ -240,7 +236,7 @@ function useBirthProcess(canvas, propItems, emits) {
             pointMenuProps.target = null;
             pointMenuProps.list = ["\u65B0\u589E\u8282\u70B9"];
             yScaleValue.forEach((item) => {
-              if (!getEqualXTypes(x, "key").includes(item.key)) {
+              if (!getEqualXTypes(x, "key", xCellWidth).includes(item.key)) {
                 if (["cervix", "fetalPresentation"].includes(item.key) && y < originYCervix)
                   return;
                 pointMenuProps.list.push(getPointMenuList(item, event2.pointer));
@@ -248,17 +244,19 @@ function useBirthProcess(canvas, propItems, emits) {
             });
             if (pointMenuProps.list.length === 1) {
               pointMenuProps.show = false;
+              repeatTip();
               console.log("\u5F53\u524D\u65F6\u95F4\u6BB5\u5185\u65E0\u53EF\u65B0\u589E\u8282\u70B9");
             }
           } else {
             pointMenuProps.target = event2.target;
             pointMenuProps.list = ["\u5220\u9664\u8282\u70B9"];
-            yScaleValue.forEach((item) => {
-              if (getEqualXTypes(x, "key").includes(item.key)) {
+            canvas.value.forEachObject((obj) => {
+              if (obj.origin && obj.left === event2.target.left && obj.top === event2.target.top) {
                 pointMenuProps.list.push({
-                  ...getPointMenuList(item, event2.pointer),
-                  mode: "delete",
-                  index: event2.target.origin.index
+                  renderItem: () => obj.origin.title,
+                  origin: { ...obj.origin },
+                  mode: "remove",
+                  pointer: event2.pointer
                 });
               }
             });
@@ -283,20 +281,120 @@ function useBirthProcess(canvas, propItems, emits) {
   function clickMenu({ item, target }) {
     console.log("item :>> ", item);
     const params = {
-      data: {
-        time: getXValue(item.pointer.x),
-        value: getYValue(item.origin.key, item.pointer.y)
-      },
       ...item.origin
     };
-    if (item.mode === "delete") {
-      emits("delete", params);
-      updateData(params, "delete");
+    if (item.mode === "remove") {
+      emits("remove", params);
+      updateData(params, "remove");
     } else {
+      Object.assign(params, {
+        data: {
+          time: getXValue(item.pointer.x),
+          value: getYValue(item.origin.key, item.pointer.y)
+        }
+      });
       emits("add", params);
       updateData(params);
     }
   }
+  function drawIcons() {
+    const leftX = leftAddAreaWidth / 2;
+    const rightX = canvasWidth - rightAddAreaWidth / 2;
+    _drawIcons(leftScales, leftX);
+    _drawIcons(rightScales, rightX);
+    function _drawIcons(scales, left) {
+      if (!scales.length)
+        return;
+      let topY = originY;
+      const objs = [];
+      scales.forEach((item) => {
+        const title = item.title.split("").join("\n");
+        const dataIndex = scaleValues.findIndex((_item) => _item.key === item.key);
+        const text = new fabric.Text(String(title), {
+          ...defaultTextStyle,
+          ...item.titleStyle || {},
+          originY: "top",
+          left,
+          top: topY,
+          lineHeight: 1
+        });
+        const icon = drawPoint(item.type, {
+          left,
+          top: topY + text.height + 3,
+          ...item.pointAttr,
+          originY: "top",
+          origin: {
+            title: item.title,
+            unit: item.unit,
+            type: item.type,
+            dataIndex,
+            key: item.key,
+            isMenu: true
+          },
+          originLeft: left,
+          originTop: topY + text.height + 3,
+          ...propItems.event
+        });
+        topY += text.height + icon.height + 15;
+        setIconEvent(icon);
+        objs.push(text, icon);
+      });
+      setVerticalCenter(objs);
+      canvas.value.add(...objs);
+    }
+    function setVerticalCenter(objs) {
+      const lastobj = objs.at(-1);
+      const wrapHalf = (endY - originY) / 2;
+      const contentHalf = (lastobj.height + lastobj.top - originY) / 2;
+      objs.forEach((obj) => {
+        const top = obj.top + wrapHalf - contentHalf;
+        obj.set({
+          top,
+          originTop: top
+        });
+      });
+    }
+  }
+  function setIconEvent(point) {
+    point.on("moving", () => {
+      point.set("originY", "center");
+      if (isLimit2(point)) {
+        moveLimit(point);
+        setPopup(point);
+      } else {
+        pointTipProps.show = false;
+      }
+    });
+    point.on("mouseup:before", (event2) => {
+      pointTipProps.show = false;
+      if (event2.e.button === 0) {
+        if (isLimit2(point)) {
+          const isRepeat = getEqualXTypes(point.left, "key", xCellWidth).includes(point.origin.key);
+          if (isRepeat) {
+            repeatTip();
+          } else {
+            const params = {
+              data: {
+                time: getXValue(point.left),
+                value: getYValue(point.origin.key, point.top)
+              },
+              ...point.origin
+            };
+            emits("add", params);
+            updateData(params);
+          }
+        }
+      }
+      setRestore(point);
+    });
+    function isLimit2(point2) {
+      const { left, top } = point2;
+      return left >= originX && left <= endX && top >= originY && top <= endY;
+    }
+  }
+  function setRestore(point) {
+    point.setCoords().set({ originY: "top", left: point.originLeft, top: point.originTop });
+  }
   function drawXScale() {
     const { show, startTime: startTime2, range = [0, 23], position = "top", style } = xAxis.time;
     const { show: processTimeShow, range: processTimeRange = [0, 23], style: processTimeStyle } = xAxis.processTime;
@@ -400,18 +498,7 @@ function useBirthProcess(canvas, propItems, emits) {
     });
     canvas.value.add(border);
   }
-  onMounted(() => {
-    nextTick(() => {
-      drawYScale();
-      drawXScale();
-      drawBorder();
-      drawPolyLine();
-      setCanvasEvent();
-    });
-  });
   return {
-    pointTipProps,
-    pointMenuProps,
     clickMenu
   };
 }

package/es/components/fabric-chart/src/hooks/useBirthProcessChart.js

@@ -0,0 +1,151 @@
+import { ref, reactive, computed, onMounted, nextTick } from 'vue';
+import { defaultBorderStyle } from './useDraw.js';
+import '../utils/index.js';
+import './useShadow.js';
+import 'lodash-es';
+import { useEvent, useCanvasEvent } from './useEvent.js';
+import { useBirthProcess } from './useBirthProcess.js';
+import { useCommon } from './useCommon.js';
+
+function useBirthProcessChart(canvas, props, emits, canvasRef) {
+  const select = ref();
+  const redrawPoints = ref();
+  const clickMenu = ref();
+  const pointTipProps = reactive({
+    show: false,
+    point: { x: 0, y: 0 },
+    list: []
+  });
+  const pointMenuProps = reactive({
+    show: false,
+    point: { x: 0, y: 0 },
+    list: [],
+    target: null
+  });
+  const leftScales = computed(() => props.data.scaleValues.filter((item) => item.layout === "left"));
+  const rightScales = computed(() => props.data.scaleValues.filter((item) => item.layout === "right"));
+  const leftAddAreaWidth = 30;
+  const rightAddAreaWidth = computed(() => {
+    var _a;
+    return !((_a = rightScales.value) == null ? void 0 : _a.length) ? 0 : 30;
+  });
+  const originX = computed(() => {
+    var _a;
+    const leftScalesWidth = (_a = leftScales.value) == null ? void 0 : _a.reduce((width, item) => {
+      width += item.width;
+      return width;
+    }, 0);
+    return leftAddAreaWidth + leftScalesWidth;
+  });
+  const endX = computed(() => {
+    var _a;
+    const { width } = props.data;
+    const rightScalesWidth = (_a = rightScales.value) == null ? void 0 : _a.reduce((width2, item) => {
+      width2 += item.width;
+      return width2;
+    }, 0);
+    return width - rightAddAreaWidth.value - rightScalesWidth;
+  });
+  const gridXNumber = computed(() => props.data.grid.mainXCell);
+  const gridYNumber = computed(() => props.data.grid.mainYCell);
+  const xCellWidth = computed(() => {
+    return (endX.value - originX.value) / gridXNumber.value;
+  });
+  const yCellHeight = computed(() => {
+    const { xAxis, height } = props.data;
+    const xAxisNumber = Object.values(xAxis).reduce((num, item) => {
+      if (item.show)
+        num++;
+      return num;
+    }, 0);
+    return height / (gridYNumber.value + xAxisNumber);
+  });
+  const originY = computed(() => yCellHeight.value);
+  const originYCervix = computed(() => {
+    const { scaleValues } = props.data;
+    const cervixItem = scaleValues.find((item) => item.key === "cervix");
+    const [, max] = (cervixItem == null ? void 0 : cervixItem.range) || [0, 10];
+    const spaceValue = (cervixItem == null ? void 0 : cervixItem.spaceValue) || 1;
+    return endY.value - max * spaceValue * yCellHeight.value;
+  });
+  const endY = computed(() => {
+    const { height } = props.data;
+    return height - yCellHeight.value;
+  });
+  const startTime = computed(() => new Date(props.data.xAxis.time.startTime).getTime());
+  const timeXCell = computed(() => 1 * 60 * 60 * 1e3 / xCellWidth.value);
+  const cervixYCell = computed(() => {
+    const { scaleValues } = props.data;
+    const cervixItem = scaleValues.find((item) => item.key === "cervix");
+    return ((cervixItem == null ? void 0 : cervixItem.spaceValue) || 1) / yCellHeight.value;
+  });
+  const FHRYCell = computed(() => {
+    const { scaleValues } = props.data;
+    const cervixItem = scaleValues.find((item) => item.key === "FHR");
+    return ((cervixItem == null ? void 0 : cervixItem.spaceValue) || 10) / yCellHeight.value;
+  });
+  const fetalPresentationYCell = computed(() => {
+    const { scaleValues } = props.data;
+    const cervixItem = scaleValues.find((item) => item.key === "fetalPresentation");
+    return ((cervixItem == null ? void 0 : cervixItem.spaceValue) || 1) / yCellHeight.value;
+  });
+  const event = computed(() => {
+    var _a;
+    return ((_a = props.data.grid) == null ? void 0 : _a.event) || { selectable: true, evented: true, hovered: true };
+  });
+  const propItems = reactive({
+    canvasWidth: props.data.width,
+    canvasHeight: props.data.height,
+    borderStyle: { ...defaultBorderStyle, ...props.data.borderStyle },
+    selectionStyle: props.data.selectionStyle || {},
+    grid: props.data.grid,
+    originX: originX.value,
+    endX: endX.value,
+    originY: originY.value,
+    endY: endY.value,
+    xCellWidth: xCellWidth.value,
+    yCellHeight: yCellHeight.value,
+    gridXNumber: gridXNumber.value,
+    gridYNumber: gridYNumber.value,
+    xAxis: props.data.xAxis,
+    leftScales: leftScales.value,
+    rightScales: rightScales.value,
+    leftAddAreaWidth,
+    rightAddAreaWidth: rightAddAreaWidth.value,
+    startTime: startTime.value,
+    timeXCell: timeXCell.value,
+    cervixYCell: cervixYCell.value,
+    FHRYCell: FHRYCell.value,
+    fetalPresentationYCell: fetalPresentationYCell.value,
+    scaleValues: props.data.scaleValues,
+    event: event.value,
+    originYCervix: originYCervix.value
+  });
+  const commonFunc = useCommon(canvas);
+  onMounted(() => {
+    nextTick(() => {
+      const { clickMenu: _clickMenu } = useBirthProcess(
+        canvas,
+        propItems,
+        emits,
+        pointTipProps,
+        pointMenuProps,
+        commonFunc
+      );
+      clickMenu.value = _clickMenu;
+      useEvent(canvasRef.value);
+      const { select: _select } = useCanvasEvent(canvas, propItems, emits);
+      select.value = _select;
+    });
+  });
+  return {
+    propItems,
+    redrawPoints,
+    select,
+    pointTipProps,
+    pointMenuProps,
+    clickMenu
+  };
+}
+
+export { useBirthProcessChart as default };

package/es/components/fabric-chart/src/hooks/useCenter.js

@@ -6,9 +6,9 @@ import { TEMPERATURE_MENU, PAIN_MENU, OVERLAP } from './constant.js';
 import { cloneDeep } from 'lodash-es';
 import { isOneLine, getType, setOtherType, isEffectiveNode, getIndex, deleteProperty } from '../utils/utils.js';
 
-function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem, pointTipProps, pointMenuProps, useCommon) {
+function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem, pointTipProps, pointMenuProps, commonFunc) {
   useGrid(canvas, propItems);
-  const { getEqualXTypes, repeatTip, maxLimitTip, minLimitTip } = useCommon;
+  const { getEqualXTypes, repeatTip, maxLimitTip, minLimitTip } = commonFunc;
   const { createShadowLines } = useShadow();
   const {
     left,
@@ -662,15 +662,14 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       updateData(params);
     } else {
       const { data, type, dataIndex, index } = target.origin;
-      deleteProperty(data, TEMPERATURE_MENU);
-      deleteProperty(data, PAIN_MENU);
-      data[`${item.type}`] = item.value;
+      const _data = deleteProperty(data, [...TEMPERATURE_MENU, ...PAIN_MENU]);
+      _data[`${item.type}`] = item.value;
       if (isOneLine(type)) {
-        data["key"] = target.origin.key;
+        _data["key"] = target.origin.key;
       }
       const params = {
         ...target.origin,
-        data
+        data: _data
       };
       emits("change", params);
       updateData(params, "change");

package/es/components/fabric-chart/src/hooks/useOther.js

@@ -79,14 +79,15 @@ function useOther(canvas, propItems, cumputedX) {
       textDiff = (yCellHeight - (text.height || 0)) / 2;
       texts.push(text);
     });
-    return new fabric.Group(texts, {
+    const options = {
       originX: "center",
       left: x,
       top: y + textDiff,
       baseTop: (v.baseTop || 0) * yCellHeight,
       trueLeft: x,
       trueHeight: texts.length * yCellHeight
-    });
+    };
+    return new fabric.Group(texts, options);
   }
   drawOther();
 }

package/es/components/fabric-chart/src/hooks/useTemperatureChart.js

@@ -10,8 +10,8 @@ import { useOther } from './useOther.js';
 import { useEvent, useCanvasEvent } from './useEvent.js';
 import '../utils/index.js';
 import { setOtherType } from '../utils/utils.js';
-import { useCommon } from './useCommon.js';
 import 'lodash-es';
+import { useCommon } from './useCommon.js';
 
 function useTemperatureChart(canvas, props, emits, canvasRef) {
   const defaultHeight = 15;

package/es/components/fabric-chart/src/utils/utils.js

@@ -2,10 +2,13 @@ function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
 }
 function deleteProperty(data, list) {
-  list.map((v) => v.type).forEach((key) => {
-    if (Reflect.has(data, key))
-      Reflect.deleteProperty(data, key);
-  });
+  const _data = {};
+  for (const key in data) {
+    if (!list.map((v) => v.type).includes(key)) {
+      _data[key] = data[key];
+    }
+  }
+  return _data;
 }
 function getIndex(time, list) {
   const index = list.findIndex((v) => new Date(v.time).getTime() > new Date(time).getTime());

package/es/components/form-config/src/components/FormConfigDragDisplay.vue.js

@@ -20,7 +20,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { getRenderer } = usePresetRenderer();
     const { getCommonConfig } = useSortableConfig();
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(draggableComponent), mergeProps(unref(getCommonConfig)(), {
+      return openBlock(), createBlock(unref(draggableComponent), mergeProps(unref(getCommonConfig)(__props.fieldItem), {
         style: getItemColumnStyle(__props.fieldItem)
       }), {
         item: withCtx(({ element }) => [

package/es/components/form-config/src/hooks/useSortalbeConfig.js

@@ -26,7 +26,7 @@ function useSortableConfig() {
     to !== from && from.classList.remove("is-choosing-area");
     to.classList.add("is-choosing-area");
   }
-  const getCommonConfig = () => ({
+  const getCommonConfig = (formConfig) => ({
     move: onMove,
     onChoose,
     onUnchoose,
@@ -34,7 +34,7 @@ function useSortableConfig() {
     forceFallback: false,
     animation: "150",
     "item-key": "key",
-    group: FORM_CONFIG_GROUP
+    group: (formConfig == null ? void 0 : formConfig.type) === "COMBINATION" ? formConfig.key : FORM_CONFIG_GROUP
   });
   return { getCommonConfig };
 }

package/es/components/form-render/src/FormRender.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, withKeys, withModifiers, toDisplayString, nextTick } from 'vue';
+import { defineComponent, computed, onMounted, ref, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, withKeys, withModifiers, toDisplayString, nextTick } from 'vue';
 import { arrayed, findAncestor } from '../../../shared/utils/index.js';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { Path } from '@formily/path';
@@ -8,6 +8,7 @@ import { cloneDeep, isArray, isFunction } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { NESTED_FORM_ITEM_TYPE, FormItemLineBarDepKeyPrepend } from './constants/index.js';
 import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle.js';
+import { useLowCodeReactions } from './hooks/useLowCodeReactions.js';
 import { useNuiThemeOverrides } from './hooks/useNuiThemeOverrides.js';
 import { validateMessageParser, combineExtendKey, splitExtendKey } from './utils/index.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
@@ -63,6 +64,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     enterToNextWidget: {
       type: [Boolean, Function],
       default: true
+    },
+    lowCodeReactions: {
+      type: Array
     }
   },
   emits: [
@@ -87,9 +91,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             value: field.value,
             context: changeContextCollector.getContext(fieldKey, field.value)
           });
+          lowCodeReactionsHandler(fieldKey, field.value);
         });
       }
     });
+    const { lowCodeReactionsHandler, triggerAllReactionsHandler } = useLowCodeReactions(
+      computed(() => props.lowCodeReactions),
+      formModel
+    );
+    onMounted(triggerAllReactionsHandler);
     const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(
       props,
       formModel

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

@@ -74,19 +74,22 @@ const script = defineComponent({
         "message": props.remark
       }, null)]) : null, showAnnotation.value ? renderAnnotation() : null]) : null]) : null;
     }
-    return () => createVNode(NFormItem, mergeProps({
-      "class": "form-render__formItem",
-      "style": {
-        "--form-item-column": props.span
-      }
-    }, {
-      id: id.value,
-      "widget-type": field.value.componentType,
-      "form-field": field.value.path.toString()
-    }), {
-      ...slots,
-      label: renderLabel
-    });
+    return () => {
+      var _a;
+      return createVNode(NFormItem, mergeProps({
+        "class": "form-render__formItem",
+        "style": {
+          "--form-item-column": ((_a = props.span) != null ? _a : 3) * 2
+        }
+      }, {
+        id: id.value,
+        "widget-type": field.value.componentType,
+        "form-field": field.value.path.toString()
+      }), {
+        ...slots,
+        label: renderLabel
+      });
+    };
   }
 });
 const FORM_ITEM = connect(script, mapProps({

package/es/components/form-render/src/constants/index.js

@@ -41,6 +41,19 @@ var FIELD_AGE_UNIT = /* @__PURE__ */ ((FIELD_AGE_UNIT2) => {
   FIELD_AGE_UNIT2["MINUTE"] = "N";
   return FIELD_AGE_UNIT2;
 })(FIELD_AGE_UNIT || {});
+var LOW_CODE_VALUE_RELATION = /* @__PURE__ */ ((LOW_CODE_VALUE_RELATION2) => {
+  LOW_CODE_VALUE_RELATION2["EQ"] = "EQ";
+  LOW_CODE_VALUE_RELATION2["NEQ"] = "NEQ";
+  LOW_CODE_VALUE_RELATION2["CL"] = "CL";
+  LOW_CODE_VALUE_RELATION2["NC"] = "NC";
+  LOW_CODE_VALUE_RELATION2["NULL"] = "NULL";
+  LOW_CODE_VALUE_RELATION2["NOT_NULL"] = "NOT_NULL";
+  LOW_CODE_VALUE_RELATION2["BIG"] = "BIG";
+  LOW_CODE_VALUE_RELATION2["BIGEQ"] = "BIGEQ";
+  LOW_CODE_VALUE_RELATION2["LESS"] = "LESS";
+  LOW_CODE_VALUE_RELATION2["LESSEQ"] = "LESSEQ";
+  return LOW_CODE_VALUE_RELATION2;
+})(LOW_CODE_VALUE_RELATION || {});
 const NESTED_FORM_ITEM_TYPE = ["COMPLEX", "COMBINATION"];
 
-export { FIELD_AGE_UNIT, FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectionAnnotation, InjectionAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField, NESTED_FORM_ITEM_TYPE };
+export { FIELD_AGE_UNIT, FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectionAnnotation, InjectionAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField, LOW_CODE_VALUE_RELATION, NESTED_FORM_ITEM_TYPE };

package/es/components/form-render/src/hooks/useFieldNormalize.js

@@ -59,10 +59,6 @@ function useFieldNormalize() {
     });
     return fieldItem;
   });
-  FieldNormalizeWaterfallHook.tap("__elem_width", (fieldItem) => {
-    fieldItem.elem_width = ~~((fieldItem.elem_width || 3) * 2);
-    return fieldItem;
-  });
   return { FieldNormalizeWaterfallHook };
 }