cnhis-design-vue 3.3.3-beta.45 → 3.3.3-beta.46

package/es/components/field-set/src/FieldColor.vue.d.ts

@@ -52,6 +52,7 @@ declare const _default: import("vue").DefineComponent<{
         titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
         hide?: boolean | undefined;
         positionField?: string | undefined;
+        showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
     }[]>;
     rowProps: {
         columns: {
@@ -67,6 +68,7 @@ declare const _default: import("vue").DefineComponent<{
             titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
             hide?: boolean | undefined;
             positionField?: string | undefined;
+            showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
         }[];
         data: AnyObject[];
         onEdit: ({ row, readonly: _readonly, add }: AnyObject) => void;
@@ -358,12 +360,13 @@ declare const _default: import("vue").DefineComponent<{
         emit: (event: "edit" | "updateChecked", ...args: any[]) => void;
         onRemove: () => void;
         onEdit: (param?: AnyObject) => void;
+        prevFunc: (column: AnyObject) => any;
         isRenderTooltip: (field: string) => any;
         getTooltipContent: () => any;
         getTextValue: (field: string) => any;
         isMultiple: (field: string) => boolean;
         isRender: (field: string) => boolean;
-        isShow: (field: string) => any;
+        isShow: (column: AnyObject) => any;
         showRelation: (field: string) => boolean;
         getSortPriorityOptions: () => {
             label: string;

package/es/components/field-set/src/FieldFilter.vue.d.ts

@@ -48,6 +48,7 @@ declare const _default: import("vue").DefineComponent<{
         titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
         hide?: boolean | undefined;
         positionField?: string | undefined;
+        showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
     }[]>;
     data: import("vue").Ref<{
         [x: string]: any;
@@ -76,6 +77,7 @@ declare const _default: import("vue").DefineComponent<{
             titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
             hide?: boolean | undefined;
             positionField?: string | undefined;
+            showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
         }[];
         data: {
             [x: string]: any;
@@ -387,12 +389,13 @@ declare const _default: import("vue").DefineComponent<{
         emit: (event: "edit" | "updateChecked", ...args: any[]) => void;
         onRemove: () => void;
         onEdit: (param?: AnyObject) => void;
+        prevFunc: (column: AnyObject) => any;
         isRenderTooltip: (field: string) => any;
         getTooltipContent: () => any;
         getTextValue: (field: string) => any;
         isMultiple: (field: string) => boolean;
         isRender: (field: string) => boolean;
-        isShow: (field: string) => any;
+        isShow: (column: AnyObject) => any;
         showRelation: (field: string) => boolean;
         getSortPriorityOptions: () => {
             label: string;

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -232,6 +232,7 @@ declare const _default: import("vue").DefineComponent<{
         titleRender?: ((column: AnyObject) => VNodeChild) | undefined;
         hide?: boolean | undefined;
         positionField?: string | undefined;
+        showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
     }[]>;
     itemWidth: import("vue").ComputedRef<string>;
     fieldList: import("vue").ComputedRef<AnyObject[]>;
@@ -251,6 +252,7 @@ declare const _default: import("vue").DefineComponent<{
             titleRender?: ((column: AnyObject) => VNodeChild) | undefined;
             hide?: boolean | undefined;
             positionField?: string | undefined;
+            showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
         }[];
         data: AnyObject[];
         onUpdateChecked: ({ checked, column }: {
@@ -578,12 +580,13 @@ declare const _default: import("vue").DefineComponent<{
         emit: (event: "edit" | "updateChecked", ...args: any[]) => void;
         onRemove: () => void;
         onEdit: (param?: AnyObject) => void;
+        prevFunc: (column: AnyObject) => any;
         isRenderTooltip: (field: string) => any;
         getTooltipContent: () => any;
         getTextValue: (field: string) => any;
         isMultiple: (field: string) => boolean;
         isRender: (field: string) => boolean;
-        isShow: (field: string) => any;
+        isShow: (column: AnyObject) => any;
         showRelation: (field: string) => boolean;
         getSortPriorityOptions: () => {
             label: string;

package/es/components/field-set/src/components/table-row.vue.d.ts

@@ -205,12 +205,13 @@ declare const _default: import("vue").DefineComponent<{
     emit: (event: "edit" | "updateChecked", ...args: any[]) => void;
     onRemove: () => void;
     onEdit: (param?: AnyObject) => void;
+    prevFunc: (column: AnyObject) => any;
     isRenderTooltip: (field: string) => any;
     getTooltipContent: () => any;
     getTextValue: (field: string) => any;
     isMultiple: (field: string) => boolean;
     isRender: (field: string) => boolean;
-    isShow: (field: string) => any;
+    isShow: (column: AnyObject) => any;
     showRelation: (field: string) => boolean;
     getSortPriorityOptions: () => {
         label: string;

package/es/components/field-set/src/components/table-row.vue2.js

@@ -1,4 +1,4 @@
-import { createElementVNode, defineComponent, openBlock, createElementBlock, Fragment, renderList, normalizeStyle, unref, createBlock, withCtx, createVNode, createCommentVNode, toDisplayString, resolveDynamicComponent, normalizeClass, withDirectives, vShow, mergeProps, createTextVNode } from 'vue';
+import { createElementVNode, defineComponent, openBlock, createElementBlock, Fragment, renderList, normalizeStyle, unref, createBlock, withCtx, createVNode, createCommentVNode, toDisplayString, resolveDynamicComponent, normalizeClass, withDirectives, vShow, mergeProps, createTextVNode, toRaw } from 'vue';
 import { NTooltip, NIcon, NCheckbox, NPopover, NSpace, NSelect, NColorPicker, NInput, NInputNumber, NButton, NPopconfirm } from 'naive-ui';
 import { setStyle, setColorInfo, isShowExplicitRequired, isDisable } from '../utils/index.js';
 import { ReorderTwoOutline, HelpCircleOutline, CaretDownOutline, EyeOutline, CopyOutline, CreateOutline, TrashOutline } from '@vicons/ionicons5';
@@ -179,6 +179,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         ...param
       });
     }
+    function prevFunc(column) {
+      const {
+        showPrevFn
+      } = column;
+      if (isFunction(showPrevFn))
+        return showPrevFn(toRaw(column), toRaw(props.element));
+      return true;
+    }
     function isRenderTooltip(field) {
       var _a;
       return field === "title" && (props.fieldDescribeMode === "tooltip" && props.element.feildDescribe || props.developMode && ((_a = props.element.settingObj) == null ? void 0 : _a.fieldDescDev));
@@ -215,7 +223,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return false;
       return true;
     }
-    function isShow(field) {
+    function isShow(column) {
+      const {
+        field
+      } = column;
       if (["explicitRequired", "defaultValue"].includes(field))
         return isShowExplicitRequired(props.element);
       if (["isSum", "isAvg"].includes(field))
@@ -394,6 +405,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           class: "table-cell",
           title: __props.element[column.field],
           style: normalizeStyle(unref(setStyle)(column, index, __props.columnWidthProps))
+        }, [prevFunc(column) ? (openBlock(), createElementBlock(Fragment, {
+          key: 0
         }, [column.type === "text" ? (openBlock(), createElementBlock(Fragment, {
           key: 0
         }, [index === 0 ? (openBlock(), createElementBlock(Fragment, {
@@ -436,7 +449,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           disabled: setDisabled(column),
           checked: __props.element[column.field],
           "onUpdate:checked": [($event) => __props.element[column.field] = $event, (checked) => onUpdateChecked(checked, column)]
-        }, null, 8, ["disabled", "checked", "onUpdate:checked"]), [[vShow, isShow(column.field)]]), showRelation(column.field) ? (openBlock(), createBlock(unref(NPopover), {
+        }, null, 8, ["disabled", "checked", "onUpdate:checked"]), [[vShow, isShow(column)]]), showRelation(column.field) ? (openBlock(), createBlock(unref(NPopover), {
           key: 0,
           placement: "right-start",
           "show-arrow": false
@@ -476,7 +489,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           value: __props.element._defaultValue,
           "onUpdate:value": [_cache[0] || (_cache[0] = ($event) => __props.element._defaultValue = $event), (value) => handleUpdateSelect(value, column)],
           options: getOptions(column)
-        }), null, 16, ["multiple", "disabled", "value", "options", "onUpdate:value"])), [[vShow, isShow(column.field)]]) : withDirectives((openBlock(), createBlock(unref(NSelect), mergeProps({
+        }), null, 16, ["multiple", "disabled", "value", "options", "onUpdate:value"])), [[vShow, isShow(column)]]) : withDirectives((openBlock(), createBlock(unref(NSelect), mergeProps({
           key: 1
         }, selectProps(column.field), {
           clearable: "",
@@ -485,7 +498,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           value: __props.element[column.field],
           "onUpdate:value": [($event) => __props.element[column.field] = $event, (value) => handleUpdateSelect(value, column)],
           options: getOptions(column)
-        }), null, 16, ["multiple", "disabled", "value", "onUpdate:value", "options"])), [[vShow, isShow(column.field)]])], 64))], 64)) : createCommentVNode("v-if", true), column.type === "color" ? (openBlock(), createBlock(unref(NColorPicker), {
+        }), null, 16, ["multiple", "disabled", "value", "onUpdate:value", "options"])), [[vShow, isShow(column)]])], 64))], 64)) : createCommentVNode("v-if", true), column.type === "color" ? (openBlock(), createBlock(unref(NColorPicker), {
           key: 3,
           class: "c-field-set__color-picker",
           clearable: "",
@@ -606,7 +619,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             }
           }())]),
           _: 1
-        })], 64))], 64)) : createCommentVNode("v-if", true)], 12, _hoisted_2)) : createCommentVNode("v-if", true)], 64);
+        })], 64))], 64)) : createCommentVNode("v-if", true)], 64)) : createCommentVNode("v-if", true)], 12, _hoisted_2)) : createCommentVNode("v-if", true)], 64);
       }), 128))]);
     };
   }

package/es/components/field-set/src/types/index.d.ts

@@ -31,6 +31,7 @@ export type FieldSetColumnItem = {
     titleRender?: (column: AnyObject) => VNodeChild;
     hide?: boolean;
     positionField?: string;
+    showPrevFn?: (column: FieldSetColumnItem, row: AnyObject) => boolean;
     [key: string]: any;
 };
 export type FieldSetTab = 'field' | 'fieldColor' | 'highlightRow' | 'tableStyle' | 'fieldFilter';

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-beta.45";
+var version = "3.3.3-beta.46";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.3.3-beta.45",
+	"version": "3.3.3-beta.46",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -74,5 +74,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "0e34bd7613d179f6970d9ededc7d08273ea24162"
+	"gitHead": "13907d5357da84c258e475b68566bf0ac2053d9f"
 }