cnhis-design-vue 3.1.23-beta.1 → 3.1.23-beta.11

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

@@ -643,9 +643,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         userInfo: Record<string, any>;
         sysImageSize: unknown[];
     }>;
-    handleSeqConfig: import("vue").ComputedRef<{
-        startIndex: number;
-    }>;
     treeConfig: import("vue").ComputedRef<null>;
     hideAllWrap: (e: any) => void;
     bindDocumentClick: () => void;

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

@@ -641,9 +641,6 @@ declare const _default: import("vue").DefineComponent<{
         userInfo: Record<string, any>;
         sysImageSize: unknown[];
     }>;
-    handleSeqConfig: import("vue").ComputedRef<{
-        startIndex: number;
-    }>;
     treeConfig: import("vue").ComputedRef<null>;
     hideAllWrap: (e: any) => void;
     bindDocumentClick: () => void;

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

@@ -136,21 +136,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         sysImageSize: props.sysImageSize || {}
       };
     });
-    const handleSeqConfig = computed(() => {
-      if (props.isNestTable)
-        return {
-          startIndex: 0
-        };
-      if (props.isBatchEditing) {
-        return {
-          startIndex: 0
-        };
-      }
-      let startIndex = (props.pageVO.pageIndex - 1) * props.pageVO.pageSize;
-      return {
-        startIndex: startIndex < 0 ? 0 : startIndex
-      };
-    });
     const treeConfig = computed(() => {
       let result = null;
       let {
@@ -2149,8 +2134,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }, {
       immediate: true
     });
-    nextTick(() => {
-      loadData(props.data);
+    watch([() => props.data, () => {
+      var _a;
+      return (_a = props.data) == null ? void 0 : _a.length;
+    }], async ([value]) => {
+      await nextTick();
+      loadData(value);
+    }, {
+      immediate: true
     });
     watch(() => currentCheckedKeys, (val) => {
       setVisibleCheckAllWrap(state, props, currentCheckedKeys.value);
@@ -2314,10 +2305,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "mouse-config": {
           selected: ((_a = _ctx.columnConfig.keyboardConfig) == null ? void 0 : _a.isEdit) ? true : false
         },
-        "seq-config": unref(handleSeqConfig),
         "tree-config": unref(treeConfig),
         "row-class-name": getRowClassName,
-        "cell-class-name": _ctx.columnConfig.cellClassName || null,
         "row-config": {
           ...state.rowConfig,
           ...unref(getAttr)("row-config")
@@ -2419,7 +2408,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["height", "mouse-config", "seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "sort-config", "tooltip-config", "checkbox-config", "radio-config", "scroll-y", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+      }, 16, ["height", "mouse-config", "tree-config", "row-config", "show-footer", "sort-config", "tooltip-config", "checkbox-config", "radio-config", "scroll-y", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

package/es/components/big-table/src/utils.d.ts

@@ -5,7 +5,7 @@ export declare const getMapVal: (row: any, item: any) => any;
 export declare const getageShowType: (row: any, item: any) => any;
 export declare const reScrollFilterWrap: () => void;
 export declare const showFilter: (field: any, columnName: any, event: any, props: any, state: any) => false | undefined;
-export declare const handleGroupColums: (columns: any, props: any) => any;
+export declare const handleGroupColums: (columns: any, props: any) => any[];
 export declare const handlerInitSearchItem: (arr: any) => void;
 export declare const generateEditRender: (fieldItem: any) => {
     name: string;

package/es/components/big-table/src/utils2.js

@@ -1,7 +1,8 @@
-import { nextTick } from 'vue';
+import img from '../../../shared/assets/img/xb_small.js';
 import XEUtils from 'xe-utils';
 import 'moment';
-import img from '../../../shared/assets/img/xb_small.js';
+import { nextTick } from 'vue';
+import { groupTraverser, createRowGroupList } from '../../iho-table/src/plugins/rowGroupSettingPlugin/rowGroupUtils2.js';
 
 const isJSON = (str) => {
   if (typeof str == "string") {
@@ -166,43 +167,16 @@ const showFilter = (field, columnName, event, props, state) => {
   field.indeterminate = !!len && len !== field.setting.showSetting.length;
   field.searchFilterText = "";
 };
-const handleRowColumns = (rowColumns, columns, key) => {
-  rowColumns.map((item) => {
-    var _a;
-    const children = [];
-    let spliceIndex = -1;
-    const indexArr = [];
-    ((_a = item.list) == null ? void 0 : _a.length) && item.list.forEach((v) => {
-      const matchItem = columns == null ? void 0 : columns.find((column) => column[key] === v);
-      if (matchItem) {
-        const matchIndex = columns.findIndex((column) => column[key] === v);
-        indexArr.push(matchIndex);
-        delete matchItem.fixed;
-        children.push(matchItem);
-        columns.splice(matchIndex, 1);
-      }
-    });
-    const obj = {
-      title: item.title,
-      align: "center",
-      children
-    };
-    spliceIndex = Math.min(...indexArr);
-    spliceIndex > -1 && columns.splice(spliceIndex, 0, obj);
-  });
-};
 const handleGroupColums = (columns, props) => {
   const { rowGroupSetting } = props;
-  if (!rowGroupSetting || !Object.keys(rowGroupSetting).length)
-    return columns;
-  const { firstRowGroup, secondRowGroup } = rowGroupSetting;
-  if (!firstRowGroup || !firstRowGroup.length)
-    return columns;
-  handleRowColumns(firstRowGroup, columns, "columnName");
-  if (!secondRowGroup || !secondRowGroup.length)
-    return columns;
-  handleRowColumns(secondRowGroup, columns, "title");
-  return columns;
+  return groupTraverser(createRowGroupList(rowGroupSetting, columns, (field) => field.columnName || field.type), (fieldName, isBlock) => {
+    if (isBlock)
+      return { field: fieldName, title: fieldName, align: "center" };
+    return fieldSearcher(fieldName, columns);
+  });
+  function fieldSearcher(fieldName, fieldList) {
+    return fieldList.find((field) => (field.columnName || field.type) === fieldName);
+  }
 };
 const handlerInitSearchItem = (arr) => {
   if (!Array.isArray(arr))

package/es/components/fabric-chart/src/components/PopupMenu.js

@@ -87,6 +87,11 @@ var PopupMenu = defineComponent({
     watch(() => props.show, (value) => {
       if (value) {
         setNoShow = true;
+        props.list.forEach((item) => {
+          if (typeof item === "object" && Reflect.has(item, "value") && typeof item.value !== "boolean") {
+            item.value = void 0;
+          }
+        });
       }
     });
     return () => {
@@ -98,12 +103,12 @@ var PopupMenu = defineComponent({
           "class": "c-fabric-chart-popup-menu",
           "style": pointStyle.value
         }, [props.list.map((item) => {
-          return createVNode("li", {
+          return props.show ? createVNode("li", {
             "class": {
               "no-click": setNoClick(item)
             },
             "onClick": (event) => clickItem(event, item)
-          }, [getItemContent(item)]);
+          }, [getItemContent(item)]) : null;
         })]), [[vShow, props.show]])]
       });
     };

package/es/components/fabric-chart/src/hooks/useCenter2.js

@@ -20,6 +20,12 @@ function getPointArr(arr) {
     return pre;
   }, []);
 }
+function deleteProperty(data, list) {
+  list.map((v) => v.type).forEach((key) => {
+    if (Reflect.has(data, key))
+      Reflect.deleteProperty(data, key);
+  });
+}
 function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem) {
   useGrid(canvas, propItems);
   const {
@@ -138,7 +144,6 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       if (event2.button === 3) {
         const { x = 0, y = 0 } = event2.pointer || {};
         if (x >= originX && x <= endX && y >= originY && y <= endY) {
-          pointTipProps.show = false;
           pointMenuProps.point = { x, y };
           pointMenuProps.show = true;
           const { type } = ((_a = event2.target) == null ? void 0 : _a.origin) || {};
@@ -552,10 +557,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         ...item.origin
       });
     } else {
-      const data = {
-        time: target.origin.data.time,
-        value: target.origin.data.value
-      };
+      const data = { ...target.origin.data };
+      deleteProperty(data, TEMPERATURE_MENU);
+      deleteProperty(data, PAIN_MENU);
       data[`${item.type}`] = item.value;
       if (target.origin.type === "temperature") {
         data["key"] = target.origin.key;

package/es/components/fabric-chart/src/hooks/useEvent2.js

@@ -27,14 +27,10 @@ function useCanvasEvent(canvas, propItems, emits) {
       ...selectionStyle
     });
     canvas.value.add(rect);
-    rect.on("mousedown", () => {
-      emits("select", key);
-    });
     return rect;
   }
+  let selections = [];
   function initSelection() {
-    if (typeof (selectionStyle == null ? void 0 : selectionStyle.evented) === "boolean" && !(selectionStyle == null ? void 0 : selectionStyle.evented))
-      return;
     const selections2 = [];
     selections2.push(drawRect({
       left: iconsWidth,
@@ -73,17 +69,53 @@ function useCanvasEvent(canvas, propItems, emits) {
       width: endX - originX,
       height: endY - originY - 3
     }, "grid"));
+    selections2.forEach((obj) => {
+      if (obj.key.endsWith("All")) {
+        obj.sendToBack();
+        obj.on("mouseup", (event) => {
+          const { button, pointer } = event;
+          if (button == 1) {
+            const _key = obj.key.replace("All", "");
+            const key = pointer.x <= originX ? _key + "Title" : _key;
+            select(key);
+            emits("select", key);
+          }
+        });
+      } else {
+        obj.on("mousedown", () => {
+          emits("select", obj.key);
+        });
+        setTimeout(() => {
+          obj.bringToFront();
+        });
+      }
+    });
     canvas.value.renderAll();
     return selections2;
   }
-  const selections = initSelection();
+  function addSelectionListener() {
+    canvas.value.on("selection:cleared", selectionCB);
+    canvas.value.on("selection:updated", selectionCB);
+    function selectionCB(event) {
+      const { deselected = [] } = event;
+      deselected.forEach((obj) => {
+        obj.key.endsWith("All") && obj.sendToBack();
+      });
+    }
+  }
   function select(key) {
-    canvas.value.discardActiveObject();
-    canvas.value.renderAll();
+    canvas.value.discardActiveObject().renderAll();
     const obj = selections == null ? void 0 : selections.find((obj2) => obj2.key === key);
     obj == null ? void 0 : obj.bringToFront();
     obj && canvas.value.setActiveObject(obj);
   }
+  function init() {
+    if (typeof (selectionStyle == null ? void 0 : selectionStyle.evented) === "boolean" && !(selectionStyle == null ? void 0 : selectionStyle.evented))
+      return;
+    selections = initSelection();
+    addSelectionListener();
+  }
+  init();
   return { select };
 }
 

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

@@ -139,6 +139,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
     NInputNumber: any;
     NSpin: any;
     NTooltip: any;
+    NPopconfirm: any;
     draggable: import("vue").DefineComponent<{
         list: {
             type: ArrayConstructor;

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

@@ -1,5 +1,5 @@
 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 { NSpin, NCheckbox, NTooltip, NSelect, NInput, NInputNumber, NPopconfirm, NButton } from 'naive-ui';
 import Draggable from 'vuedraggable';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
@@ -54,8 +54,9 @@ const _hoisted_28 = {
 };
 const _hoisted_29 = { class: "btn-operate" };
 const _hoisted_30 = /* @__PURE__ */ createTextVNode("\u6062\u590D\u9ED8\u8BA4\u8BBE\u7F6E");
-const _hoisted_31 = /* @__PURE__ */ createTextVNode("\u53D6\u6D88");
-const _hoisted_32 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58");
+const _hoisted_31 = /* @__PURE__ */ createTextVNode(" \u786E\u8BA4\u8981\u6062\u590D\u7CFB\u7EDF\u9ED8\u8BA4\u8BBE\u7F6E\u5417\uFF1F ");
+const _hoisted_32 = /* @__PURE__ */ createTextVNode("\u53D6\u6D88");
+const _hoisted_33 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58");
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FieldSet",
   props: {
@@ -403,12 +404,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_28, [
                 createElementVNode("div", _hoisted_29, [
                   renderSlot(_ctx.$slots, "footer", {}, () => [
-                    createVNode(unref(NButton), {
-                      style: { "margin-right": "8px" },
-                      onClick: reset
-                    }, {
+                    createVNode(unref(NPopconfirm), { onPositiveClick: reset }, {
+                      trigger: withCtx(() => [
+                        createVNode(unref(NButton), { style: { "margin-right": "8px" } }, {
+                          default: withCtx(() => [
+                            _hoisted_30
+                          ]),
+                          _: 1
+                        })
+                      ]),
                       default: withCtx(() => [
-                        _hoisted_30
+                        _hoisted_31
                       ]),
                       _: 1
                     }),
@@ -417,7 +423,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       onClick: onCancle
                     }, {
                       default: withCtx(() => [
-                        _hoisted_31
+                        _hoisted_32
                       ]),
                       _: 1
                     }),
@@ -426,7 +432,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       onClick: handleFieldSave
                     }, {
                       default: withCtx(() => [
-                        _hoisted_32
+                        _hoisted_33
                       ]),
                       _: 1
                     })

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

@@ -93,6 +93,7 @@ declare const _default: import("vue").DefineComponent<{
     NInputNumber: any;
     NSpin: any;
     NTooltip: any;
+    NPopconfirm: any;
     draggable: import("vue").DefineComponent<{
         list: {
             type: ArrayConstructor;

package/es/components/form-config/index.d.ts

@@ -940,6 +940,12 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 search_key?: string[] | undefined;
                 type?: string | undefined;
                 value_key?: string | undefined;
+                level_key?: string | undefined;
+                link_key?: string | undefined;
+                link_key_split?: string | undefined;
+                show_key?: string[] | undefined;
+                conObj?: import("../../../es/shared/types").AnyObject[] | undefined;
+                conObjFirstLevel?: import("../../../es/shared/types").AnyObject[] | undefined;
             } | undefined;
             open?: {
                 value?: any;

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -942,6 +942,12 @@ declare const _default: import("vue").DefineComponent<{
                 search_key?: string[] | undefined;
                 type?: string | undefined;
                 value_key?: string | undefined;
+                level_key?: string | undefined;
+                link_key?: string | undefined;
+                link_key_split?: string | undefined;
+                show_key?: string[] | undefined;
+                conObj?: import("../../../../es/shared/types").AnyObject[] | undefined;
+                conObjFirstLevel?: import("../../../../es/shared/types").AnyObject[] | undefined;
             } | undefined;
             open?: {
                 value?: any;

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -69,6 +69,12 @@ declare const _default: import("vue").DefineComponent<{}, {
             search_key?: string[] | undefined;
             type?: string | undefined;
             value_key?: string | undefined;
+            level_key?: string | undefined;
+            link_key?: string | undefined;
+            link_key_split?: string | undefined;
+            show_key?: string[] | undefined;
+            conObj?: import("../../../../../es/shared/types").AnyObject[] | undefined;
+            conObjFirstLevel?: import("../../../../../es/shared/types").AnyObject[] | undefined;
         } | undefined;
         open?: {
             value?: any;

package/es/components/form-render/index2.js

@@ -26,7 +26,7 @@ import './src/components/renderer/inputNumber.js';
 import './src/components/renderer/linebar.js';
 import './src/components/renderer/inputGroup2.js';
 import './src/components/renderer/date.js';
-import './src/components/renderer/cascader.js';
+import './src/components/renderer/levelSearchCascade.js';
 import './src/components/renderer/jsonCombination/index.js';
 import './src/components/renderer/combination.js';
 import './src/components/renderer/checkbox.js';
@@ -37,6 +37,7 @@ import './src/components/renderer/slider.js';
 import './src/components/renderer/complex.js';
 import './src/components/renderer/simpleComponent.js';
 import './src/components/renderer/search.js';
+import './src/components/renderer/searchCascade.js';
 
 const FormRender = script;
 FormRender.install = function(app) {

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

@@ -6,7 +6,7 @@ export * from './inputNumber';
 export * from './linebar';
 export * from './inputGroup';
 export * from './date';
-export * from './cascader';
+export * from './levelSearchCascade';
 export * from './jsonCombination';
 export * from './combination';
 export * from './checkbox';
@@ -17,3 +17,4 @@ export * from './slider';
 export * from './complex';
 export * from './simpleComponent';
 export * from './search';
+export * from './searchCascade';

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

@@ -6,7 +6,7 @@ export { INPUT_NUMBER } from './inputNumber.js';
 export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup2.js';
 export { DATE } from './date.js';
-export { SEARCH_CASCADE } from './cascader.js';
+export { LEVEL_SEARCH_CASCADE } from './levelSearchCascade.js';
 export { JSON_COMBINATION } from './jsonCombination/index.js';
 export { COMBINATION } from './combination.js';
 export { CHECKBOX } from './checkbox.js';
@@ -17,3 +17,4 @@ export { SLIDER } from './slider.js';
 export { COMPLEX } from './complex.js';
 export { BUTTON, LINE_BREAKS, TEXT } from './simpleComponent.js';
 export { SEARCH } from './search.js';
+export { SEARCH_CASCADE } from './searchCascade.js';

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

@@ -6,7 +6,7 @@ export { INPUT_NUMBER } from './inputNumber.js';
 export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup2.js';
 export { DATE } from './date.js';
-export { SEARCH_CASCADE } from './cascader.js';
+export { LEVEL_SEARCH_CASCADE } from './levelSearchCascade.js';
 export { JSON_COMBINATION } from './jsonCombination/index.js';
 export { COMBINATION } from './combination.js';
 export { CHECKBOX } from './checkbox.js';
@@ -17,3 +17,4 @@ export { SLIDER } from './slider.js';
 export { COMPLEX } from './complex.js';
 export { BUTTON, LINE_BREAKS, TEXT } from './simpleComponent.js';
 export { SEARCH } from './search.js';
+export { SEARCH_CASCADE } from './searchCascade.js';

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

@@ -0,0 +1,86 @@
+import { AnyObject, Func } from '../../../../../../es/shared/types';
+import { PropType } from 'vue';
+declare type ValueType = string | AnyObject[];
+export declare const LEVEL_SEARCH_CASCADE: import("vue").DefineComponent<{
+    options: {
+        type: PropType<AnyObject[]>;
+        default: () => never[];
+    };
+    onFocus: {
+        type: PropType<Func<any[], any>>;
+    };
+    autograph: {
+        type: StringConstructor;
+        required: true;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    wordbook: {
+        type: PropType<Partial<{
+            level_num: number;
+            id: string;
+            name: string;
+            render_key: string[];
+            search_key: string[];
+            type: string;
+            value_key: string;
+            level_key: string;
+            link_key: string;
+            link_key_split: string;
+            show_key: string[];
+            conObj: AnyObject[];
+            conObjFirstLevel: AnyObject[];
+        }>>;
+        required: true;
+    };
+    onChange: {};
+    value: {
+        type: PropType<ValueType>;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    options: {
+        type: PropType<AnyObject[]>;
+        default: () => never[];
+    };
+    onFocus: {
+        type: PropType<Func<any[], any>>;
+    };
+    autograph: {
+        type: StringConstructor;
+        required: true;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    wordbook: {
+        type: PropType<Partial<{
+            level_num: number;
+            id: string;
+            name: string;
+            render_key: string[];
+            search_key: string[];
+            type: string;
+            value_key: string;
+            level_key: string;
+            link_key: string;
+            link_key_split: string;
+            show_key: string[];
+            conObj: AnyObject[];
+            conObjFirstLevel: AnyObject[];
+        }>>;
+        required: true;
+    };
+    onChange: {};
+    value: {
+        type: PropType<ValueType>;
+    };
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {
+    options: AnyObject[];
+    lazyRequest: boolean;
+}>;
+export {};