cnhis-design-vue 3.1.14-beta.7.1 → 3.1.14-beta.8

package/es/packages/field-set/src/FieldSet.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, openBlock, createBlock, resolveDynamicComponent, mergeProps, createSlots, renderList, withCtx, renderSlot } from 'vue';
+import { defineComponent, openBlock, createElementBlock, Fragment, createCommentVNode, createBlock, normalizeProps, mergeProps } from 'vue';
 import './OldFieldSet.js';
 import './NewFieldSet.js';
 import script$1 from './OldFieldSet.vue_vue_type_script_setup_true_lang.js';
@@ -7,25 +7,14 @@ import script$2 from './NewFieldSet.vue_vue_type_script_setup_true_lang.js';
 var script = /* @__PURE__ */ defineComponent({
   __name: "FieldSet",
   props: {
-    type: { type: String, default: "old" }
+    type: { type: String, required: false, default: "old" }
   },
-  setup(__props, { expose }) {
-    const asyncInstance = ref();
-    expose({ asyncInstance });
+  setup(__props) {
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(resolveDynamicComponent(__props.type == "old" ? script$1 : script$2), mergeProps({
-        ref_key: "asyncInstance",
-        ref: asyncInstance
-      }, _ctx.$attrs), createSlots({ _: 2 }, [
-        renderList(_ctx.$slots, (slot, slotName) => {
-          return {
-            name: slotName,
-            fn: withCtx(() => [
-              renderSlot(_ctx.$slots, slotName)
-            ])
-          };
-        })
-      ]), 1040);
+      return openBlock(), createElementBlock(Fragment, null, [
+        createCommentVNode(' <component :is="currentComp"></component> '),
+        __props.type == "old" ? (openBlock(), createBlock(script$1, normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createBlock(script$2, normalizeProps(mergeProps({ key: 1 }, _ctx.$attrs)), null, 16))
+      ], 2112);
     };
   }
 });

package/es/packages/field-set/src/NewFieldSet.vue.d.ts

@@ -66,7 +66,6 @@ declare const _default: import("vue").DefineComponent<{
     isMiddleAndAdmin: import("vue").ComputedRef<boolean>;
     showCheckBox: (key: string) => boolean;
     hideTab: () => void;
-    getTableFields: () => Ifields[];
     handleFieldSave: () => void;
     onCancle: () => void;
     calculateCheck: (key: string) => boolean;

package/es/packages/field-set/src/NewFieldSet.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, onMounted, computed, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, normalizeStyle, toDisplayString, withDirectives, vShow, vModelSelect, vModelText, renderSlot, createTextVNode } from 'vue';
+import { defineComponent, ref, reactive, onMounted, computed, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, renderSlot, normalizeStyle, toDisplayString, withDirectives, vShow, vModelSelect, vModelText, createTextVNode } from 'vue';
 import { NSpin, NCheckbox, NTooltip, NButton } from 'naive-ui';
 import Draggable from 'vuedraggable';
 
@@ -70,7 +70,7 @@ var script = /* @__PURE__ */ defineComponent({
     }
   },
   emits: ["onSave", "onClose"],
-  setup(__props, { expose, emit }) {
+  setup(__props, { emit }) {
     const props = __props;
     const settingView = ref(null);
     const state = reactive({
@@ -101,11 +101,8 @@ var script = /* @__PURE__ */ defineComponent({
         (_b = settingView.value) == null ? void 0 : _b.style.setProperty("margin", "auto");
       }
     };
-    const getTableFields = () => {
-      return state.fields;
-    };
     const handleFieldSave = () => {
-      emit("onSave", { tableFields: getTableFields() });
+      emit("onSave", { tableFields: state.fields });
     };
     const onCancle = () => {
       emit("onClose");
@@ -132,9 +129,6 @@ var script = /* @__PURE__ */ defineComponent({
     const handleFieldClick = (item) => {
       state.clickItem = item;
     };
-    expose({
-      getTableFields
-    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         ref_key: "settingView",
@@ -175,8 +169,10 @@ var script = /* @__PURE__ */ defineComponent({
                   ]),
                   createCommentVNode(" \u56FA\u5B9A "),
                   _hoisted_9,
-                  createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
-                  _hoisted_10,
+                  renderSlot(_ctx.$slots, "default", {}, () => [
+                    createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
+                    _hoisted_10
+                  ]),
                   createCommentVNode(" \u5217\u5BBD "),
                   _hoisted_11
                 ], 2),
@@ -242,14 +238,16 @@ var script = /* @__PURE__ */ defineComponent({
                             [vModelSelect, element.fixedWay]
                           ])
                         ]),
-                        createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
-                        createElementVNode("span", _hoisted_25, [
-                          withDirectives(createElementVNode("input", {
-                            "onUpdate:modelValue": ($event) => element.alias = $event,
-                            class: "alias-style"
-                          }, null, 8, _hoisted_26), [
-                            [vShow, element.id != "0001"],
-                            [vModelText, element.alias]
+                        renderSlot(_ctx.$slots, "default", {}, () => [
+                          createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
+                          createElementVNode("span", _hoisted_25, [
+                            withDirectives(createElementVNode("input", {
+                              "onUpdate:modelValue": ($event) => element.alias = $event,
+                              class: "alias-style"
+                            }, null, 8, _hoisted_26), [
+                              [vShow, element.id != "0001"],
+                              [vModelText, element.alias]
+                            ])
                           ])
                         ]),
                         createCommentVNode(" \u5217\u5BBD "),
@@ -263,32 +261,30 @@ var script = /* @__PURE__ */ defineComponent({
                         ])
                       ], 12, _hoisted_12)
                     ]),
-                    _: 1
+                    _: 3
                   }, 8, ["list"])
                 ], 2)
               ]),
               props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_29, [
                 createElementVNode("div", _hoisted_30, [
-                  renderSlot(_ctx.$slots, "footer", {}, () => [
-                    createVNode(unref(NButton), {
-                      style: { "margin-right": "8px" },
-                      onClick: onCancle
-                    }, {
-                      default: withCtx(() => [
-                        _hoisted_31
-                      ]),
-                      _: 1
-                    }),
-                    createVNode(unref(NButton), {
-                      type: "primary",
-                      onClick: handleFieldSave
-                    }, {
-                      default: withCtx(() => [
-                        _hoisted_32
-                      ]),
-                      _: 1
-                    })
-                  ])
+                  createVNode(unref(NButton), {
+                    style: { "margin-right": "8px" },
+                    onClick: onCancle
+                  }, {
+                    default: withCtx(() => [
+                      _hoisted_31
+                    ]),
+                    _: 1
+                  }),
+                  createVNode(unref(NButton), {
+                    type: "primary",
+                    onClick: handleFieldSave
+                  }, {
+                    default: withCtx(() => [
+                      _hoisted_32
+                    ]),
+                    _: 1
+                  })
                 ])
               ])) : createCommentVNode("v-if", true)
             ])

package/es/packages/field-set/src/OldFieldSet.vue.d.ts

@@ -10,16 +10,6 @@ declare type Ifields = {
     colWidth: number;
     [key: string]: any;
 };
-declare type ItableFields = {
-    id: string;
-    field: string;
-    visible: boolean;
-    sequence: number;
-    sortable: boolean;
-    title: string;
-    fixed: string;
-    minWidth: number;
-}[];
 declare type Istate = {
     spinning: boolean;
     isCustomSearch: boolean;
@@ -76,11 +66,11 @@ declare const _default: import("vue").DefineComponent<{
     isMiddleAndAdmin: import("vue").ComputedRef<boolean>;
     showCheckBox: (key: string) => boolean;
     hideTab: () => void;
-    getTableFields: () => ItableFields;
     handleFieldSave: () => void;
     onCancle: () => void;
     onChangeShow: (e: boolean, ele: Ifields) => void;
     onChangeSort: (e: boolean, ele: Ifields) => void;
+    onButtonChecked: (e: boolean, itemButton: Ifields) => void;
     calculateCheck: (key: string) => boolean;
     handleAllCheck: (e: boolean, key: string) => void;
     handleFieldClick: (item: Ifields) => void;

package/es/packages/field-set/src/OldFieldSet.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, onMounted, computed, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, normalizeStyle, toDisplayString, withDirectives, vShow, vModelSelect, vModelText, renderSlot, createTextVNode } from 'vue';
+import { defineComponent, ref, reactive, onMounted, computed, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, renderSlot, normalizeStyle, toDisplayString, withDirectives, vShow, vModelSelect, vModelText, createTextVNode } from 'vue';
 import { NSpin, NCheckbox, NTooltip, NButton } from 'naive-ui';
 import Draggable from 'vuedraggable';
 
@@ -70,7 +70,7 @@ var script = /* @__PURE__ */ defineComponent({
     }
   },
   emits: ["onSave", "onClose"],
-  setup(__props, { expose, emit }) {
+  setup(__props, { emit }) {
     const props = __props;
     const settingView = ref(null);
     const state = reactive({
@@ -101,7 +101,7 @@ var script = /* @__PURE__ */ defineComponent({
         (_b = settingView.value) == null ? void 0 : _b.style.setProperty("margin", "auto");
       }
     };
-    const getTableFields = () => {
+    const handleFieldSave = () => {
       let tableFields = [];
       if (state.fields.length > 0) {
         state.fields.forEach((item, i) => {
@@ -117,10 +117,6 @@ var script = /* @__PURE__ */ defineComponent({
           });
         });
       }
-      return tableFields;
-    };
-    const handleFieldSave = () => {
-      const tableFields = getTableFields();
       emit("onSave", { tableFields });
     };
     const onCancle = () => {
@@ -162,9 +158,6 @@ var script = /* @__PURE__ */ defineComponent({
     const handleFieldClick = (item) => {
       state.clickItem = item;
     };
-    expose({
-      getTableFields
-    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         ref_key: "settingView",
@@ -205,8 +198,10 @@ var script = /* @__PURE__ */ defineComponent({
                   ]),
                   createCommentVNode(" \u56FA\u5B9A "),
                   _hoisted_9,
-                  createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
-                  _hoisted_10,
+                  renderSlot(_ctx.$slots, "default", {}, () => [
+                    createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
+                    _hoisted_10
+                  ]),
                   createCommentVNode(" \u5217\u5BBD "),
                   _hoisted_11
                 ], 2),
@@ -274,14 +269,16 @@ var script = /* @__PURE__ */ defineComponent({
                             [vModelSelect, element.isFixed]
                           ])
                         ]),
-                        createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
-                        createElementVNode("span", _hoisted_25, [
-                          withDirectives(createElementVNode("input", {
-                            "onUpdate:modelValue": ($event) => element.alias = $event,
-                            class: "alias-style"
-                          }, null, 8, _hoisted_26), [
-                            [vShow, element.sid != "0001"],
-                            [vModelText, element.alias]
+                        renderSlot(_ctx.$slots, "default", {}, () => [
+                          createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
+                          createElementVNode("span", _hoisted_25, [
+                            withDirectives(createElementVNode("input", {
+                              "onUpdate:modelValue": ($event) => element.alias = $event,
+                              class: "alias-style"
+                            }, null, 8, _hoisted_26), [
+                              [vShow, element.sid != "0001"],
+                              [vModelText, element.alias]
+                            ])
                           ])
                         ]),
                         createCommentVNode(" \u5217\u5BBD "),
@@ -295,32 +292,30 @@ var script = /* @__PURE__ */ defineComponent({
                         ])
                       ], 12, _hoisted_12)
                     ]),
-                    _: 1
+                    _: 3
                   }, 8, ["list"])
                 ], 2)
               ]),
               props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_29, [
                 createElementVNode("div", _hoisted_30, [
-                  renderSlot(_ctx.$slots, "footer", {}, () => [
-                    createVNode(unref(NButton), {
-                      style: { "margin-right": "8px" },
-                      onClick: onCancle
-                    }, {
-                      default: withCtx(() => [
-                        _hoisted_31
-                      ]),
-                      _: 1
-                    }),
-                    createVNode(unref(NButton), {
-                      type: "primary",
-                      onClick: handleFieldSave
-                    }, {
-                      default: withCtx(() => [
-                        _hoisted_32
-                      ]),
-                      _: 1
-                    })
-                  ])
+                  createVNode(unref(NButton), {
+                    style: { "margin-right": "8px" },
+                    onClick: onCancle
+                  }, {
+                    default: withCtx(() => [
+                      _hoisted_31
+                    ]),
+                    _: 1
+                  }),
+                  createVNode(unref(NButton), {
+                    type: "primary",
+                    onClick: handleFieldSave
+                  }, {
+                    default: withCtx(() => [
+                      _hoisted_32
+                    ]),
+                    _: 1
+                  })
                 ])
               ])) : createCommentVNode("v-if", true)
             ])

package/es/packages/info-header/index.d.ts

@@ -1405,6 +1405,7 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         readonly tooltip: boolean | import("naive-ui").PopoverProps;
     }>;
     SlotRender: import("vue").DefineComponent<{
+        functional: BooleanConstructor;
         renderer: {
             type: (StringConstructor | FunctionConstructor)[];
             required: true;
@@ -1413,6 +1414,7 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<Record<string, import("../../../es/src/types").Func<any[], any>>>;
         };
     }, () => 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<{
+        functional: BooleanConstructor;
         renderer: {
             type: (StringConstructor | FunctionConstructor)[];
             required: true;
@@ -1420,7 +1422,9 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         rootSlots: {
             type: import("vue").PropType<Record<string, import("../../../es/src/types").Func<any[], any>>>;
         };
-    }>>, {}>;
+    }>>, {
+        functional: boolean;
+    }>;
     HiddenContent: import("vue").DefineComponent<{
         content: {
             type: StringConstructor;

package/es/packages/info-header/src/InfoHeader.vue.d.ts

@@ -1406,6 +1406,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly tooltip: boolean | import("naive-ui").PopoverProps;
     }>;
     SlotRender: import("vue").DefineComponent<{
+        functional: BooleanConstructor;
         renderer: {
             type: (StringConstructor | FunctionConstructor)[];
             required: true;
@@ -1414,6 +1415,7 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<Record<string, import("../../../../es/src/types").Func<any[], any>>>;
         };
     }, () => 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<{
+        functional: BooleanConstructor;
         renderer: {
             type: (StringConstructor | FunctionConstructor)[];
             required: true;
@@ -1421,7 +1423,9 @@ declare const _default: import("vue").DefineComponent<{
         rootSlots: {
             type: PropType<Record<string, import("../../../../es/src/types").Func<any[], any>>>;
         };
-    }>>, {}>;
+    }>>, {
+        functional: boolean;
+    }>;
     HiddenContent: import("vue").DefineComponent<{
         content: {
             type: StringConstructor;

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

@@ -1,6 +1,7 @@
 import { Func } from '../../../../es/src/types';
 import { PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
+    functional: BooleanConstructor;
     renderer: {
         type: (StringConstructor | FunctionConstructor)[];
         required: true;
@@ -9,6 +10,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<Record<string, Func<any[], any>>>;
     };
 }, () => 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<{
+    functional: BooleanConstructor;
     renderer: {
         type: (StringConstructor | FunctionConstructor)[];
         required: true;
@@ -16,5 +18,7 @@ declare const _default: import("vue").DefineComponent<{
     rootSlots: {
         type: PropType<Record<string, Func<any[], any>>>;
     };
-}>>, {}>;
+}>>, {
+    functional: boolean;
+}>;
 export default _default;

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

@@ -1,9 +1,10 @@
 import { isString, isFunction } from 'lodash-es';
-import { defineComponent } from 'vue';
+import { defineComponent, h } from 'vue';
 
 var script = defineComponent({
   name: "SlotRender",
   props: {
+    functional: Boolean,
     renderer: {
       type: [String, Function],
       required: true
@@ -21,7 +22,7 @@ var script = defineComponent({
       return isFunction(renderer) ? renderer(attrs) : null;
     }
     function renderVNode(renderer) {
-      return isFunction(renderer) ? renderer(attrs) : null;
+      return isFunction(renderer) ? props.functional ? h(renderer, attrs) : renderer(attrs) : null;
     }
     return () => {
       const {

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 {};