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

package/es/packages/big-table/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../../es/src/types';
+export * from './src/hooks/export';
 declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     data: {
         type: ArrayConstructor;

package/es/packages/big-table/index.js

@@ -5,6 +5,7 @@ import { expandXEUtils } from '../../src/utils/utilExpand';
 import { CGrid } from '../../packages/index';
 import './src/BigTable.js';
 import script from './src/BigTable.vue_vue_type_script_setup_true_lang.js';
+export { useColumnConfigAdaptor } from './src/hooks/useColumnConfigAdaptor.js';
 
 const BigTable = script;
 BigTable.install = function(app) {

package/es/packages/big-table/src/hooks/export.d.ts

@@ -0,0 +1 @@
+export * from './useColumnConfigAdaptor';

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

@@ -0,0 +1 @@
+export { useColumnConfigAdaptor } from './useColumnConfigAdaptor.js';

package/es/packages/big-table/src/hooks/useColumnConfigAdaptor.d.ts

@@ -1,7 +1,6 @@
 import { AnyObject } from '../../../../../es/src/types';
 interface FormConfigLikePayload {
     fieldList: AnyObject[];
-    rowGroupConfig: Partial<Record<'firstRowGroup' | 'secondRowGroup', AnyObject[]>>;
 }
 declare type EditRules = Record<string, AnyObject[]>;
 export declare function useColumnConfigAdaptor(): {

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

@@ -3,12 +3,11 @@ import { isObject, cloneDeep, isString, isFunction, isArray } from 'lodash-es';
 const REMOVE_PROPERTY = Symbol("remove property");
 function useColumnConfigAdaptor() {
   function formConfigLikeAdaptor(payload) {
-    if (!isObject(payload))
-      return { fieldList: [], rowGroupConfig: {} };
     const editRules = {};
+    if (!isObject(payload))
+      return { fieldList: [], editRules };
     const fieldList = formConfigLikeFieldListTransfer(payload.fieldList);
-    const rowGroupConfig = payload.rowGroupConfig;
-    return { fieldList, rowGroupConfig, editRules };
+    return { fieldList, editRules };
     function formConfigLikeFieldListTransfer(fieldList2) {
       const fixedWayEnumValueMap = /* @__PURE__ */ new Map([
         ["NONE", 0],

package/es/packages/index.d.ts

@@ -21,6 +21,7 @@ import CShortcutProvider from './shortcut-provider';
 import CShortcutSetter from './shortcut-setter';
 export * from './form-render';
 export * from './shortcut-provider';
+export * from './big-table';
 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

@@ -54,6 +54,7 @@ export { useAnchor } from './form-render/src/hooks/useAnchor.js';
 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';
 
 const components = {
   CGrid: Grid,

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/package.json

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