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

package/es/components/big-table/index2.js

@@ -1,6 +1,5 @@
 import { COMPONENT_NAMESPACE } from '../../shared/global/variable2.js';
 import { safeComponentRegister } from '../../shared/utils/index2.js';
-import { loadVxeTable } from '../../shared/utils/loadVxe2.js';
 import { expandXEUtils } from '../../shared/utils/utilExpand.js';
 import '../index2.js';
 import script from './src/BigTable.js';
@@ -12,7 +11,6 @@ const BigTable = script;
 BigTable.install = function(app) {
   safeComponentRegister(app, BigTable, COMPONENT_NAMESPACE + "BigTable");
   safeComponentRegister(app, Grid, COMPONENT_NAMESPACE + "Grid");
-  loadVxeTable(app);
   return expandXEUtils();
 };
 

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

@@ -430,7 +430,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         };
       }
       const currentColumns = fieldList.map((item, index) => {
-        var _a2, _b2, _c2, _d, _e, _f, _g;
+        var _a2, _b2, _c2, _d, _e, _f, _g, _h;
         let filterField = false;
         let filterItems = [];
         try {
@@ -445,6 +445,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         let sortable = props.isNestTable ? false : !filterField && item.isSort == 1 && notParticipatingSort != 1 && item.isMerge != 1;
         let treeNode = props.isNestTable ? false : state.isTree != 0 ? index === 0 : false;
         let type = index === 0 && props.showNestTable ? "expand" : "";
+        const isShow = item.isShow == 1 && ((_e = item == null ? void 0 : item.settingObj) == null ? void 0 : _e.isHide) != 1;
         if (isScanMultiTable2) {
           fixed = "";
           sortable = false;
@@ -452,15 +453,15 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           type = "";
         }
         const col = Object.assign(item, {
-          visible: item.columnName == "operatorColumn" ? showButtonTop == 0 : item.isShow == 1,
+          visible: item.columnName == "operatorColumn" ? showButtonTop == 0 : isShow,
           field: item.columnName,
           title: handleName(item, "title"),
           minWidth: item.colWidth,
           fixed,
           sortable,
           headerClassName: "mycolumn",
-          resizable: (_e = item.resizable) != null ? _e : true,
-          showOverflow: (_f = item.showOverflow) != null ? _f : "title",
+          resizable: (_f = item.resizable) != null ? _f : true,
+          showOverflow: (_g = item.showOverflow) != null ? _g : "title",
           treeNode,
           type,
           slots: {
@@ -475,7 +476,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         if (filterField && !props.isNestTable && !isScanMultiTable2) {
           state.filterFields[item.columnName] = Object.assign({}, XEUtils.clone({
             ...item,
-            setting: item.settingObj
+            setting: item.settingObj || {}
           }, true), {
             visible: false,
             left: "initial",
@@ -497,7 +498,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         if (!isScanMultiTable2 && !isFunction(attr.footerMethod) && !isFunction(attr["footer-method"])) {
           col.slots.footer = "tooltip_footer";
         }
-        if (props.showNestTable && state.isTree == 0 && ((_g = props.curNestColumnConfig) == null ? void 0 : _g.isTree) == 0) {
+        if (props.showNestTable && state.isTree == 0 && ((_h = props.curNestColumnConfig) == null ? void 0 : _h.isTree) == 0) {
           col.slots.content = "nest_table_content";
         }
         return col;

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

@@ -19,7 +19,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
 }, {
     fieldsMapping: Record<string, string>;
     selectOptions: Record<string, string>[];
-    emit: (event: "onSave" | "onClose", ...args: any[]) => void;
+    emit: (event: "onSave" | "onClose" | "reset", ...args: any[]) => void;
     settingView: any;
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fields: {
@@ -39,11 +39,11 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
             default: boolean;
         };
     }>> & {
+        onReset?: ((...args: any[]) => any) | undefined;
         onOnSave?: ((...args: any[]) => any) | undefined;
         onOnClose?: ((...args: any[]) => any) | undefined;
     }>>;
     initFields: () => any[];
-    realityFields: import("vue").ComputedRef<any[]>;
     state: {
         spinning: boolean;
         isCustomSearch: boolean;
@@ -212,7 +212,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onSave" | "onClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose" | "reset")[], "onSave" | "onClose" | "reset", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fields: {
         type: import("vue").PropType<any[]>;
         default: () => never[];
@@ -230,6 +230,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         default: boolean;
     };
 }>> & {
+    onReset?: ((...args: any[]) => any) | undefined;
     onOnSave?: ((...args: any[]) => any) | undefined;
     onOnClose?: ((...args: any[]) => any) | undefined;
 }, {

package/es/components/field-set/src/FieldSet.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, reactive, onMounted, openBlock, createElementBlock, normalizeStyle, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, toDisplayString, withDirectives, vShow, renderSlot, createTextVNode } from 'vue';
+import { defineComponent, ref, reactive, watch, onMounted, openBlock, createElementBlock, normalizeStyle, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, toDisplayString, withDirectives, vShow, renderSlot, createTextVNode } from 'vue';
 import { NSpin, NCheckbox, NTooltip, NSelect, NInput, NInputNumber, NButton } from 'naive-ui';
 import Draggable from 'vuedraggable';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
@@ -78,7 +78,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       default: false
     }
   },
-  emits: ["onSave", "onClose"],
+  emits: ["onSave", "onClose", "reset"],
   setup(__props, { expose, emit }) {
     const props = __props;
     const fieldsMapping = {
@@ -126,12 +126,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
       return result;
     }
-    const realityFields = computed(initFields);
     const state = reactive({
       spinning: false,
       isCustomSearch: true,
       clickItem: {},
-      fields: realityFields.value,
+      fields: [],
       widthShow: "10%",
       widthLarge: "20%"
     });
@@ -181,6 +180,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     function reset() {
       state.fields = initFields();
+      emit("reset");
     }
     const calculateCheck = (key) => {
       if (!state.fields.length)
@@ -213,6 +213,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         state.widthLarge = "15%";
       }
     }
+    watch(() => props.fields, (value) => {
+      if ((value == null ? void 0 : value.length) > 0) {
+        state.fields = initFields();
+      }
+    }, { immediate: true, deep: true });
     onMounted(() => {
       hideTab();
       setWidth();

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

@@ -46,7 +46,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     fieldsMapping: Record<string, string>;
     selectOptions: Record<string, string>[];
-    emit: (event: "onSave" | "onClose", ...args: any[]) => void;
+    emit: (event: "onSave" | "onClose" | "reset", ...args: any[]) => void;
     settingView: any;
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fields: {
@@ -66,11 +66,11 @@ declare const _default: import("vue").DefineComponent<{
             default: boolean;
         };
     }>> & {
+        onReset?: ((...args: any[]) => any) | undefined;
         onOnSave?: ((...args: any[]) => any) | undefined;
         onOnClose?: ((...args: any[]) => any) | undefined;
     }>>;
     initFields: () => any[];
-    realityFields: import("vue").ComputedRef<any[]>;
     state: Istate;
     leftStyle: (ele: Ifields) => {
         background: string | undefined;
@@ -166,7 +166,7 @@ declare const _default: import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onSave" | "onClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose" | "reset")[], "onSave" | "onClose" | "reset", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fields: {
         type: PropType<any[]>;
         default: () => never[];
@@ -184,6 +184,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
 }>> & {
+    onReset?: ((...args: any[]) => any) | undefined;
     onOnSave?: ((...args: any[]) => any) | undefined;
     onOnClose?: ((...args: any[]) => any) | undefined;
 }, {

package/es/components/form-render/src/components/renderer/combination.d.ts

@@ -11,6 +11,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     maxGroupNum: {
         type: NumberConstructor;
     };
+    disabled: {
+        type: BooleanConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];
@@ -29,6 +32,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     maxGroupNum: {
         type: NumberConstructor;
     };
+    disabled: {
+        type: BooleanConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];
@@ -39,6 +45,7 @@ export declare const COMBINATION: import("vue").DefineComponent<{
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
+    disabled: boolean;
     title: string;
     getProperties: () => FieldItem[];
 }>;

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

@@ -22,6 +22,9 @@ const script = defineComponent({
     maxGroupNum: {
       type: Number
     },
+    disabled: {
+      type: Boolean
+    },
     getProperties: {
       type: Function,
       default: () => []
@@ -70,7 +73,7 @@ const script = defineComponent({
         "onClick": addGroup,
         "type": "info",
         "text": true,
-        "disabled": currentGroupNum.value >= maxGroupNum.value
+        "disabled": currentGroupNum.value >= maxGroupNum.value || props.disabled
       }, {
         icon: () => createVNode(NIcon, {
           "component": AddCircleOutline

package/es/components/grid/index2.js

@@ -1,13 +1,11 @@
 import { COMPONENT_NAMESPACE } from '../../shared/global/variable2.js';
 import { safeComponentRegister } from '../../shared/utils/index2.js';
-import { loadVxeTable } from '../../shared/utils/loadVxe2.js';
 import '../../shared/utils/utilExpand.js';
 import script from './src/Grid.js';
 
 const Grid = script;
 Grid.install = function(app) {
   safeComponentRegister(app, Grid, COMPONENT_NAMESPACE + "Grid");
-  loadVxeTable(app);
 };
 
 export { Grid as default };