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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. package/README.md +23 -23
  2. package/es/packages/big-table/index.d.ts +1 -0
  3. package/es/packages/big-table/src/BigTable.vue.d.ts +31 -14
  4. package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js +29 -16
  5. package/es/packages/big-table/src/components/edit-form/edit-separate.vue.d.ts +9 -14
  6. package/es/packages/big-table/src/components/edit-form/edit-separate.vue_vue_type_script_setup_true_lang.js +1 -2
  7. package/es/packages/big-table/src/components/separate.vue.d.ts +3 -4
  8. package/es/packages/big-table/src/components/separate.vue_vue_type_script_setup_true_lang.js +7 -3
  9. package/es/packages/big-table/src/hooks/useEdit.d.ts +9 -13
  10. package/es/packages/big-table/src/hooks/useSeparateRow.js +4 -4
  11. package/es/packages/big-table/src/utils.js +1 -1
  12. package/es/packages/big-table/style/index.css +12 -2
  13. package/es/packages/fabric-chart/index.d.ts +2 -0
  14. package/es/packages/fabric-chart/src/FabricChart.vue.d.ts +2 -0
  15. package/es/packages/fabric-chart/src/FabricChart.vue_vue_type_script_setup_true_lang.js +16 -6
  16. package/es/packages/fabric-chart/src/hooks/useDraw.js +1 -0
  17. package/es/packages/fabric-chart/src/hooks/useLeft.js +14 -14
  18. package/es/packages/fabric-chart/src/hooks/useRight.js +2 -13
  19. package/es/packages/fabric-chart/src/hooks/useTop.js +9 -10
  20. package/es/packages/fabric-chart/src/interface.d.ts +4 -0
  21. package/es/packages/form-render/src/components/renderer/cascader.d.ts +1 -1
  22. package/es/packages/form-render/src/components/renderer/cascader.js +4 -8
  23. package/es/packages/form-render/src/components/renderer/input.js +5 -16
  24. package/es/packages/form-render/src/components/renderer/inputNumber.d.ts +12 -0
  25. package/es/packages/form-render/src/components/renderer/inputNumber.js +11 -4
  26. package/es/packages/form-render/src/components/renderer/select.js +9 -2
  27. package/es/packages/form-render/src/hooks/useFieldListAdaptor.js +3 -1
  28. package/es/packages/form-render/src/types/fieldItem.d.ts +1 -1
  29. package/es/packages/form-render/src/utils/index.d.ts +8 -2
  30. package/es/packages/form-render/src/utils/index.js +40 -14
  31. package/es/packages/index.css +12 -2
  32. package/es/packages/info-header/index.d.ts +3 -7
  33. package/es/packages/info-header/src/InfoHeader.vue.d.ts +3 -7
  34. package/es/src/components/SlotRender/SlotRender.d.ts +4 -8
  35. package/es/src/components/SlotRender/SlotRender.js +4 -5
  36. package/global.d.ts +8 -8
  37. package/package.json +2 -2
package/README.md CHANGED
@@ -1,23 +1,23 @@
1
- # Vue 3 + Typescript + Vite
2
-
3
- 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.
4
-
5
- ## Recommended IDE Setup
6
-
7
- - [VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)
8
-
9
- ## Type Support For `.vue` Imports in TS
10
-
11
- 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.
12
-
13
- ## 使用
14
- ```JavaScript
15
- import { createApp } from "vue";
16
- import App from "./App.vue";
17
- import cui from "cnhis-design-vue";
18
- import "cnhis-design-vue/es/index.css";
19
-
20
- const app = createApp(App);
21
- app.use(cui);
22
- app.mount("#app");
23
- ```
1
+ # Vue 3 + Typescript + Vite
2
+
3
+ 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.
4
+
5
+ ## Recommended IDE Setup
6
+
7
+ - [VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)
8
+
9
+ ## Type Support For `.vue` Imports in TS
10
+
11
+ 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.
12
+
13
+ ## 使用
14
+ ```JavaScript
15
+ import { createApp } from "vue";
16
+ import App from "./App.vue";
17
+ import cui from "cnhis-design-vue";
18
+ import "cnhis-design-vue/es/index.css";
19
+
20
+ const app = createApp(App);
21
+ app.use(cui);
22
+ app.mount("#app");
23
+ ```
@@ -2928,6 +2928,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
2928
2928
  handleFilterSearchChange: (value: any, columnName: any, field: any) => void;
2929
2929
  handleFilterClearAll: (field: any) => void;
2930
2930
  handleCancelFilter: () => void;
2931
+ mergeQuickSearchConfig: (filterFields: any, props: any) => void;
2931
2932
  handleFilter: (field: any) => void;
2932
2933
  onmousedownFunc: (e: any) => void;
2933
2934
  maskInsert: () => void;
@@ -1094,9 +1094,7 @@ declare const _default: import("vue").DefineComponent<{
1094
1094
  textColorGhostDisabledSuccess: string;
1095
1095
  borderSuccess: string;
1096
1096
  borderHoverSuccess: string;
1097
- borderPressedSuccess: string; /**
1098
- * 删除选中scan数据
1099
- */
1097
+ borderPressedSuccess: string;
1100
1098
  borderFocusSuccess: string;
1101
1099
  borderDisabledSuccess: string;
1102
1100
  rippleColorSuccess: string;
@@ -1153,7 +1151,14 @@ declare const _default: import("vue").DefineComponent<{
1153
1151
  borderDisabledError: string;
1154
1152
  rippleColorError: string;
1155
1153
  waveOpacity: string;
1156
- fontWeight: string;
1154
+ fontWeight: string; /**
1155
+ * 初始化props
1156
+ * @param {*} unionItem
1157
+ * @param {*} row
1158
+ * @param {*} column
1159
+ * @param {*} $rowIndex
1160
+ * @returns
1161
+ */
1157
1162
  fontWeightStrong: string;
1158
1163
  paddingTiny: string;
1159
1164
  paddingSmall: string;
@@ -1189,10 +1194,7 @@ declare const _default: import("vue").DefineComponent<{
1189
1194
  opacityDisabled: string;
1190
1195
  colorOpacitySecondary: string;
1191
1196
  colorOpacitySecondaryHover: string;
1192
- colorOpacitySecondaryPressed: string; /**
1193
- * 单个form提交成功数据
1194
- * @param {*} obj formData
1195
- */
1197
+ colorOpacitySecondaryPressed: string;
1196
1198
  colorSecondary: string;
1197
1199
  colorSecondaryHover: string;
1198
1200
  colorSecondaryPressed: string;
@@ -1214,10 +1216,7 @@ declare const _default: import("vue").DefineComponent<{
1214
1216
  textColorFocus: string;
1215
1217
  textColorDisabled: string;
1216
1218
  textColorText: string;
1217
- textColorTextHover: string; /**
1218
- * 避免每次点击都查询
1219
- * 初始化查一次 行编辑 表单search用
1220
- */
1219
+ textColorTextHover: string;
1221
1220
  textColorTextPressed: string;
1222
1221
  textColorTextFocus: string;
1223
1222
  textColorTextDisabled: string;
@@ -1252,7 +1251,9 @@ declare const _default: import("vue").DefineComponent<{
1252
1251
  textColorGhostPressedPrimary: string;
1253
1252
  textColorGhostFocusPrimary: string;
1254
1253
  textColorGhostDisabledPrimary: string;
1255
- borderPrimary: string;
1254
+ borderPrimary: string; /**
1255
+ * tsx渲染表格
1256
+ */
1256
1257
  borderHoverPrimary: string;
1257
1258
  borderPressedPrimary: string;
1258
1259
  borderFocusPrimary: string;
@@ -2934,6 +2935,7 @@ declare const _default: import("vue").DefineComponent<{
2934
2935
  handleFilterSearchChange: (value: any, columnName: any, field: any) => void;
2935
2936
  handleFilterClearAll: (field: any) => void;
2936
2937
  handleCancelFilter: () => void;
2938
+ mergeQuickSearchConfig: (filterFields: any, props: any) => void;
2937
2939
  handleFilter: (field: any) => void;
2938
2940
  onmousedownFunc: (e: any) => void;
2939
2941
  maskInsert: () => void;
@@ -3289,7 +3291,22 @@ declare const _default: import("vue").DefineComponent<{
3289
3291
  buttonColor2: string;
3290
3292
  buttonColor2Hover: string;
3291
3293
  buttonColor2Pressed: string;
3292
- boxShadow1: string;
3294
+ boxShadow1: string; /**
3295
+ * 针对 bigTable 的设置列
3296
+ * type: 列的类型
3297
+ * field: 列字段名(注:属性层级越深,渲染性能将直线下降)
3298
+ * title: 列标题(支持开启国际化)
3299
+ * width: 列宽度(如果为空则均匀分配剩余宽度,如果全部列固定了,可能会存在宽屏下不会铺满,可以配合 "%" 或者 "min-width" 布局)
3300
+ * minWidth: 最小列宽度;会自动将剩余空间按比例分配
3301
+ * resizable: 列是否允许拖动列宽调整大小
3302
+ * visible: 列是否显示
3303
+ * fixed: 将列固定在左侧或者右侧(注意:固定列应该放在左右两侧的位置)
3304
+ * align: 列对齐方式
3305
+ * headerAlign: 表头列的对齐方式
3306
+ * footerAlign: 表尾列的对齐方式
3307
+ * formatter: 格式化显示内容 Function({cellValue, row, column})
3308
+ * sortable: 是否允许列排序
3309
+ */
3293
3310
  boxShadow2: string;
3294
3311
  boxShadow3: string;
3295
3312
  fontFamily: string;
@@ -1,5 +1,5 @@
1
1
  import { defineComponent, ref, reactive, useAttrs, computed, onMounted, onUnmounted, onActivated, createVNode, h, resolveComponent, Teleport, createTextVNode, nextTick, watch, openBlock, createElementBlock, Fragment, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, unref, mergeProps, withCtx, renderSlot, createBlock, toDisplayString, withDirectives, vShow, isVNode } from 'vue';
2
- import { isFunction } from 'lodash-es';
2
+ import { isArray, isFunction } from 'lodash-es';
3
3
  import { useSeparateRow } from '../../../packages/big-table/src/hooks/useSeparateRow';
4
4
  import bigTableState from './bigTableState.js';
5
5
  import bigTableProps from './bigTableProps.js';
@@ -14,10 +14,10 @@ import { SettingsSharp, CaretDown, CaretForward, CopyOutline, SyncOutline } from
14
14
  import './components/NoData.js';
15
15
  import TextOverTooltip from '../../../src/components/TextOverTooltip';
16
16
  import SvgIcon from '../../../src/components/SvgIcon';
17
- import { useMessage, NIcon, NTooltip, NCheckbox, NCheckboxGroup, NSpace, NButton, NPopconfirm, NProgress, NDropdown, NSwitch, NPopover } from 'naive-ui';
17
+ import { useMessage, NIcon, NTooltip, NCheckbox, NCheckboxGroup, NGrid, NGi, NSpace, NButton, NPopconfirm, NProgress, NDropdown, NSwitch, NPopover } from 'naive-ui';
18
18
  import CGrid from '../../../packages/grid';
19
19
  import vexutils from '../../../src/utils/vexutils';
20
- import { handleTableHeight, setTableConfig, handleGroupColums, treeToList, checkMethod, setTreeGroupTitle, handleName, generateEditRender, handlerInitSearchItem, getEvaluate, getMapVal, getCandidateComponents, getageShowType, isLink, showFilter, reScrollFilterWrap, hideFilterWrap, mergeConObjFn, setDefaultFormData, handleImgArr, handleImgSrc, modalDetailImage, handleQrCodeContent, getInlineEditBtn, isCopy, setVisibleCheckAllWrap, setFilterStatus, handleTableImageSize, visibleMethod, getRowStyle, getFooterGroup, flattenRow, intersectRow, removeCheckedDisabledRows } from './utils.js';
20
+ import { handleTableHeight, setTableConfig, handleGroupColums, treeToList, checkMethod, setTreeGroupTitle, handleName, generateEditRender, handlerInitSearchItem, getEvaluate, getMapVal, getCandidateComponents, getageShowType, isLink, showFilter, reScrollFilterWrap, hideFilterWrap, mergeConObjFn, setDefaultFormData, handleImgArr, handleImgSrc, modalDetailImage, handleQrCodeContent, getInlineEditBtn, isCopy, setVisibleCheckAllWrap, handleTableImageSize, visibleMethod, getRowStyle, getFooterGroup, flattenRow, intersectRow, removeCheckedDisabledRows } from './utils.js';
21
21
  import './components/input-button.js';
22
22
  import './components/separate.js';
23
23
  import xb_big from '../../../src/assets/img/xb_big';
@@ -772,7 +772,7 @@ var script = /* @__PURE__ */ defineComponent({
772
772
  height: state.filterHeight + state.distance + "px"
773
773
  }
774
774
  }, [!field.searchFilterText ? createVNode("div", {
775
- "class": "ant-checkbox-group"
775
+ "class": "sort-item"
776
776
  }, [createVNode(NCheckbox, {
777
777
  "indeterminate": field.indeterminate,
778
778
  "checked": field.checkAll,
@@ -785,13 +785,17 @@ var script = /* @__PURE__ */ defineComponent({
785
785
  "value": field.CONVERT,
786
786
  "onUpdate:value": (val) => handleFilterChange(val, item.columnName, field)
787
787
  }, {
788
- default: () => [createVNode(NSpace, {
789
- "item-style": "display: flex;"
788
+ default: () => [createVNode(NGrid, {
789
+ "cols": 1
790
790
  }, _isSlot(_slot = field.filterItems.map((item2) => {
791
- return createVNode(NCheckbox, {
792
- "value": item2.value,
793
- "label": item2.key
794
- }, null);
791
+ return createVNode(NGi, {
792
+ "class": "sort-item"
793
+ }, {
794
+ default: () => [createVNode(NCheckbox, {
795
+ "value": item2.value,
796
+ "label": item2.key
797
+ }, null)]
798
+ });
795
799
  })) ? _slot : {
796
800
  default: () => [_slot]
797
801
  })]
@@ -828,11 +832,13 @@ var script = /* @__PURE__ */ defineComponent({
828
832
  }, {
829
833
  default: () => [createTextVNode("\u6E05\u7A7A")]
830
834
  })]) : null, createVNode("div", null, [createVNode(NButton, {
835
+ "size": "small",
831
836
  "class": "checkbox-btn",
832
837
  "onClick": () => handleCancelFilter()
833
838
  }, {
834
839
  default: () => [createTextVNode("\u53D6\u6D88")]
835
840
  }), createVNode(NButton, {
841
+ "size": "small",
836
842
  "class": "checkbox-btn",
837
843
  "type": "primary",
838
844
  "onClick": () => handleFilter(field)
@@ -879,7 +885,7 @@ var script = /* @__PURE__ */ defineComponent({
879
885
  };
880
886
  const handleFilterChange = (value, name, field) => {
881
887
  reScrollFilterWrap();
882
- state.filterFields[name].CONVERT = value;
888
+ field.CONVERT = value;
883
889
  field.checkAll = value.length === field.filterItems.length;
884
890
  field.indeterminate = !!value.length && value.length !== field.filterItems.length;
885
891
  };
@@ -914,8 +920,20 @@ var script = /* @__PURE__ */ defineComponent({
914
920
  const handleCancelFilter = () => {
915
921
  hideFilterWrap(state, props);
916
922
  };
923
+ function mergeQuickSearchConfig(filterFields, props2) {
924
+ if (!isArray(props2.quickSearchConfig))
925
+ return;
926
+ props2.quickSearchConfig.length = 0;
927
+ Object.entries(filterFields).forEach(([field_key, filterField]) => {
928
+ props2.quickSearchConfig.push({
929
+ field_key,
930
+ value: filterField.CONVERT || []
931
+ });
932
+ });
933
+ }
917
934
  const handleFilter = (field) => {
918
935
  let conObj = mergeConObjFn(state, props);
936
+ mergeQuickSearchConfig(state.filterFields, props);
919
937
  emit("onSave", conObj, false, [], [], {
920
938
  isBigTable: true
921
939
  });
@@ -2137,11 +2155,6 @@ var script = /* @__PURE__ */ defineComponent({
2137
2155
  watch(() => currentCheckedKeys, (val) => {
2138
2156
  setVisibleCheckAllWrap(state, props, currentCheckedKeys.value);
2139
2157
  });
2140
- watch(() => props.quickSearchConfig, (val) => {
2141
- setFilterStatus(state, props);
2142
- }, {
2143
- deep: true
2144
- });
2145
2158
  watch(() => props.tableDataCache, (val) => {
2146
2159
  setAllCheckedRows(val);
2147
2160
  }, {
@@ -1,9 +1,8 @@
1
1
  import { AnyObject } from '../../../../../../es/src/types';
2
2
  import { CSSProperties, PropType } from 'vue';
3
- import { VxeTableDefines } from 'vxe-table';
4
3
  declare const _default: import("vue").DefineComponent<{
5
4
  col: {
6
- type: PropType<VxeTableDefines.ColumnInfo>;
5
+ type: PropType<AnyObject>;
7
6
  required: true;
8
7
  };
9
8
  row: {
@@ -17,7 +16,7 @@ declare const _default: import("vue").DefineComponent<{
17
16
  }, {
18
17
  props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
19
18
  col: {
20
- type: PropType<VxeTableDefines.ColumnInfo>;
19
+ type: PropType<AnyObject>;
21
20
  required: true;
22
21
  };
23
22
  row: {
@@ -43,26 +42,22 @@ declare const _default: import("vue").DefineComponent<{
43
42
  updateShow: (show: boolean) => void;
44
43
  style: CSSProperties;
45
44
  SlotRender: import("vue").DefineComponent<{
46
- functional: BooleanConstructor;
47
45
  renderer: {
48
- type: (StringConstructor | FunctionConstructor)[];
46
+ type: PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../../../../es/src/types").Func<any[], any>>;
49
47
  required: true;
50
48
  };
51
49
  rootSlots: {
52
50
  type: PropType<Record<string, import("../../../../../../es/src/types").Func<any[], any>>>;
53
51
  };
54
52
  }, () => 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<{
55
- functional: BooleanConstructor;
56
53
  renderer: {
57
- type: (StringConstructor | FunctionConstructor)[];
54
+ type: PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../../../../es/src/types").Func<any[], any>>;
58
55
  required: true;
59
56
  };
60
57
  rootSlots: {
61
58
  type: PropType<Record<string, import("../../../../../../es/src/types").Func<any[], any>>>;
62
59
  };
63
- }>>, {
64
- functional: boolean;
65
- }>;
60
+ }>>, {}>;
66
61
  NPopover: import("vue").DefineComponent<{
67
62
  internalOnAfterLeave: PropType<() => void>;
68
63
  internalRenderBody: PropType<import("naive-ui/es/popover/src/interface").InternalRenderBody>;
@@ -1213,7 +1208,7 @@ declare const _default: import("vue").DefineComponent<{
1213
1208
  }>;
1214
1209
  Separate: import("vue").DefineComponent<{
1215
1210
  col: {
1216
- type: PropType<VxeTableDefines.ColumnInfo>;
1211
+ type: PropType<AnyObject>;
1217
1212
  required: true;
1218
1213
  };
1219
1214
  row: {
@@ -1223,7 +1218,7 @@ declare const _default: import("vue").DefineComponent<{
1223
1218
  }, {
1224
1219
  props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
1225
1220
  col: {
1226
- type: PropType<VxeTableDefines.ColumnInfo>;
1221
+ type: PropType<AnyObject>;
1227
1222
  required: true;
1228
1223
  };
1229
1224
  row: {
@@ -1242,7 +1237,7 @@ declare const _default: import("vue").DefineComponent<{
1242
1237
  displayContent: import("vue").ComputedRef<string>;
1243
1238
  }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
1244
1239
  col: {
1245
- type: PropType<VxeTableDefines.ColumnInfo>;
1240
+ type: PropType<AnyObject>;
1246
1241
  required: true;
1247
1242
  };
1248
1243
  row: {
@@ -1252,7 +1247,7 @@ declare const _default: import("vue").DefineComponent<{
1252
1247
  }>>, {}>;
1253
1248
  }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
1254
1249
  col: {
1255
- type: PropType<VxeTableDefines.ColumnInfo>;
1250
+ type: PropType<AnyObject>;
1256
1251
  required: true;
1257
1252
  };
1258
1253
  row: {
@@ -44,7 +44,7 @@ var script = /* @__PURE__ */ defineComponent({
44
44
  }
45
45
  const style = {
46
46
  border: "1px solid #f5f5f5",
47
- padding: "4px 0",
47
+ padding: "4px 0 4px 4px",
48
48
  background: "white",
49
49
  "border-radius": "4px"
50
50
  };
@@ -68,7 +68,6 @@ var script = /* @__PURE__ */ defineComponent({
68
68
  default: withCtx(() => [
69
69
  __props.col.separateSlot ? (openBlock(), createBlock(unref(SlotRender), {
70
70
  key: 0,
71
- functional: "",
72
71
  renderer: __props.col.separateSlot,
73
72
  value: editContent.value,
74
73
  "onUpdate:value": _cache[1] || (_cache[1] = ($event) => editContent.value = $event),
@@ -1,9 +1,8 @@
1
1
  import { AnyObject } from '../../../../../es/src/types';
2
2
  import { PropType } from 'vue';
3
- import { VxeTableDefines } from 'vxe-table';
4
3
  declare const _default: import("vue").DefineComponent<{
5
4
  col: {
6
- type: PropType<VxeTableDefines.ColumnInfo>;
5
+ type: PropType<AnyObject>;
7
6
  required: true;
8
7
  };
9
8
  row: {
@@ -13,7 +12,7 @@ declare const _default: import("vue").DefineComponent<{
13
12
  }, {
14
13
  props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
15
14
  col: {
16
- type: PropType<VxeTableDefines.ColumnInfo>;
15
+ type: PropType<AnyObject>;
17
16
  required: true;
18
17
  };
19
18
  row: {
@@ -32,7 +31,7 @@ declare const _default: import("vue").DefineComponent<{
32
31
  displayContent: import("vue").ComputedRef<string>;
33
32
  }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
34
33
  col: {
35
- type: PropType<VxeTableDefines.ColumnInfo>;
34
+ type: PropType<AnyObject>;
36
35
  required: true;
37
36
  };
38
37
  row: {
@@ -1,7 +1,8 @@
1
- import { defineComponent, computed, openBlock, createElementBlock, toDisplayString, unref } from 'vue';
1
+ import { defineComponent, computed, openBlock, createElementBlock, createTextVNode, toDisplayString, unref, createElementVNode } from 'vue';
2
2
  import { useSeparateMap } from '../../../../packages/big-table/src/hooks/useSeparateRow';
3
3
 
4
- const _hoisted_1 = { style: { padding: "4px 0" } };
4
+ const _hoisted_1 = { class: "big-table__separate" };
5
+ const _hoisted_2 = /* @__PURE__ */ createElementVNode("span", { class: "big-table__separatePlaceholder" }, "p", -1);
5
6
  var script = /* @__PURE__ */ defineComponent({
6
7
  __name: "separate",
7
8
  props: {
@@ -16,7 +17,10 @@ var script = /* @__PURE__ */ defineComponent({
16
17
  return target ? target.separateData[props.col.field] : "";
17
18
  });
18
19
  return (_ctx, _cache) => {
19
- return openBlock(), createElementBlock("div", _hoisted_1, toDisplayString(unref(displayContent)), 1);
20
+ return openBlock(), createElementBlock("div", _hoisted_1, [
21
+ createTextVNode(toDisplayString(unref(displayContent)) + " ", 1),
22
+ _hoisted_2
23
+ ]);
20
24
  };
21
25
  }
22
26
  });
@@ -152,7 +152,7 @@ export declare const comps: {
152
152
  }>;
153
153
  separate: import("vue").DefineComponent<{
154
154
  col: {
155
- type: import("vue").PropType<import("vxe-table").VxeTableDefines.ColumnInfo>;
155
+ type: import("vue").PropType<import("../../../../src/types").AnyObject>;
156
156
  required: true;
157
157
  };
158
158
  row: {
@@ -166,7 +166,7 @@ export declare const comps: {
166
166
  }, {
167
167
  props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
168
168
  col: {
169
- type: import("vue").PropType<import("vxe-table").VxeTableDefines.ColumnInfo>;
169
+ type: import("vue").PropType<import("../../../../src/types").AnyObject>;
170
170
  required: true;
171
171
  };
172
172
  row: {
@@ -192,26 +192,22 @@ export declare const comps: {
192
192
  updateShow: (show: boolean) => void;
193
193
  style: import("vue").CSSProperties;
194
194
  SlotRender: import("vue").DefineComponent<{
195
- functional: BooleanConstructor;
196
195
  renderer: {
197
- type: (StringConstructor | FunctionConstructor)[];
196
+ type: import("vue").PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../../src/types").Func<any[], any>>;
198
197
  required: true;
199
198
  };
200
199
  rootSlots: {
201
200
  type: import("vue").PropType<Record<string, import("../../../../src/types").Func<any[], any>>>;
202
201
  };
203
202
  }, () => 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<{
204
- functional: BooleanConstructor;
205
203
  renderer: {
206
- type: (StringConstructor | FunctionConstructor)[];
204
+ type: import("vue").PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../../src/types").Func<any[], any>>;
207
205
  required: true;
208
206
  };
209
207
  rootSlots: {
210
208
  type: import("vue").PropType<Record<string, import("../../../../src/types").Func<any[], any>>>;
211
209
  };
212
- }>>, {
213
- functional: boolean;
214
- }>;
210
+ }>>, {}>;
215
211
  NPopover: import("vue").DefineComponent<{
216
212
  internalOnAfterLeave: import("vue").PropType<() => void>;
217
213
  internalRenderBody: import("vue").PropType<import("naive-ui/es/popover/src/interface").InternalRenderBody>;
@@ -1362,7 +1358,7 @@ export declare const comps: {
1362
1358
  }>;
1363
1359
  Separate: import("vue").DefineComponent<{
1364
1360
  col: {
1365
- type: import("vue").PropType<import("vxe-table").VxeTableDefines.ColumnInfo>;
1361
+ type: import("vue").PropType<import("../../../../src/types").AnyObject>;
1366
1362
  required: true;
1367
1363
  };
1368
1364
  row: {
@@ -1372,7 +1368,7 @@ export declare const comps: {
1372
1368
  }, {
1373
1369
  props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
1374
1370
  col: {
1375
- type: import("vue").PropType<import("vxe-table").VxeTableDefines.ColumnInfo>;
1371
+ type: import("vue").PropType<import("../../../../src/types").AnyObject>;
1376
1372
  required: true;
1377
1373
  };
1378
1374
  row: {
@@ -1391,7 +1387,7 @@ export declare const comps: {
1391
1387
  displayContent: import("vue").ComputedRef<string>;
1392
1388
  }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
1393
1389
  col: {
1394
- type: import("vue").PropType<import("vxe-table").VxeTableDefines.ColumnInfo>;
1390
+ type: import("vue").PropType<import("../../../../src/types").AnyObject>;
1395
1391
  required: true;
1396
1392
  };
1397
1393
  row: {
@@ -1401,7 +1397,7 @@ export declare const comps: {
1401
1397
  }>>, {}>;
1402
1398
  }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
1403
1399
  col: {
1404
- type: import("vue").PropType<import("vxe-table").VxeTableDefines.ColumnInfo>;
1400
+ type: import("vue").PropType<import("../../../../src/types").AnyObject>;
1405
1401
  required: true;
1406
1402
  };
1407
1403
  row: {
@@ -37,15 +37,15 @@ const getStringWidth = /* @__PURE__ */ useMemoize(function(str) {
37
37
  return width + 4;
38
38
  }
39
39
  if (/[\u4e00-\u9fa5]/.test(char)) {
40
- return width + 16;
40
+ return width + 15;
41
41
  }
42
42
  if (/-/.test(char)) {
43
43
  return width + 4;
44
44
  }
45
- if (/(|)/.test(char)) {
45
+ if (/[()]/.test(char)) {
46
46
  return width + 14;
47
47
  }
48
- if (/\(|\)/.test(char)) {
48
+ if (/[)(]/.test(char)) {
49
49
  return width + 5;
50
50
  }
51
51
  if (/-/.test(char)) {
@@ -136,7 +136,7 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
136
136
  });
137
137
  if (!isString(value) || !isNumber(width))
138
138
  return [value];
139
- width -= 20;
139
+ width -= 24;
140
140
  return [...value].reduce((res, char) => {
141
141
  const latestString = res[res.length - 1];
142
142
  if (getStringWidth(latestString + char) > width) {
@@ -418,7 +418,7 @@ const setFilterStatus = (state, props) => {
418
418
  state.filterFields[item.field_key]["CONVERT"] = [];
419
419
  return false;
420
420
  }
421
- const value = item.value.map((item2) => JSON.stringify(item2));
421
+ const value = item.value;
422
422
  state.filterFields[item.field_key]["CONVERT"] = value;
423
423
  }
424
424
  });
@@ -18,7 +18,7 @@
18
18
  margin-top: 6px;
19
19
  }
20
20
  .big-table-filter-wrap .sort-item {
21
- line-height: 32px;
21
+ height: 32px;
22
22
  padding: 0 13px;
23
23
  display: flex;
24
24
  align-items: center;
@@ -97,7 +97,7 @@
97
97
  }
98
98
  .big-table-filter-wrap .checkbox-btn-wrap {
99
99
  display: flex;
100
- padding: 9px 10px 19px 14px;
100
+ padding: 9px 10px 9px 14px;
101
101
  }
102
102
  .big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn {
103
103
  width: 56px;
@@ -131,6 +131,16 @@
131
131
  width: 25px;
132
132
  height: 20px;
133
133
  }
134
+ .big-table__separate {
135
+ padding: 4px;
136
+ }
137
+ .big-table__separatePlaceholder {
138
+ display: inline-block;
139
+ visibility: hidden;
140
+ max-width: 0;
141
+ word-break: keep-all;
142
+ width: 0;
143
+ }
134
144
  body > .vxe-table--tooltip-wrapper {
135
145
  display: none !important;
136
146
  }
@@ -26,9 +26,11 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
26
26
  gridXNumber: import("vue").ComputedRef<number>;
27
27
  gridYNumber: import("vue").ComputedRef<number>;
28
28
  endX: import("vue").ComputedRef<number>;
29
+ endXLimit: import("vue").ComputedRef<number>;
29
30
  originX: import("vue").ComputedRef<any>;
30
31
  endY: import("vue").ComputedRef<number>;
31
32
  originY: import("vue").ComputedRef<number>;
33
+ originYLimit: import("vue").ComputedRef<number>;
32
34
  xCellWidth: import("vue").ComputedRef<number>;
33
35
  yCellHeight: import("vue").ComputedRef<number>;
34
36
  iconsWidth: import("vue").ComputedRef<any>;
@@ -26,9 +26,11 @@ declare const _default: import("vue").DefineComponent<{
26
26
  gridXNumber: import("vue").ComputedRef<number>;
27
27
  gridYNumber: import("vue").ComputedRef<number>;
28
28
  endX: import("vue").ComputedRef<number>;
29
+ endXLimit: import("vue").ComputedRef<number>;
29
30
  originX: import("vue").ComputedRef<any>;
30
31
  endY: import("vue").ComputedRef<number>;
31
32
  originY: import("vue").ComputedRef<number>;
33
+ originYLimit: import("vue").ComputedRef<number>;
32
34
  xCellWidth: import("vue").ComputedRef<number>;
33
35
  yCellHeight: import("vue").ComputedRef<number>;
34
36
  iconsWidth: import("vue").ComputedRef<any>;