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

package/README.md

@@ -1,23 +1,23 @@
-# Vue 3 + Typescript + Vite
-
-This template should help get you started developing with Vue 3 and Typescript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
-
-## Recommended IDE Setup
-
-- [VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)
-
-## Type Support For `.vue` Imports in TS
-
-Since TypeScript cannot handle type information for `.vue` imports, they are shimmed to be a generic Vue component type by default. In most cases this is fine if you don't really care about component prop types outside of templates. However, if you wish to get actual prop types in `.vue` imports (for example to get props validation when using manual `h(...)` calls), you can enable Volar's `.vue` type support plugin by running `Volar: Switch TS Plugin on/off` from VSCode command palette.
-
-## 使用
-```JavaScript
-import { createApp } from "vue";
-import App from "./App.vue";
-import cui from "cnhis-design-vue";
-import "cnhis-design-vue/es/index.css";
-
-const app = createApp(App);
-app.use(cui);
-app.mount("#app");
+# Vue 3 + Typescript + Vite
+
+This template should help get you started developing with Vue 3 and Typescript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
+
+## Recommended IDE Setup
+
+- [VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)
+
+## Type Support For `.vue` Imports in TS
+
+Since TypeScript cannot handle type information for `.vue` imports, they are shimmed to be a generic Vue component type by default. In most cases this is fine if you don't really care about component prop types outside of templates. However, if you wish to get actual prop types in `.vue` imports (for example to get props validation when using manual `h(...)` calls), you can enable Volar's `.vue` type support plugin by running `Volar: Switch TS Plugin on/off` from VSCode command palette.
+
+## 使用
+```JavaScript
+import { createApp } from "vue";
+import App from "./App.vue";
+import cui from "cnhis-design-vue";
+import "cnhis-design-vue/es/index.css";
+
+const app = createApp(App);
+app.use(cui);
+app.mount("#app");
 ```

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

@@ -1094,7 +1094,9 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostDisabledSuccess: string;
                 borderSuccess: string;
                 borderHoverSuccess: string;
-                borderPressedSuccess: string;
+                borderPressedSuccess: string; /**
+                 * 删除选中scan数据
+                 */
                 borderFocusSuccess: string;
                 borderDisabledSuccess: string;
                 rippleColorSuccess: string;
@@ -1187,7 +1189,10 @@ declare const _default: import("vue").DefineComponent<{
                 opacityDisabled: string;
                 colorOpacitySecondary: string;
                 colorOpacitySecondaryHover: string;
-                colorOpacitySecondaryPressed: string;
+                colorOpacitySecondaryPressed: string; /**
+                 * 单个form提交成功数据
+                 * @param {*} obj formData
+                 */
                 colorSecondary: string;
                 colorSecondaryHover: string;
                 colorSecondaryPressed: string;
@@ -1209,7 +1214,10 @@ declare const _default: import("vue").DefineComponent<{
                 textColorFocus: string;
                 textColorDisabled: string;
                 textColorText: string;
-                textColorTextHover: string;
+                textColorTextHover: string; /**
+                 * 避免每次点击都查询
+                 * 初始化查一次 行编辑 表单search用
+                 */
                 textColorTextPressed: string;
                 textColorTextFocus: string;
                 textColorTextDisabled: string;
@@ -1305,7 +1313,7 @@ declare const _default: import("vue").DefineComponent<{
                 colorWarning: string;
                 colorHoverWarning: string;
                 colorPressedWarning: string;
-                colorFocusWarning: string; /** string */
+                colorFocusWarning: string;
                 colorDisabledWarning: string;
                 textColorWarning: string;
                 textColorHoverWarning: string;
@@ -1668,22 +1676,7 @@ declare const _default: import("vue").DefineComponent<{
             onBlur: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
             onClick: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
             onChange: import("vue").PropType<import("naive-ui/es/input/src/interface").OnUpdateValue>;
-            onClear: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>; /**
-             * 针对 bigTable 的设置列
-             * type: 列的类型
-             * field: 列字段名（注：属性层级越深，渲染性能将直线下降）
-             * title: 列标题（支持开启国际化）
-             * width: 列宽度（如果为空则均匀分配剩余宽度，如果全部列固定了，可能会存在宽屏下不会铺满，可以配合 "%" 或者 "min-width" 布局）
-             * minWidth: 最小列宽度；会自动将剩余空间按比例分配
-             * resizable: 列是否允许拖动列宽调整大小
-             * visible: 列是否显示
-             * fixed: 将列固定在左侧或者右侧（注意：固定列应该放在左右两侧的位置）
-             * align: 列对齐方式
-             * headerAlign: 表头列的对齐方式
-             * footerAlign: 表尾列的对齐方式
-             * formatter: 格式化显示内容 Function({cellValue, row, column})
-             * sortable: 是否允许列排序
-             */
+            onClear: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
             status: import("vue").PropType<import("naive-ui/es/form/src/interface").FormValidationStatus>;
             'onUpdate:value': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;
             onUpdateValue: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;

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

@@ -252,6 +252,9 @@ var script = /* @__PURE__ */ defineComponent({
     } = useSeparateRow(() => {
       var _a, _b;
       return (_b = (_a = props.columnConfig) == null ? void 0 : _a.fieldList) != null ? _b : [];
+    }, (columnName) => {
+      var _a, _b;
+      return (_b = (_a = props.columnConfig) == null ? void 0 : _a.fieldList) == null ? void 0 : _b.find((field) => field.columnName === columnName);
     }, xGrid);
     const onResizableChange = (payload) => {
       onColumnResize(payload);
@@ -1293,6 +1296,9 @@ var script = /* @__PURE__ */ defineComponent({
       updateAddCheckedRows(row);
     };
     const handlerClickRow = (data) => {
+      var _a;
+      if (((_a = attr.checkboxConfig) == null ? void 0 : _a.trigger) === "default")
+        return false;
       if (isScanMultiTable.value || props.isInlineOperating)
         return false;
       if (vexutils.has(data == null ? void 0 : data.row, GROUP_TITLE_KEY))

package/es/packages/big-table/src/components/edit-form/edit-separate.vue.d.ts

@@ -31,16 +31,38 @@ declare const _default: import("vue").DefineComponent<{
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
+    popoverRef: import("vue").Ref<any>;
     emit: (event: "formChange", ...args: any[]) => void;
+    editContent: import("vue").Ref<any>;
     getRowData: (row: AnyObject) => {
         separateData: Record<string, string>;
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
     } | undefined;
-    editContent: import("vue").Ref<string>;
     updateShow: (show: boolean) => void;
     style: CSSProperties;
+    SlotRender: import("vue").DefineComponent<{
+        functional: BooleanConstructor;
+        renderer: {
+            type: (StringConstructor | FunctionConstructor)[];
+            required: true;
+        };
+        rootSlots: {
+            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;
+        };
+        rootSlots: {
+            type: PropType<Record<string, import("../../../../../../es/src/types").Func<any[], any>>>;
+        };
+    }>>, {
+        functional: boolean;
+    }>;
     NPopover: import("vue").DefineComponent<{
         internalOnAfterLeave: PropType<() => void>;
         internalRenderBody: PropType<import("naive-ui/es/popover/src/interface").InternalRenderBody>;

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

@@ -1,4 +1,6 @@
-import { defineComponent, ref, openBlock, createBlock, unref, withCtx, createVNode } from 'vue';
+import { defineComponent, ref, openBlock, createBlock, unref, withCtx, createVNode, withModifiers } from 'vue';
+import SlotRender from '../../../../../src/components/SlotRender';
+import { cloneDeep, isObject, isArray } from 'lodash-es';
 import { NPopover, NInput } from 'naive-ui';
 import { useSeparateMap } from '../../../../../packages/big-table/src/hooks/useSeparateRow';
 import '../separate.js';
@@ -14,19 +16,24 @@ var script = /* @__PURE__ */ defineComponent({
   emits: ["formChange"],
   setup(__props, { emit }) {
     const props = __props;
+    const popoverRef = ref();
+    const editContent = ref();
     const { getRowData } = useSeparateMap();
-    const editContent = ref("");
     function updateShow(show) {
       const target = getRowData(props.row);
       if (!target)
         return;
       if (show) {
-        editContent.value = target.row[props.col.field];
+        editContent.value = cloneDeep(target.row[props.col.field]);
         return;
       }
       const old = target.row[props.col.field];
-      if (old === editContent.value || !target)
+      if (!target)
         return;
+      if (!isObject(editContent.value) && !isArray(editContent.value)) {
+        if (old === editContent.value)
+          return;
+      }
       target.rawRow[props.col.field] = editContent.value;
       emit("formChange", {
         value: editContent.value,
@@ -43,25 +50,39 @@ var script = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(NPopover), {
+        ref_key: "popoverRef",
+        ref: popoverRef,
+        trigger: "click",
         "show-arrow": false,
         "onUpdate:show": updateShow
       }, {
         trigger: withCtx(() => [
           createVNode(script$1, {
+            onClick: _cache[0] || (_cache[0] = withModifiers(() => {
+            }, ["stop"])),
             style,
             col: __props.col,
             row: __props.row
           }, null, 8, ["col", "row"])
         ]),
         default: withCtx(() => [
-          createVNode(unref(NInput), {
+          __props.col.separateSlot ? (openBlock(), createBlock(unref(SlotRender), {
+            key: 0,
+            functional: "",
+            renderer: __props.col.separateSlot,
+            value: editContent.value,
+            "onUpdate:value": _cache[1] || (_cache[1] = ($event) => editContent.value = $event),
+            col: __props.col,
+            row: __props.row
+          }, null, 8, ["renderer", "value", "col", "row"])) : (openBlock(), createBlock(unref(NInput), {
+            key: 1,
             value: editContent.value,
-            "onUpdate:value": _cache[0] || (_cache[0] = ($event) => editContent.value = $event),
+            "onUpdate:value": _cache[2] || (_cache[2] = ($event) => editContent.value = $event),
             type: "textarea"
-          }, null, 8, ["value"])
+          }, null, 8, ["value"]))
         ]),
         _: 1
-      });
+      }, 512);
     };
   }
 });

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

@@ -180,16 +180,38 @@ export declare const comps: {
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
         }>>;
+        popoverRef: import("vue").Ref<any>;
         emit: (event: "formChange", ...args: any[]) => void;
+        editContent: import("vue").Ref<any>;
         getRowData: (row: import("../../../../src/types").AnyObject) => {
             separateData: Record<string, string>;
             index: number;
             rawRow: import("../../../../src/types").AnyObject;
             row: import("../../../../src/types").AnyObject;
         } | undefined;
-        editContent: import("vue").Ref<string>;
         updateShow: (show: boolean) => void;
         style: import("vue").CSSProperties;
+        SlotRender: import("vue").DefineComponent<{
+            functional: BooleanConstructor;
+            renderer: {
+                type: (StringConstructor | FunctionConstructor)[];
+                required: true;
+            };
+            rootSlots: {
+                type: import("vue").PropType<Record<string, import("../../../../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;
+            };
+            rootSlots: {
+                type: import("vue").PropType<Record<string, import("../../../../src/types").Func<any[], any>>>;
+            };
+        }>>, {
+            functional: boolean;
+        }>;
         NPopover: import("vue").DefineComponent<{
             internalOnAfterLeave: import("vue").PropType<() => void>;
             internalRenderBody: import("vue").PropType<import("naive-ui/es/popover/src/interface").InternalRenderBody>;

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

@@ -22,7 +22,7 @@ export declare function useSeparateMap(): {
         row: AnyObject;
     } | undefined;
 };
-export declare function useSeparateRow(getColumnConfig: () => AnyObject[], $VXETable: Ref<undefined | VxeTableInstance>): {
+export declare function useSeparateRow(getColumnConfig: () => AnyObject[], getFieldItem: (columnName: string) => AnyObject, $VXETable: Ref<undefined | VxeTableInstance>): {
     onColumnResize: VxeTableEvents.ResizableChange;
     needSeparateColumn: import("vue").ComputedRef<AnyObject[]>;
     separate: (data: AnyObject[], rawData: AnyObject[]) => Promise<AnyObject[]>;

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

@@ -1,5 +1,5 @@
 import { useMemoize } from '@vueuse/core';
-import { isNumber, isString } from 'lodash-es';
+import { isNumber, isArray, cloneDeep, isString } from 'lodash-es';
 import { ref, computed, provide, watch, nextTick } from 'vue';
 import { InjectionSeparateHandle } from '../../../../packages/big-table/src/constants';
 
@@ -17,7 +17,6 @@ class SeparateHandle {
     this.callbacks.clear();
   }
   trigger() {
-    console.log("trigger");
     this.callbacks.forEach((cb) => cb());
   }
 }
@@ -68,7 +67,7 @@ function useSeparateMap() {
   }
   return { separateDataMap, getRowData };
 }
-function useSeparateRow(getColumnConfig, $VXETable) {
+function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
   const needSeparateColumn = computed(() => {
     return getColumnConfig().filter((column) => column.formType === "separate");
   });
@@ -77,11 +76,11 @@ function useSeparateRow(getColumnConfig, $VXETable) {
       return data;
     }
     return data.reduce(async (res, row, dataIndex) => {
-      let parsedRowData = [];
+      const parsedRowData = [];
       for (const column of needSeparateColumn.value) {
         parsedRowData.push({
           columnName: column.columnName,
-          data: contentSeparate(row[column.columnName], await getColumnRenderWidth(column))
+          data: contentSeparate(row[column.columnName], column.columnName, await getColumnRenderWidth(column))
         });
       }
       (await res).push(...Array.from({ length: getColumnInfoMaxLength(parsedRowData) }).map((_, index) => {
@@ -129,7 +128,12 @@ function useSeparateRow(getColumnConfig, $VXETable) {
       }
     }
   }
-  function contentSeparate(value, width) {
+  function contentSeparate(value, columnName, width) {
+    if (isArray(value))
+      return value.map((row) => {
+        var _a, _b, _c;
+        return (_c = (_b = (_a = getFieldItem(columnName)) == null ? void 0 : _a.separateFormatter) == null ? void 0 : _b.call(_a, cloneDeep(row))) != null ? _c : row;
+      });
     if (!isString(value) || !isNumber(width))
       return [value];
     width -= 20;

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

@@ -2,10 +2,13 @@ import { SFCWithInstall } from '../../../es/src/types';
 declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
     type: {
         type: StringConstructor;
+        required: false;
         default: string;
     };
 }, {
-    asyncInstance: import("vue").Ref<any>;
+    props: {
+        type: string;
+    };
     OldFieldSet: import("vue").DefineComponent<{
         fields: {
             type: import("vue").PropType<any[]>;
@@ -81,16 +84,6 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         isMiddleAndAdmin: import("vue").ComputedRef<boolean>;
         showCheckBox: (key: string) => boolean;
         hideTab: () => void;
-        getTableFields: () => {
-            id: string;
-            field: string;
-            visible: boolean;
-            sequence: number;
-            sortable: boolean;
-            title: string;
-            fixed: string;
-            minWidth: number;
-        }[];
         handleFieldSave: () => void;
         onCancle: () => void;
         onChangeShow: (e: boolean, ele: {
@@ -115,6 +108,17 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
             isFixed: number;
             colWidth: number;
         }) => void;
+        onButtonChecked: (e: boolean, itemButton: {
+            [key: string]: any;
+            sid: string;
+            columnName: string;
+            isShow: number;
+            isSort: number;
+            title: string;
+            alias: string;
+            isFixed: number;
+            colWidth: number;
+        }) => void;
         calculateCheck: (key: string) => boolean;
         handleAllCheck: (e: boolean, key: string) => void;
         handleFieldClick: (item: {
@@ -2736,17 +2740,6 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         isMiddleAndAdmin: import("vue").ComputedRef<boolean>;
         showCheckBox: (key: string) => boolean;
         hideTab: () => void;
-        getTableFields: () => {
-            [key: string]: any;
-            id: string;
-            name: string;
-            show: boolean;
-            sort: boolean;
-            alias: string;
-            fixedShow: boolean;
-            fixedWay: "NONE" | "LEFT" | "RIGHT";
-            columnWidth: number;
-        }[];
         handleFieldSave: () => void;
         onCancle: () => void;
         calculateCheck: (key: string) => boolean;
@@ -5298,6 +5291,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     type: {
         type: StringConstructor;
+        required: false;
         default: string;
     };
 }>>, {