cnhis-design-vue 3.1.15-beta.3 → 3.1.15-beta.4

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

@@ -11,7 +11,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     };
     annotation: {
         type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
-        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {
@@ -2597,7 +2596,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         };
         annotation: {
             type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
-            default: () => {};
         };
         showFooter: BooleanConstructor;
         sumData: {
@@ -4085,7 +4083,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     };
     annotation: {
         type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
-        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {
@@ -4282,7 +4279,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     columnConfig: Record<string, any>;
     menuConfig: Record<string, any>;
     maxCheckSize: number;
-    annotation: import("../../../es/src/types").AnyObject;
     sumData: Record<string, any>;
     avgData: Record<string, any>;
     refreshRow: number;

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -9,7 +9,6 @@ declare const _default: import("vue").DefineComponent<{
     };
     annotation: {
         type: import("vue").PropType<import("../../../src/types").AnyObject>;
-        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {
@@ -1162,7 +1161,8 @@ declare const _default: import("vue").DefineComponent<{
                 paddingMedium: string;
                 paddingLarge: string;
                 paddingRoundTiny: string;
-                paddingRoundSmall: string; /**
+                paddingRoundSmall: string;
+                paddingRoundMedium: string; /**
                  * 初始化props
                  * @param {*} unionItem
                  * @param {*} row
@@ -1170,7 +1170,6 @@ declare const _default: import("vue").DefineComponent<{
                  * @param {*} $rowIndex
                  * @returns
                  */
-                paddingRoundMedium: string;
                 paddingRoundLarge: string;
                 iconMarginTiny: string;
                 iconMarginSmall: string;
@@ -2602,7 +2601,6 @@ declare const _default: import("vue").DefineComponent<{
         };
         annotation: {
             type: import("vue").PropType<import("../../../src/types").AnyObject>;
-            default: () => {};
         };
         showFooter: BooleanConstructor;
         sumData: {
@@ -4108,7 +4106,6 @@ declare const _default: import("vue").DefineComponent<{
     };
     annotation: {
         type: import("vue").PropType<import("../../../src/types").AnyObject>;
-        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {
@@ -4305,7 +4302,6 @@ declare const _default: import("vue").DefineComponent<{
     columnConfig: Record<string, any>;
     menuConfig: Record<string, any>;
     maxCheckSize: number;
-    annotation: import("../../../src/types").AnyObject;
     sumData: Record<string, any>;
     avgData: Record<string, any>;
     refreshRow: number;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -540,6 +540,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         row,
         index: $rowIndex,
         type: formType,
+        ...col.componentProps || {},
         onFormChange,
         onClick: () => {
           emit("formClick", {

package/es/packages/big-table/src/bigTableProps.d.ts

@@ -11,7 +11,6 @@ declare const bigTableProps: {
     };
     annotation: {
         type: PropType<AnyObject>;
-        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {

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

@@ -1,7 +1,7 @@
 const bigTableProps = {
   data: { type: Array, default: () => [] },
   maxCheckSize: { type: Number, default: 0 },
-  annotation: { type: Object, default: () => ({}) },
+  annotation: { type: Object },
   showFooter: Boolean,
   sumData: { type: Object, default: () => ({}) },
   avgData: { type: Object, default: () => ({}) },

package/es/packages/big-table/src/components/edit-form/edit-date.js

@@ -108,7 +108,8 @@ var EditDate = defineComponent({
       disabled: props.col.disabled || false,
       valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
       isDateDisabled: customDateDisabledDecorator(props.col.isDateDisabled) || isDateDisabled,
-      placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9"
+      placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9",
+      ...props.col.componentProps || {}
     };
     if (config.type.includes("time")) {
       config.isTimeDisabled = customDateDisabledDecorator(props.col.isTimeDisabled) || isTimeDisabled;

package/es/packages/big-table/src/components/edit-form/edit-select.js

@@ -33,7 +33,8 @@ var EditSelect = defineComponent({
       loading: false,
       keyword: "",
       config: {
-        multiple: props.col.multiple || false
+        multiple: props.col.multiple || false,
+        ...props.col.componentProps || {}
       }
     });
     const setOptions = async () => {

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

@@ -1,10 +1,11 @@
 import { createVNode } from 'vue';
 import { isObject } from '@vue/shared';
+import { isBoolean } from 'lodash-es';
 import Annotation from '../../../annotation-edit/index.js';
 
 function useAnnotation(props) {
   function renderAnnotation(columnConfig) {
-    if (!isObject(props.annotation))
+    if (!isObject(props.annotation) || isBoolean(columnConfig.annotation) && !columnConfig.annotation)
       return null;
     return createVNode("section", {
       "class": "big-table__annotationWrapper"

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

@@ -19,7 +19,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     data: null,
     addRenderItem: null
   },
-  emits: ["change", "add", "select"],
+  emits: [
+    "change",
+    "add",
+    "select"
+  ],
   setup(__props, { expose, emit: emits }) {
     const props = __props;
     const defaultHeight = 15;

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

@@ -1,3 +1,4 @@
+import { PropType } from 'vue';
 import { IData, IDate, IPointType } from './interface';
 declare const _default: import("vue").DefineComponent<{
     data: {
@@ -152,13 +153,13 @@ declare const _default: import("vue").DefineComponent<{
             default: () => never[];
         };
         point: {
-            type: import("vue").PropType<import("./interface").ICoordinateValue>;
+            type: PropType<import("./interface").ICoordinateValue>;
         };
         propItems: {
-            type: import("vue").PropType<import("./interface").IPropItems>;
+            type: PropType<import("./interface").IPropItems>;
         };
         target: {
-            type: import("vue").PropType<any>;
+            type: PropType<any>;
         };
     }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:show" | "clickMenu")[], "clickMenu" | "update:show", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         show: {
@@ -170,13 +171,13 @@ declare const _default: import("vue").DefineComponent<{
             default: () => never[];
         };
         point: {
-            type: import("vue").PropType<import("./interface").ICoordinateValue>;
+            type: PropType<import("./interface").ICoordinateValue>;
         };
         propItems: {
-            type: import("vue").PropType<import("./interface").IPropItems>;
+            type: PropType<import("./interface").IPropItems>;
         };
         target: {
-            type: import("vue").PropType<any>;
+            type: PropType<any>;
         };
     }>> & {
         "onUpdate:show"?: ((...args: any[]) => any) | undefined;

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

@@ -129,6 +129,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     }
   }
   function setCanvasEvent() {
+    if (!propItems.event.evented)
+      return;
     canvas.value.on("mouse:up", (event) => {
       var _a;
       if (event.button === 3) {
@@ -157,7 +159,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
                     title: v.title,
                     unit: v.unit,
                     type: v.bigType,
-                    dataIndex: v.dataIndex
+                    dataIndex: v.dataIndex,
+                    key: v.key
                   },
                   pointer: event.pointer
                 });
@@ -338,7 +341,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         coolLine,
         coolPoint,
         lockMovementX: true,
-        ...pointAttr
+        ...pointAttr,
+        ...propItems.event
       };
       if (previousLine) {
         point = drawPoint(type, {

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

@@ -195,10 +195,12 @@ ${item.title.slice(-2)}`,
           title: item.title,
           unit: item.unit,
           type: item.bigType,
-          dataIndex: item.dataIndex
+          dataIndex: item.dataIndex,
+          key: item.key
         },
         originLeft: leftX,
-        originTop: topY - (text.height || 30) / 2
+        originTop: topY - (text.height || 30) / 2,
+        ...propItems.event
       });
       topY -= text.height || 30;
       setPointEvent(icon);

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

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