hy-dispatch-ui-v3 0.2.63 → 0.2.65

package/es/components/hyBatchUploadDialog/batchUploadDialog.vue.mjs

@@ -208,6 +208,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       },
       setData: (source) => {
         batchTableFormRef.value.setData(source);
+      },
+      setDragLevelIndex: (dragLevel) => {
+        HyDialogRef.value.setDragLevelIndex(dragLevel);
       }
     });
     return (_ctx, _cache) => {

package/es/components/hyDialog/dialog.vue.mjs

@@ -1,9 +1,11 @@
-import { defineComponent, useModel, computed, ref, resolveDirective, openBlock, createElementBlock, Fragment, createCommentVNode, createVNode, unref, mergeProps, withCtx, withDirectives, renderSlot, createElementVNode, normalizeClass, createBlock, withModifiers, createTextVNode, toDisplayString, renderList, mergeModels } from 'vue';
+import { defineComponent, useModel, computed, ref, resolveDirective, openBlock, createElementBlock, Fragment, createCommentVNode, createVNode, unref, mergeProps, withCtx, withDirectives, renderSlot, createElementVNode, normalizeClass, createBlock, withModifiers, createTextVNode, toDisplayString, renderList, vShow, mergeModels } from 'vue';
 import { ElDialog, ElPopover } from 'element-plus';
 import '../index.mjs';
 import '../../hooks/index.mjs';
+import '../../utils/index.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
 import { HyButton } from '../hyButton/index.mjs';
+import { isFunction } from '../../utils/is.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
 
 import "./style/dialog.scss";
@@ -279,7 +281,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     Fragment,
                                     null,
                                     renderList(__props.titleBasicInfoList, (basicInfoItem, index) => {
-                                      return openBlock(), createElementBlock("li", {
+                                      return withDirectives((openBlock(), createElementBlock("li", {
                                         key: index,
                                         class: "flex px-2 py-1 text-xs"
                                       }, [
@@ -297,6 +299,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                           1
                                           /* TEXT */
                                         )
+                                      ])), [
+                                        [
+                                          vShow,
+                                          unref(isFunction)(basicInfoItem.show) ? basicInfoItem.show() : true
+                                        ]
                                       ]);
                                     }),
                                     128

package/es/components/hyForm/cpns/locationSelect.vue.mjs

@@ -52,7 +52,7 @@ const _sfc_main = {
       default: false
     }
   },
-  emits: ["setMapSize"],
+  emits: ["setMapSize", "complete"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
@@ -208,6 +208,7 @@ const _sfc_main = {
         setMarker(res.latlng);
         throughCoordinatePosition(latlng.lng, latlng.lat);
       });
+      emits("complete");
     }
     function setMarker({ lat, lng }) {
       if (marker) {

package/es/components/hyForm/form.vue.mjs

@@ -53,7 +53,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       // 'large' | 'default' | 'small'
     }
   },
-  emits: ["on-allMapSelect"],
+  emits: ["on-allMapSelect", "complete"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const emit = __emit;
     const props = __props;
@@ -81,6 +81,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       allMapSelect.value = !allMapSelect.value;
       emit("on-allMapSelect", allMapSelect.value);
     }
+    function complete() {
+      emit("complete");
+    }
     __expose({
       validate: async (callback) => {
         await nextTick();
@@ -131,7 +134,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         rules: __props.rules,
         "label-position": "top",
         size: __props.size,
-        class: "px-2",
         "hide-required-asterisk": ""
       }, _ctx.$attrs), {
         default: withCtx(() => [
@@ -273,7 +275,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             size: __props.size,
                             style: normalizeStyle(unref(columnItemStyle)(props, column)),
                             allMapSelect: allMapSelect.value,
-                            onSetMapSize: setMapSize
+                            onSetMapSize: setMapSize,
+                            onComplete: complete
                           }, null, 8, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style", "allMapSelect"])) : createCommentVNode("v-if", true)
                         ],
                         64

package/es/components/hyTable/cpns/virtualTable.vue.mjs

@@ -1,4 +1,4 @@
-import { computed, ref, openBlock, createBlock, unref, withCtx, renderSlot, createCommentVNode, createElementBlock, Fragment, renderList, normalizeStyle, withModifiers, normalizeClass, createVNode, mergeProps, createTextVNode, toDisplayString, createElementVNode, normalizeProps, guardReactiveProps } from 'vue';
+import { useModel, computed, ref, openBlock, createBlock, unref, withCtx, renderSlot, createCommentVNode, createElementBlock, Fragment, renderList, normalizeStyle, withModifiers, normalizeClass, createVNode, mergeProps, createTextVNode, toDisplayString, createElementVNode, normalizeProps, guardReactiveProps, mergeModels } from 'vue';
 import { ElTableV2, ElIcon, ElCheckbox, ElDropdown, ElDropdownMenu, ElDropdownItem } from 'element-plus';
 import { ArrowRight, MoreFilled } from '@element-plus/icons-vue';
 import '../../index.mjs';
@@ -13,7 +13,7 @@ import { HyIcon } from '../../hyIcon/index.mjs';
 
 const _sfc_main = {
   __name: "virtualTable",
-  props: {
+  props: /* @__PURE__ */ mergeModels({
     rowKey: {
       type: [String, Number],
       default: "id"
@@ -62,12 +62,23 @@ const _sfc_main = {
       type: String,
       default: "default"
       // deafult-默认 accordion-手风琴
+    },
+    expandRowKeyMap: {
+      type: Map,
+      default: () => /* @__PURE__ */ new Map()
     }
-  },
-  emits: ["search", "select", "select-all", "expand-change"],
+  }, {
+    "expandedRowKeys": {
+      type: Array,
+      default: () => []
+    },
+    "expandedRowKeysModifiers": {}
+  }),
+  emits: /* @__PURE__ */ mergeModels(["search", "select", "select-all", "expand-click"], ["update:expandedRowKeys"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
+    const expandedRowKeys = useModel(__props, "expandedRowKeys");
     const { t } = useLocale();
     const avgWidth = computed(() => {
       const { total, totalWidth } = props.columns.reduce(
@@ -256,46 +267,12 @@ const _sfc_main = {
       const { allChecked } = handler(list, checkedNodeMap, indeterminateKeys2);
       return { checkedNodeMap, indeterminateKeys: indeterminateKeys2, allChecked };
     }
-    const expandedKeys = ref([]);
-    const expandedMap = computed(() => {
-      return expandedKeys.value.reduce((keyMap, key, index) => {
-        keyMap.set(key, index);
-        return keyMap;
-      }, /* @__PURE__ */ new Map());
-    });
-    function toggleRowExpansion(row, expanded) {
-      const index = expandedMap.value.get(getRowKey(row));
-      const isExpanded = isBoolean(expanded) ? expanded : !isNumber(index);
-      if (isExpanded) {
-        if (!isNumber(index)) {
-          if (props.expandMode === "accordion" && isExpandTable.value) {
-            expandedKeys.value = [getRowKey(row)];
-          } else {
-            expandedKeys.value.push(getRowKey(row));
-          }
-        }
-      } else {
-        if (isNumber(index)) {
-          expandedKeys.value.splice(index, 1);
-        }
-      }
-      if (isExpandTable.value) {
-        const expandedList = expandedKeys.value.reduce((list, key) => {
-          list.push(dataSourceMap.value.get(key));
-          return list;
-        }, []);
-        emits("expand-change", row, expandedList);
-      } else {
-        emits("expand-change", row, isExpanded);
-      }
-    }
-    function onRowExpandSwitch({ row, rowKey }) {
-      toggleRowExpansion(row, !expandedMap.value.has(rowKey));
+    function onRowExpandSwitch({ row, rowKey, ...args }) {
+      emits("expand-click", row, !props.expandRowKeyMap.has(rowKey));
     }
     __expose({
       toggleRowSelection,
       toggleAllSelection,
-      toggleRowExpansion,
       clearSelection: () => {
         isAllChecked.value = false;
         selectedMap.value.clear();
@@ -304,8 +281,8 @@ const _sfc_main = {
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElTableV2), {
-        "expanded-row-keys": expandedKeys.value,
-        "onUpdate:expandedRowKeys": ($event) => expandedKeys.value = $event,
+        "expanded-row-keys": expandedRowKeys.value,
+        "onUpdate:expandedRowKeys": ($event) => expandedRowKeys.value = $event,
         "row-key": __props.rowKey,
         data: dataSource.value,
         columns: tableColumns.value,
@@ -387,7 +364,7 @@ const _sfc_main = {
                             type: "button",
                             "aria-label": "\u5C55\u5F00\u5F53\u524D\u884C",
                             "aria-expanded": "false",
-                            class: normalizeClass(["hy-el-table-v2__expand-icon", { "is-expanded": expandedMap.value.has(getRowKey(row)) }]),
+                            class: normalizeClass(["hy-el-table-v2__expand-icon", { "is-expanded": __props.expandRowKeyMap.has(getRowKey(row)) }]),
                             onClick: withModifiers(($event) => onRowExpandSwitch({
                               rowData: _ctx.rowData,
                               row,

package/es/components/hyTable/js/index.mjs

@@ -4,7 +4,6 @@ import '../../../utils/index.mjs';
 import '../../index.mjs';
 import { isPermission, isBoolean, isFunction, isNumber, isString, isArray } from '../../../utils/is.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
-import { usePermissionMap } from '../../../hooks/usePermissionMap.mjs';
 import { ElLoading as HyLoading } from '../../hyLoading/index.mjs';
 
 function tableColumnShowHandler(column) {
@@ -153,7 +152,6 @@ const useAppTableWrapper = (hy) => {
     tableDropdownRef,
     operatorDropdownRef
   } = hy;
-  const { permissionMap } = usePermissionMap();
   const { t } = useLocale();
   const CACHE_COLUMNS_KEY = props.controller || props.url || "CACHE_COLUMNS_KEY";
   const tableDataSource = ref([]);
@@ -263,6 +261,73 @@ const useAppTableWrapper = (hy) => {
       operatorDropdownRef.value?.handleClose();
     }
   }
+  const expandRowKeys = ref([]);
+  const expandRowKeyMap = computed(() => {
+    return expandRowKeys.value.reduce((keyMap, key, index) => {
+      keyMap.set(key, index);
+      return keyMap;
+    }, /* @__PURE__ */ new Map());
+  });
+  const isExpandTable = computed(() => {
+    if (props.type === "default") {
+      return tableColumnsList.value.some((column) => column.type === "expand");
+    } else if (props.type === "virtual") {
+      return tableColumnsList.value.some(
+        (column) => column.type === "expand" && column.expandType === "expand"
+      );
+    }
+    return false;
+  });
+  const isAccordionMode = computed(() => {
+    return isExpandTable.value && props.expandMode === "accordion";
+  });
+  function setRowExpansion(list = []) {
+    const keys = (list || []).map((item) => {
+      return isString(item) || isNumber(item) ? item : getRowKey(item);
+    }).filter(Boolean);
+    expandRowKeys.value = isAccordionMode.value ? [keys[0]] : keys;
+  }
+  function toggleRowExpansion(row, expanded) {
+    const key = isString(row) || isNumber(row) ? row : getRowKey(row);
+    const index = expandRowKeyMap.value.get(key);
+    const isExpanded = isBoolean(expanded) ? expanded : !isNumber(index);
+    if (isAccordionMode.value) {
+      if (isExpanded) {
+        expandRowKeys.value = [key];
+      } else if (index >= 0) {
+        expandRowKeys.value = [];
+      }
+    } else {
+      if (isExpanded && !isNumber(index)) {
+        expandRowKeys.value.push(key);
+      } else if (!isExpanded && isNumber(index)) {
+        expandRowKeys.value.splice(index, 1);
+      }
+    }
+    emits("expand-change", row, isExpanded);
+  }
+  function onTableRowExpandChangeHandler(row, expandedRows) {
+    if (props.type === "virtual") {
+      toggleRowExpansion(row, expandedRows);
+    } else {
+      let isExpanded = false;
+      if (!isExpandTable.value) {
+        const key = getRowKey(row);
+        const index = expandRowKeyMap.value.get(key);
+        if (expandedRows && !isNumber(index)) {
+          expandRowKeys.value.push(key);
+          isExpanded = true;
+        } else if (!expandedRows && isNumber(index)) {
+          expandRowKeys.value.splice(index, 1);
+          isExpanded = false;
+        }
+      } else {
+        isExpanded = isAccordionMode.value && expandedRows.length > 1 || expandRowKeys.value.length > expandedRows.length;
+        expandRowKeys.value = isAccordionMode.value && expandedRows.length > 1 ? [getRowKey(row)] : expandedRows.map((item) => getRowKey(item));
+      }
+      emits("expand-change", row, isExpanded);
+    }
+  }
   const selectedList = ref([]);
   const selectedMap = computed(() => {
     return (selectedList.value || []).reduce((map, row, index) => {
@@ -339,22 +404,6 @@ const useAppTableWrapper = (hy) => {
     }
     return className.filter(Boolean).join(" ");
   }
-  function toggleRowExpansion(row) {
-    if (tableRef.value && tableColumns.value.some((column) => column.type === "expand")) {
-      tableRef.value.toggleRowExpansion(row);
-    }
-  }
-  function onTableRowExpandChangeHandler(row, expandedRows) {
-    if (isBoolean(expandedRows) || props.expandMode !== "accordion" || expandedRows.length <= 1) {
-      props.onExpandChange && props.onExpandChange(row, expandedRows);
-      return;
-    } else {
-      expandedRows.forEach((item) => {
-        if (getRowKey(row) === getRowKey(item)) return;
-        toggleRowExpansion(item);
-      });
-    }
-  }
   const isSearchFocus = ref(false);
   function onSearchInputHandler() {
     isSearchFocus.value = true;
@@ -386,10 +435,13 @@ const useAppTableWrapper = (hy) => {
     getSelectedList,
     clearSelection,
     clearSelectedList,
+    expandRowKeys,
+    expandRowKeyMap,
+    setRowExpansion,
     toggleRowExpansion,
+    onTableRowExpandChangeHandler,
     onTableSelectHandler,
     onTableRowContextmenuHandler,
-    onTableRowExpandChangeHandler,
     onTableRowClickHandler,
     onTableColumnsSelectHandler,
     // 搜索选中

package/es/components/hyTable/js/useAppTable.mjs

@@ -26,7 +26,8 @@ function getColumnDefaultConfig(column) {
     case "operator":
       return {
         label: t("table.operator"),
-        prop: `operator_prop`
+        prop: `operator_prop`,
+        fixed: "right"
       };
     default:
       return {};
@@ -111,8 +112,8 @@ const useAppTable = (config = {}) => {
   try {
     for (let i = 0; i < columns?.length; i++) {
       const column = columns[i];
-      if (isEmpty(column.prop) && column.type === "default") {
-        throw Error("\u3010column.prop\u3011\u4E0D\u80FD\u4E3A\u7A7A");
+      if (isEmpty(column.prop) && !/^(selection|index|expand|operator)$/.test(column.type)) {
+        console.error("\u3010column.prop\u3011\u4E0D\u80FD\u4E3A\u7A7A");
       }
       const sort = getColumnSort(column);
       if (!defaultSortInfo && sort.default) {

package/es/components/hyTable/table.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, useModel, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, toDisplayString, withCtx, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers, mergeModels } from 'vue';
+import { defineComponent, useModel, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, toDisplayString, withCtx, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers, isRef, mergeModels } from 'vue';
 import { ElTable, ElTableColumn, ElDropdown, ElIcon, ElDropdownMenu, ElDropdownItem, ElAutoResizer, ElPagination } from 'element-plus';
 import { MoreFilled } from '@element-plus/icons-vue';
 import '../index.mjs';
@@ -188,10 +188,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "default"
       // deafult-默认 accordion-手风琴
-    },
-    onExpandChange: {
-      // 展开回调
-      type: Function
     }
   }, {
     "loading": { type: Boolean, default: false },
@@ -200,6 +196,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   emits: /* @__PURE__ */ mergeModels([
     "row-click",
     "select-all",
+    "expand-change",
     "on-select-checkbox",
     "reqSuccess",
     "search-data"
@@ -230,6 +227,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       setTableRowClassName,
       clearSelection,
       clearSelectedList,
+      expandRowKeys,
+      expandRowKeyMap,
+      setRowExpansion,
       toggleRowExpansion,
       onTableRowClickHandler,
       onTableRowContextmenuHandler,
@@ -281,6 +281,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getTableDataSource,
       clearSelection,
       clearSelectedList,
+      setRowExpansion,
       toggleRowExpansion,
       showAppTableLoading,
       closeAppTableLoading
@@ -409,6 +410,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 style: {
                   "font-size": `${unref(parseRem)(__props.fontSize)}rem`
                 },
+                "expand-row-keys": unref(expandRowKeys),
                 onSelect: unref(onTableSelectHandler),
                 onSelectAll: unref(onTableSelectHandler),
                 onRowClick: unref(onTableRowClickHandler),
@@ -661,13 +663,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ]),
                 _: 3
                 /* FORWARDED */
-              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])) : createCommentVNode("v-if", true),
+              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "expand-row-keys", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])) : createCommentVNode("v-if", true),
               __props.type === "virtual" ? (openBlock(), createBlock(unref(ElAutoResizer), { key: 1 }, {
                 default: withCtx(({ height, width }) => [
                   createVNode(_sfc_main$3, mergeProps({
                     ref_key: "tableRef",
                     ref: tableRef
                   }, _ctx.$attrs, {
+                    expandedRowKeys: unref(expandRowKeys),
+                    "onUpdate:expandedRowKeys": ($event) => isRef(expandRowKeys) ? expandRowKeys.value = $event : null,
+                    expandRowKeyMap: unref(expandRowKeyMap),
                     width,
                     height,
                     data: unref(tableDataSource),
@@ -687,7 +692,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     onSelectAll: unref(onTableSelectHandler),
                     onRowClick: unref(onTableRowClickHandler),
                     onRowContextmenu: unref(onTableRowContextmenuHandler),
-                    onExpandChange: __props.onExpandChange
+                    onExpandClick: unref(onTableRowExpandChangeHandler)
                   }), createSlots({
                     empty: withCtx(() => [
                       createElementVNode("div", { class: "w-full h-full flex items-center justify-center border-b border-border" }, [
@@ -713,7 +718,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         ])
                       };
                     })
-                  ]), 1040, ["width", "height", "data", "columns", "columns-editable", "show-header", "row-class-name", "show-all-select", "style", "row-key", "filter-model", "expandMode", "onSearch", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])
+                  ]), 1040, ["expandedRowKeys", "onUpdate:expandedRowKeys", "expandRowKeyMap", "width", "height", "data", "columns", "columns-editable", "show-header", "row-class-name", "show-all-select", "style", "row-key", "filter-model", "expandMode", "onSearch", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandClick"])
                 ]),
                 _: 3
                 /* FORWARDED */

package/es/components/hyTableActionButton/tableActionButton.vue.mjs

@@ -5,7 +5,7 @@ import '../../hooks/index.mjs';
 import '../../utils/index.mjs';
 import '../index.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
-import { isPermission } from '../../utils/is.mjs';
+import { isPermission, isBoolean, isFunction } from '../../utils/is.mjs';
 import { HyTooltip } from '../hyTooltip/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
@@ -118,11 +118,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         return false;
       }
       const show = unref(operate.show);
-      if (operate.show === null || operate.show === void 0) {
-        return true;
-      } else {
-        return !!show;
-      }
+      if (isBoolean(show)) return show;
+      if (isFunction(show)) return show();
+      return true;
     }
     watch(() => props.operateList, setSelectedData, { deep: true, immediate: true });
     __expose({});