cnhis-design-vue 3.1.13 → 3.1.14-beta.10

package/es/packages/info-header/src/InfoHeader.vue_vue_type_script_setup_true_lang.js

@@ -1,7 +1,8 @@
 import { defineComponent, ref, nextTick, onMounted, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createCommentVNode, Fragment, toDisplayString, renderList, withDirectives, createBlock, unref, withCtx, createTextVNode, vShow, createVNode } from 'vue';
-import { NTag, NDescriptions, NDescriptionsItem, NEllipsis } from 'naive-ui';
+import { NTag, NDescriptions, NDescriptionsItem } from 'naive-ui';
 import { useThrottleFn, useEventListener } from '@vueuse/core';
-import SlotRender from './SlotRender.js';
+import SlotRender from '../../../src/components/SlotRender';
+import InfoEllipsis from '../../../packages/info-header/src/InfoEllipsis.vue';
 import './HiddenContent.js';
 import script$1 from './HiddenContent.vue_vue_type_script_setup_true_lang.js';
 
@@ -173,20 +174,15 @@ var script = /* @__PURE__ */ defineComponent({
                       }, null, 8, ["renderer", "root-slots", "item", "style", "width"])) : needHidden(item) ? (openBlock(), createBlock(script$1, {
                         key: 1,
                         content: item[__props.valueField],
+                        tip: item.tip,
                         "content-style": getDescriptionItemStyle(item),
                         width: descriptionWidthList.value[index]
-                      }, null, 8, ["content", "content-style", "width"])) : (openBlock(), createBlock(unref(NEllipsis), {
+                      }, null, 8, ["content", "tip", "content-style", "width"])) : (openBlock(), createBlock(InfoEllipsis, {
                         key: 2,
-                        style: normalizeStyle(getEllipsisStyle(index, item))
-                      }, {
-                        default: withCtx(() => {
-                          var _a;
-                          return [
-                            createTextVNode(toDisplayString((_a = item[__props.valueField]) != null ? _a : "-"), 1)
-                          ];
-                        }),
-                        _: 2
-                      }, 1032, ["style"]))
+                        "content-style": getEllipsisStyle(index, item),
+                        content: item[__props.valueField],
+                        tip: item.tip
+                      }, null, 8, ["content-style", "content", "tip"]))
                     ]),
                     _: 2
                   }, 1032, ["label"]);

package/es/packages/steps-wheel/index.d.ts

@@ -15,6 +15,10 @@ declare const StepsWheel: SFCWithInstall<import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    lastNodeRender: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         stepInfo: {
@@ -32,10 +36,15 @@ declare const StepsWheel: SFCWithInstall<import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
+        lastNodeRender: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
     }>>;
     nodeRowCount: import("vue").ComputedRef<number>;
+    lastNodeRenderShow: import("vue").ComputedRef<boolean>;
     stepInfoList: import("vue").Ref<any[]>;
     handleNode: (nodeList: any[], cols: number) => void;
     lineCircleLeft: (stepItem: any) => boolean;
@@ -540,9 +549,14 @@ declare const StepsWheel: SFCWithInstall<import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    lastNodeRender: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>>, {
     stepInfo: Record<string, any>;
     currentStep: number;
     toolTipShow: boolean;
+    lastNodeRender: boolean;
 }>>;
 export default StepsWheel;

package/es/packages/steps-wheel/src/StepsWheel.vue.d.ts

@@ -14,6 +14,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    lastNodeRender: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         stepInfo: {
@@ -31,10 +35,15 @@ declare const _default: import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
+        lastNodeRender: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
     }>>;
     nodeRowCount: import("vue").ComputedRef<number>;
+    lastNodeRenderShow: import("vue").ComputedRef<boolean>;
     stepInfoList: import("vue").Ref<any[]>;
     handleNode: (nodeList: any[], cols: number) => void;
     lineCircleLeft: (stepItem: any) => boolean;
@@ -539,9 +548,14 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    lastNodeRender: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>>, {
     stepInfo: Record<string, any>;
     currentStep: number;
     toolTipShow: boolean;
+    lastNodeRender: boolean;
 }>;
 export default _default;

package/es/packages/steps-wheel/src/StepsWheel.vue_vue_type_script_setup_true_lang.js

@@ -48,6 +48,10 @@ var script = /* @__PURE__ */ defineComponent({
     toolTipShow: {
       type: Boolean,
       default: true
+    },
+    lastNodeRender: {
+      type: Boolean,
+      default: false
     }
   },
   setup(__props) {
@@ -55,6 +59,9 @@ var script = /* @__PURE__ */ defineComponent({
     const nodeRowCount = computed(() => {
       return Math.ceil(stepInfoList.value.length / props.stepInfo.cols);
     });
+    const lastNodeRenderShow = computed(() => {
+      return props.lastNodeRender;
+    });
     const stepInfoList = ref([]);
     const handleNode = (nodeList, cols) => {
       let length = nodeList.length + 1;
@@ -134,9 +141,9 @@ var script = /* @__PURE__ */ defineComponent({
       let arr = format2DArray(stepInfoList.value, cols);
       let lastRow = arr[arr.length - 1].filter((v) => v);
       if (nodeRowCount.value % 2 == 0) {
-        return index == lastRow[lastRow.length - 1].nodeIndex - (props.stepInfo.cols - 2 * lastRow[lastRow.length - 1].sort);
+        return lastNodeRenderShow.value && index == lastRow[lastRow.length - 1].nodeIndex - (props.stepInfo.cols - 2 * lastRow[lastRow.length - 1].sort);
       } else {
-        return index == lastRow[lastRow.length - 1].nodeIndex - 1;
+        return lastNodeRenderShow.value && index == lastRow[lastRow.length - 1].nodeIndex - 1;
       }
     };
     const handleFinishLastNodeLine = (index) => {
@@ -144,9 +151,9 @@ var script = /* @__PURE__ */ defineComponent({
       let arr = format2DArray(stepInfoList.value, cols);
       let lastRow = arr[arr.length - 1].filter((v) => v);
       if (nodeRowCount.value % 2 == 0) {
-        return index == lastRow[lastRow.length - 1].nodeIndex - (props.stepInfo.cols - 2 * lastRow[lastRow.length - 1].sort) - 1;
+        return lastNodeRenderShow.value && index == lastRow[lastRow.length - 1].nodeIndex - (props.stepInfo.cols - 2 * lastRow[lastRow.length - 1].sort) - 1;
       } else {
-        return index == lastRow[lastRow.length - 1].nodeIndex - 2;
+        return lastNodeRenderShow.value && index == lastRow[lastRow.length - 1].nodeIndex - 2;
       }
     };
     watch(() => props.stepInfo, (val) => {
@@ -160,8 +167,8 @@ var script = /* @__PURE__ */ defineComponent({
         createElementVNode("ul", _hoisted_2, [
           (openBlock(true), createElementBlock(Fragment, null, renderList(stepInfoList.value, (stepItem, index) => {
             return openBlock(), createElementBlock("li", {
-              class: normalizeClass(["stepItem", { [`stepItem_${index + 1}`]: true }]),
-              key: index
+              class: normalizeClass(["stepItem", { [`stepItem_${index + 1}`]: true, [`${stepItem == null ? void 0 : stepItem.stepId}`]: (stepItem == null ? void 0 : stepItem.stepId) ? true : false }]),
+              key: (stepItem == null ? void 0 : stepItem.stepId) || index
             }, [
               stepItem ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                 createCommentVNode(" \u6B65\u9AA4\u5934\u90E8\u4FE1\u606F "),
@@ -191,7 +198,9 @@ var script = /* @__PURE__ */ defineComponent({
                     }, null, 2)
                   ]),
                   default: withCtx(() => [
-                    renderSlot(_ctx.$slots, "nodeTipBox", {}, () => [
+                    renderSlot(_ctx.$slots, "nodeTipBox", {
+                      stepId: stepItem.stepId
+                    }, () => [
                       _hoisted_4
                     ])
                   ]),
@@ -230,10 +239,12 @@ var script = /* @__PURE__ */ defineComponent({
                       class: normalizeClass(["stepLabel", { labelFinsh: handleFinishLastNodeCss(index) }]),
                       title: stepItem.label
                     }, toDisplayString(stepItem.label), 11, _hoisted_6),
-                    createElementVNode("p", {
+                    withDirectives(createElementVNode("p", {
                       class: "stepExtra",
                       title: stepItem.person
-                    }, toDisplayString(stepItem.person), 9, _hoisted_7),
+                    }, toDisplayString(stepItem.person), 9, _hoisted_7), [
+                      [vShow, stepItem.person]
+                    ]),
                     createCommentVNode(" \u6B65\u9AA4\u65F6\u95F4  "),
                     createElementVNode("p", _hoisted_8, toDisplayString(stepItem.statusTime), 1)
                   ])

package/es/{packages/info-header/src → src/components/SlotRender}/SlotRender.d.ts

@@ -1,22 +1,20 @@
 import { Func } from '../../../../es/src/types';
-import { PropType } from 'vue';
+import { Component, PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     renderer: {
-        type: (StringConstructor | FunctionConstructor)[];
+        type: PropType<string | Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | Func<any[], any>>;
         required: true;
     };
     rootSlots: {
         type: PropType<Record<string, Func<any[], any>>>;
-        required: true;
     };
 }, () => any, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     renderer: {
-        type: (StringConstructor | FunctionConstructor)[];
+        type: PropType<string | Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | Func<any[], any>>;
         required: true;
     };
     rootSlots: {
         type: PropType<Record<string, Func<any[], any>>>;
-        required: true;
     };
 }>>, {}>;
 export default _default;

package/es/{packages/info-header/src → src/components/SlotRender}/SlotRender.js

@@ -1,35 +1,35 @@
 import { isString, isFunction } from 'lodash-es';
-import { defineComponent } from 'vue';
+import { defineComponent, h, toRaw } from 'vue';
 
-var SlotRender = defineComponent({
+var script = defineComponent({
   name: "SlotRender",
   props: {
     renderer: {
-      type: [String, Function],
+      type: [String, Function, Object],
       required: true
     },
     rootSlots: {
-      type: Object,
-      required: true
+      type: Object
     }
   },
   setup(props, {
     attrs
   }) {
     function renderSlots(slotName) {
-      const renderer = props.rootSlots[slotName];
+      var _a;
+      const renderer = (_a = props.rootSlots) == null ? void 0 : _a[slotName];
       return isFunction(renderer) ? renderer(attrs) : null;
     }
     function renderVNode(renderer) {
-      return isFunction(renderer) ? renderer(attrs) : null;
+      return renderer ? h(toRaw(renderer), attrs) : null;
     }
     return () => {
       const {
         renderer
       } = props;
-      return isString(renderer) ? renderSlots(renderer) : isFunction(renderer) ? renderVNode(renderer) : null;
+      return isString(renderer) ? renderSlots(renderer) : renderVNode(renderer);
     };
   }
 });
 
-export { SlotRender as default };
+export { script as default };

package/es/src/components/SlotRender/index.d.ts

@@ -0,0 +1,2 @@
+import script from './SlotRender';
+export default script;

package/es/src/components/SlotRender/index.js

@@ -0,0 +1,2 @@
+import script from './SlotRender.js';
+export { default } from './SlotRender.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.13",
+  "version": "3.1.14-beta.10",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -129,7 +129,7 @@
     "standard-version": "^9.3.2",
     "ts-morph": "^15.1.0",
     "typescript": "4.6.4",
-    "vite": "^2.9.9",
+    "vite": "3.0.4",
     "vitest": "^0.16.0",
     "vue-tsc": "^0.29.8"
   },