diry 2 недель назад
Родитель
Сommit
c050956890

+ 102 - 11
docs/sapit-ui-base-guide.en.md

@@ -599,6 +599,22 @@ Config (defaults in `packages/config/web-config.js`; overridable from the busine
 | `VITE_APP_MENU_THEME` | `dark` | Menu appearance; the text color actually follows the **background luminance**, not this value alone |
 | `VITE_APP_MENU_THEME` | `dark` | Menu appearance; the text color actually follows the **background luminance**, not this value alone |
 | `VITE_APP_MENU_BAR` | `left` | `left` sidebar / `top` top bar; both share the same palette |
 | `VITE_APP_MENU_BAR` | `left` | `left` sidebar / `top` top bar; both share the same palette |
 
 
+**Per-part color overrides** (for when a derived color is not what you want; leave empty to keep deriving, regardless of what `VITE_APP_MENU_BG` is set to — valid for `theme` / `dark` / custom colors alike):
+
+| Config | Default | Part overridden | CSS variable |
+| --- | --- | --- | --- |
+| `VITE_APP_MENU_SUB_BG` | empty | Submenu panel background | `--s-menu-sub-bg` |
+| `VITE_APP_MENU_HOVER_BG` | empty | Hovered item background | `--s-menu-hover-bg` |
+| `VITE_APP_MENU_ACTIVE_BG` | empty | Selected item background | `--s-menu-active-bg` |
+| `VITE_APP_MENU_TEXT` | empty | Normal text | `--s-menu-text` |
+| `VITE_APP_MENU_TEXT_HOVER` | empty | Hover text | `--s-menu-text-hover` |
+| `VITE_APP_MENU_TEXT_ACTIVE` | empty | Selected text | `--s-menu-text-active`, `--s-menu-active-text` |
+| `VITE_APP_MENU_GROUP_TITLE` | empty | Group title text | `groupTitle` in the returned object |
+
+- Values accept `#RGB` / `#RRGGBB` / `rgb()` / `rgba()` and are normalised to solid `#rrggbb` — an `rgba()` input has its **alpha dropped**, keeping the palette alpha-free.
+- An invalid value logs a `[menu] VITE_APP_MENU_XXX ...` warning and is ignored; the remaining overrides still apply, so one typo cannot break the whole menu.
+- Overrides are applied **before** the antd `Menu` tokens and the `:root` CSS variables are produced, so tokens, CSS variables and components all see the final values.
+
 Default palettes per theme (lightness 93 / saturation 30 / active mix 16, measured):
 Default palettes per theme (lightness 93 / saturation 30 / active mix 16, measured):
 
 
 | Theme | Top-level | Submenu | Hover | Selected | Text |
 | Theme | Top-level | Submenu | Hover | Selected | Text |
@@ -619,11 +635,23 @@ VITE_APP_MENU_BG_SATURATION: 0,  // 2) drop the tint entirely, pure grey
 VITE_APP_MENU_BG_ACTIVE_MIX: 30, // 3) a more prominent selected item
 VITE_APP_MENU_BG_ACTIVE_MIX: 30, // 3) a more prominent selected item
 VITE_APP_MENU_BG: 'dark',        // 4) back to the classic antd #001529
 VITE_APP_MENU_BG: 'dark',        // 4) back to the classic antd #001529
 VITE_APP_MENU_BG: '#213045'      // 5) pin a custom color, no longer theme-driven
 VITE_APP_MENU_BG: '#213045'      // 5) pin a custom color, no longer theme-driven
+
+// 6) custom background + a fully custom palette: give the colors you do not want derived
+VITE_APP_MENU_BG: '#213045',
+VITE_APP_MENU_SUB_BG: '#1b2637',
+VITE_APP_MENU_HOVER_BG: '#2a3b52',
+VITE_APP_MENU_ACTIVE_BG: '#2b6cd4',
+VITE_APP_MENU_TEXT: '#c9d4e2',
+VITE_APP_MENU_TEXT_HOVER: '#ffffff',
+VITE_APP_MENU_TEXT_ACTIVE: '#ffffff',
+VITE_APP_MENU_GROUP_TITLE: '#8fa3bd'
 ```
 ```
 
 
+> Overriding only one or two parts is fine (for example only `VITE_APP_MENU_TEXT`, the rest stays derived); an empty string, a missing key or an invalid value all mean "do not override".
+
 > Notes
 > Notes
 >
 >
-> 1. With `VITE_APP_MENU_BG: '#RRGGBB'` the submenu, hover, selected and text colors are still derived from that color, so a new background never leaves unreadable text.
+> 1. With `VITE_APP_MENU_BG: '#RRGGBB'` the submenu, hover, selected and text colors are still derived from that color, so a new background never leaves unreadable text; if a derived color is not what you want, override it with the 7 `VITE_APP_MENU_XXX` keys above — overrides always win.
 > 2. Below 50 lightness the palette flips to dark: text turns light, the logo switches to its light variant and the header text turns white. The decision comes from `window.$menuTheme.isLightBg`, not `VITE_APP_MENU_THEME`.
 > 2. Below 50 lightness the palette flips to dark: text turns light, the logo switches to its light variant and the header text turns white. The decision comes from `window.$menuTheme.isLightBg`, not `VITE_APP_MENU_THEME`.
 > 3. Do not hard-code menu colors such as `#001529` or `rgba(255,255,255,.1)` in business styles — use `var(--s-menu-*)`, otherwise a theme switch breaks the look.
 > 3. Do not hard-code menu colors such as `#001529` or `rgba(255,255,255,.1)` in business styles — use `var(--s-menu-*)`, otherwise a theme switch breaks the look.
 > 4. `.menu-wrap .ant-menu.ant-menu-dark` already backs the top-level, submenu, hover and selected nodes with these variables (the parts antd 4.2.6 Menu tokens miss).
 > 4. `.menu-wrap .ant-menu.ant-menu-dark` already backs the top-level, submenu, hover and selected nodes with these variables (the parts antd 4.2.6 Menu tokens miss).
@@ -773,7 +801,7 @@ Every layout's `.tools` (title + button bar) is:
 
 
 The `.side` of `SListLayout` / `SListTableTreeLayout` / `SListCardLayout` all carry `padding: 10px 0`, so the tree container height must equal "`.side` box height − top/bottom padding", otherwise you get double scrollbars or a clipped tree.
 The `.side` of `SListLayout` / `SListTableTreeLayout` / `SListCardLayout` all carry `padding: 10px 0`, so the tree container height must equal "`.side` box height − top/bottom padding", otherwise you get double scrollbars or a clipped tree.
 
 
-The rule lives in the **global** `packages/style/common.less` under `.s-side-tree` (a unique extra class on `.side`, so a generic name cannot be overridden by business styles); writing a copy inside a business page's scoped style is **forbidden**. It covers two tree sources:
+The rule lives in the **global** `packages/style/tree.less` under `.s-side-tree` (a unique extra class on `.side`, so a generic name cannot be overridden by business styles); writing a copy inside a business page's scoped style is **forbidden**. It covers two tree sources:
 
 
 - ① a standard `<s-tree>`: the root is `.s-tree-common`, `height:100%`;
 - ① a standard `<s-tree>`: the root is `.s-tree-common`, `height:100%`;
 - ② a native `<a-spin><a-tree>`: each level is stretched (`.ant-spin-container → .ant-tree → .ant-tree-list → .ant-tree-list-holder`) and `.ant-tree-list-holder` takes `overflow-y:auto`.
 - ② a native `<a-spin><a-tree>`: each level is stretched (`.ant-spin-container → .ant-tree → .ant-tree-list → .ant-tree-list-holder`) and `.ant-tree-list-holder` takes `overflow-y:auto`.
@@ -790,28 +818,29 @@ height: { type: Number, default: undefined }
 
 
 Reason: antd's `Tree` turns `height` into an inline `max-height:300px` on the virtual-list holder, which clips the tree and adds an inner scrollbar.
 Reason: antd's `Tree` turns `height` into an inline `max-height:300px` on the virtual-list holder, which clips the tree and adds an inner scrollbar.
 
 
-Horizontal text never wraps, overflows into an ellipsis, and the width follows the parent:
+Horizontal text never wraps, overflows into an ellipsis, and the width follows the parent — these structural rules now live in one place, `packages/style/tree.less`. **Components and business pages must not keep scoped copies**:
 
 
 ```less
 ```less
+/* packages/style/tree.less (excerpt) */
 .s-tree-common {
 .s-tree-common {
   height: 100%;
   height: 100%;
   width: 100%;
   width: 100%;
   overflow-x: hidden;
   overflow-x: hidden;
   overflow-y: auto;
   overflow-y: auto;
 }
 }
-:deep(.ant-tree),
-:deep(.ant-tree-list),
-:deep(.ant-tree-list-holder),
-:deep(.ant-tree-list-holder-inner) {
+.ant-tree,
+.ant-tree-list,
+.ant-tree-list-holder,
+.ant-tree-list-holder-inner {
   width: 100%;
   width: 100%;
   min-width: 0;
   min-width: 0;
 }
 }
-:deep(.ant-tree-node-content-wrapper) {
+.ant-tree-node-content-wrapper {
   min-width: 0;
   min-width: 0;
   overflow: hidden;
   overflow: hidden;
 }
 }
-:deep(.ant-tree-title),
-.node-title {
+.ant-tree-title,
+.ant-tree-title > .node-title {
   display: block;
   display: block;
   width: 100%;
   width: 100%;
   overflow: hidden;
   overflow: hidden;
@@ -820,7 +849,62 @@ Horizontal text never wraps, overflows into an ellipsis, and the width follows t
 }
 }
 ```
 ```
 
 
-### 3.7 The iron rule for diagnosing rendering issues
+> `.node-title` is a generic class name, so the global rule is scoped to `.ant-tree-title > .node-title` and cannot leak into business code.
+
+### 3.7 Unified tree style file and theme variables (`packages/style/tree.less`)
+
+All tree styles live in that single file, pulled in by `common.less` via `@import './tree.less'`. The rules previously spread over `STree.vue` (scoped), `SBelowChoosePosition.vue` (scoped copy) and `common.less` (global) have all been folded in.
+
+Covered tree types:
+
+| Type                                                  | Selector root                    | Used by                                                                  |
+| ----------------------------------------------------- | -------------------------------- | ------------------------------------------------------------------------ |
+| Directory / plain tree (`a-directory-tree`, `a-tree`) | `.s-tree-common`, `.ant-tree*`   | `STree`, `SBelowChoosePosition`, native `<a-tree>` in business pages     |
+| Tree-select dropdown (`a-tree-select`)                | `.s-tree-select-popup`           | `STreeSelect`, `SDataRangeTreeSelect` (`popup-class-name`)               |
+| Sidebar tree container height                         | `.s-side-tree`                   | `SListLayout` / `SListTableTreeLayout` / `SListCardLayout`               |
+
+Every colour and size is a `--s-tree-*` variable; the defaults equal the previous hard-coded values, so the visuals are unchanged:
+
+| Variable                            | Default                   | Meaning                                              |
+| ----------------------------------- | ------------------------- | ---------------------------------------------------- |
+| `--s-tree-node-height`              | `30px`                    | Node row height (dropdown uses it too)               |
+| `--s-tree-node-line-height`         | `32px`                    | Tree title line height                               |
+| `--s-tree-node-padding-x`           | `4px`                     | Dropdown node horizontal padding                     |
+| `--s-tree-row-gap`                  | `4px`                     | Row gap (leaves a seam in the row background)        |
+| `--s-tree-node-radius`              | `8px`                     | Row corner radius (hover + selected, painted on `::before`) |
+| `--s-tree-switcher-color`           | `#000000a6`               | Expand arrow colour                                  |
+| `--s-tree-hover-bg`                 | `rgba(0,0,0,.04)`         | Row hover background                                 |
+| `--s-tree-selected-bg`              | `var(--s-color, #1677ff)` | Selected row background, **already follows the theme primary colour** |
+| `--s-tree-selected-text`            | `#fff`                    | Selected row text / arrow colour                     |
+| `--s-tree-directory-selected-bg`    | `#bae7ff`                 | Directory-tree selected row (antd blue-2)            |
+| `--s-tree-directory-selected-text`  | `#000000a6`               | Directory-tree selected text colour                  |
+| `--s-tree-icon-color`               | `#fff`                    | Node type icon glyph colour                          |
+| `--s-tree-icon-bg`                  | `transparent`             | Default node icon background                         |
+| `--s-tree-icon-bg-g` / `-c` / `-d`  | `#a9a9f5` / `#d3b403` / `#f09191` | Node icon G/C/D backgrounds                  |
+
+Override per theme instead of touching the components:
+
+```css
+/* pure CSS theme: the base already puts theme-xxx on body (see 2.8) */
+body.theme-green {
+  --s-tree-selected-bg: #00b96b;
+  --s-tree-directory-selected-bg: #d9f7e9;
+  --s-tree-directory-selected-text: #1f1f1f;
+}
+
+/* global size tweak */
+:root {
+  --s-tree-node-height: 32px;
+  --s-tree-row-gap: 6px;
+}
+```
+
+Two caveats:
+
+1. `--s-tree-selected-bg` defaults to `var(--s-color, #1677ff)`, so it follows the theme primary colour automatically; the light variant `--s-tree-directory-selected-bg` still defaults to antd blue-2 — override it explicitly if it should follow.
+2. Variables hold a colour/length only, never a whole declaration (e.g. `--x: background:red`).
+
+### 3.8 The iron rule for diagnosing rendering issues
 
 
 **Rendering/height problems must be measured on the real page after logging in, using puppeteer to read `offsetHeight`/`offsetLeft`/box metrics — never guess the root cause by reading code statically.**
 **Rendering/height problems must be measured on the real page after logging in, using puppeteer to read `offsetHeight`/`offsetLeft`/box metrics — never guess the root cause by reading code statically.**
 
 
@@ -894,6 +978,13 @@ Common switches (the business may override them; checks use `!== false`, so an u
 | `VITE_APP_MENU_BG_LIGHTNESS` | `93`                          | Background lightness 0-100: higher is lighter |
 | `VITE_APP_MENU_BG_LIGHTNESS` | `93`                          | Background lightness 0-100: higher is lighter |
 | `VITE_APP_MENU_BG_SATURATION` | `30`                         | Max saturation of the menu palette 0-100 |
 | `VITE_APP_MENU_BG_SATURATION` | `30`                         | Max saturation of the menu palette 0-100 |
 | `VITE_APP_MENU_BG_ACTIVE_MIX` | `16`                         | Share of the primary color in the selected background 0-100 |
 | `VITE_APP_MENU_BG_ACTIVE_MIX` | `16`                         | Share of the primary color in the selected background 0-100 |
+| `VITE_APP_MENU_SUB_BG`     | empty                           | Submenu panel background; empty = derived from the primary color (see 2.18)  |
+| `VITE_APP_MENU_HOVER_BG`   | empty                           | Hovered item background; empty = derived                                    |
+| `VITE_APP_MENU_ACTIVE_BG`  | empty                           | Selected item background; empty = derived                                   |
+| `VITE_APP_MENU_TEXT`       | empty                           | Normal text color; empty = derived from the background                      |
+| `VITE_APP_MENU_TEXT_HOVER` | empty                           | Hover text color; empty = derived from the background                       |
+| `VITE_APP_MENU_TEXT_ACTIVE` | empty                          | Selected text color; empty = derived from the background                    |
+| `VITE_APP_MENU_GROUP_TITLE` | empty                          | Group title color; empty = derived from the background                      |
 
 
 How the top-right message badge counts: on entering the system it calls `message/center/counts` for `totalCount`, and afterwards every `wsEvent` pushed over the socket triggers a refetch. The socket connection is a singleton (`packages/utils/message-socket.js`) that emits `sendUserId` with the user id once connected, and the backend pushes per user. The business registers nothing extra — just point `VITE_APP_SOCKET_URL` / `VITE_APP_SOCKET_PATH` at the message service.
 How the top-right message badge counts: on entering the system it calls `message/center/counts` for `totalCount`, and afterwards every `wsEvent` pushed over the socket triggers a refetch. The socket connection is a singleton (`packages/utils/message-socket.js`) that emits `sendUserId` with the user id once connected, and the backend pushes per user. The business registers nothing extra — just point `VITE_APP_SOCKET_URL` / `VITE_APP_SOCKET_PATH` at the message service.
 
 

+ 102 - 11
docs/sapit-ui-基座说明与业务使用.md

@@ -603,6 +603,22 @@ window.$utils.http.post(url, data, { skipErrorPage: true })
 | `VITE_APP_MENU_THEME` | `dark` | 菜单外观模式;文字色实际按**底色明暗**自动切换,不只依赖这个值 |
 | `VITE_APP_MENU_THEME` | `dark` | 菜单外观模式;文字色实际按**底色明暗**自动切换,不只依赖这个值 |
 | `VITE_APP_MENU_BAR` | `left` | `left` 侧边 / `top` 顶部,两者共用同一套色板 |
 | `VITE_APP_MENU_BAR` | `left` | `left` 侧边 / `top` 顶部,两者共用同一套色板 |
 
 
+**单项颜色覆盖**(不想让部分颜色继续推导时用;留空即按主题色推导,与 `VITE_APP_MENU_BG` 取什么值无关,`theme` / `dark` / 自定义色三种来源都生效):
+
+| 配置 | 默认 | 覆盖的部位 | 对应 CSS 变量 |
+| --- | --- | --- | --- |
+| `VITE_APP_MENU_SUB_BG` | 空 | 子菜单展开区底色 | `--s-menu-sub-bg` |
+| `VITE_APP_MENU_HOVER_BG` | 空 | 悬停项底色 | `--s-menu-hover-bg` |
+| `VITE_APP_MENU_ACTIVE_BG` | 空 | 选中块底色 | `--s-menu-active-bg` |
+| `VITE_APP_MENU_TEXT` | 空 | 普通文字 | `--s-menu-text` |
+| `VITE_APP_MENU_TEXT_HOVER` | 空 | 悬停文字 | `--s-menu-text-hover` |
+| `VITE_APP_MENU_TEXT_ACTIVE` | 空 | 选中文字 | `--s-menu-text-active`、`--s-menu-active-text` |
+| `VITE_APP_MENU_GROUP_TITLE` | 空 | 分组标题文字 | 返回结果 `groupTitle` |
+
+- 取值支持 `#RGB` / `#RRGGBB` / `rgb()` / `rgba()`,内部统一归一成实色 `#rrggbb`(传 `rgba` 会**丢掉透明度**,保持整套配色无 alpha)。
+- 非法值打一条 `[menu] VITE_APP_MENU_XXX ...` 告警后忽略该项,其余项照常生效,不会因为一个手滑的颜色把整套菜单弄崩。
+- 覆盖项在 token / CSS 变量生成**之前**生效,所以 antd `Menu` token、`:root` 变量、组件里读到的值全部是覆盖后的最终值。
+
 各主题默认色(亮度 93 / 饱和 30 / 选中 16,均为实测值):
 各主题默认色(亮度 93 / 饱和 30 / 选中 16,均为实测值):
 
 
 | 主题 | 一级底 | 子菜单底 | 悬停 | 选中块 | 普通文字 |
 | 主题 | 一级底 | 子菜单底 | 悬停 | 选中块 | 普通文字 |
@@ -623,11 +639,23 @@ VITE_APP_MENU_BG_SATURATION: 0,  // 2) 去掉色调,走纯灰白
 VITE_APP_MENU_BG_ACTIVE_MIX: 30, // 3) 选中块更明显
 VITE_APP_MENU_BG_ACTIVE_MIX: 30, // 3) 选中块更明显
 VITE_APP_MENU_BG: 'dark',        // 4) 回到 antd 经典深蓝黑 #001529
 VITE_APP_MENU_BG: 'dark',        // 4) 回到 antd 经典深蓝黑 #001529
 VITE_APP_MENU_BG: '#213045'      // 5) 固定一个自定义色,不再跟随主题
 VITE_APP_MENU_BG: '#213045'      // 5) 固定一个自定义色,不再跟随主题
+
+// 6) 自定义底色 + 全套自定义配色:不想推导的项直接给色值
+VITE_APP_MENU_BG: '#213045',
+VITE_APP_MENU_SUB_BG: '#1b2637',
+VITE_APP_MENU_HOVER_BG: '#2a3b52',
+VITE_APP_MENU_ACTIVE_BG: '#2b6cd4',
+VITE_APP_MENU_TEXT: '#c9d4e2',
+VITE_APP_MENU_TEXT_HOVER: '#ffffff',
+VITE_APP_MENU_TEXT_ACTIVE: '#ffffff',
+VITE_APP_MENU_GROUP_TITLE: '#8fa3bd'
 ```
 ```
 
 
+> 只给其中一两项也行(例如只改 `VITE_APP_MENU_TEXT`,其余继续推导);留空串 / 不写 / 写非法值都视为「不覆盖」。
+
 > 注意事项
 > 注意事项
 >
 >
-> 1. `VITE_APP_MENU_BG` 传 `#RRGGBB` 时,子菜单底 / 悬停 / 选中 / 文字仍在该色基础上推导,不会出现「主底换了、文字看不清」。
+> 1. `VITE_APP_MENU_BG` 传 `#RRGGBB` 时,子菜单底 / 悬停 / 选中 / 文字仍在该色基础上推导,不会出现「主底换了、文字看不清」;不满意推导结果就用上面 7 个 `VITE_APP_MENU_XXX` 单项覆盖,覆盖项优先级最高。
 > 2. 底色亮度 < 50 进入深色体系:文字转浅、logo 自动换浅色版、顶栏文字转白。判据是 `window.$menuTheme.isLightBg`,不是 `VITE_APP_MENU_THEME`。
 > 2. 底色亮度 < 50 进入深色体系:文字转浅、logo 自动换浅色版、顶栏文字转白。判据是 `window.$menuTheme.isLightBg`,不是 `VITE_APP_MENU_THEME`。
 > 3. 业务样式不要写死 `#001529`、`rgba(255,255,255,.1)` 这类菜单色,直接用 `var(--s-menu-*)`,否则换主题会割裂。
 > 3. 业务样式不要写死 `#001529`、`rgba(255,255,255,.1)` 这类菜单色,直接用 `var(--s-menu-*)`,否则换主题会割裂。
 > 4. `.menu-wrap .ant-menu.ant-menu-dark` 已用上述变量兜住一级项、子菜单、hover、选中四类节点(antd 4.2.6 的 Menu token 覆盖不到的部分)。
 > 4. `.menu-wrap .ant-menu.ant-menu-dark` 已用上述变量兜住一级项、子菜单、hover、选中四类节点(antd 4.2.6 的 Menu token 覆盖不到的部分)。
@@ -777,7 +805,7 @@ this.layoutHeight = this.$refs.layout.offsetHeight - toolsH - footerH - tabsH -
 
 
 `SListLayout` / `SListTableTreeLayout` / `SListCardLayout` 的 `.side` 都带 `padding: 10px 0`,树容器高度必须等于「`.side` 盒高 − 上下 padding」,否则双滚动条或树被截断。
 `SListLayout` / `SListTableTreeLayout` / `SListCardLayout` 的 `.side` 都带 `padding: 10px 0`,树容器高度必须等于「`.side` 盒高 − 上下 padding」,否则双滚动条或树被截断。
 
 
-规则写在**全局** `packages/style/common.less` 的 `.s-side-tree`(`.side` 的唯一化追加类,避免通用名被业务覆盖),业务页面 scoped 里**禁止再写副本**。覆盖两种树来源:
+规则写在**全局** `packages/style/tree.less` 的 `.s-side-tree`(`.side` 的唯一化追加类,避免通用名被业务覆盖),业务页面 scoped 里**禁止再写副本**。覆盖两种树来源:
 
 
 - ① 标准 `<s-tree>`:根节点即 `.s-tree-common`,`height:100%`;
 - ① 标准 `<s-tree>`:根节点即 `.s-tree-common`,`height:100%`;
 - ② 原生 `<a-spin><a-tree>`:逐层撑高 `.ant-spin-container → .ant-tree → .ant-tree-list → .ant-tree-list-holder`,由 `.ant-tree-list-holder` 承担 `overflow-y:auto`。
 - ② 原生 `<a-spin><a-tree>`:逐层撑高 `.ant-spin-container → .ant-tree → .ant-tree-list → .ant-tree-list-holder`,由 `.ant-tree-list-holder` 承担 `overflow-y:auto`。
@@ -794,28 +822,29 @@ height: { type: Number, default: undefined }
 
 
 原因:antd 的 `Tree` 会把 `height` 转成虚拟列表 holder 的行内 `max-height:300px`,导致树被截断且自身产生内层滚动条。
 原因:antd 的 `Tree` 会把 `height` 转成虚拟列表 holder 的行内 `max-height:300px`,导致树被截断且自身产生内层滚动条。
 
 
-横向文字不换行、超出省略、宽度随父容器拉伸:
+横向文字不换行、超出省略、宽度随父容器拉伸 —— 这套结构规则已统一写在全局 `packages/style/tree.less`(`.s-tree-common` / `.ant-tree*` / `.node-title`),**组件和业务页面都不要再用 scoped 副本**:
 
 
 ```less
 ```less
+/* packages/style/tree.less(节选,实际见文件) */
 .s-tree-common {
 .s-tree-common {
   height: 100%;
   height: 100%;
   width: 100%;
   width: 100%;
   overflow-x: hidden;
   overflow-x: hidden;
   overflow-y: auto;
   overflow-y: auto;
 }
 }
-:deep(.ant-tree),
-:deep(.ant-tree-list),
-:deep(.ant-tree-list-holder),
-:deep(.ant-tree-list-holder-inner) {
+.ant-tree,
+.ant-tree-list,
+.ant-tree-list-holder,
+.ant-tree-list-holder-inner {
   width: 100%;
   width: 100%;
   min-width: 0;
   min-width: 0;
 }
 }
-:deep(.ant-tree-node-content-wrapper) {
+.ant-tree-node-content-wrapper {
   min-width: 0;
   min-width: 0;
   overflow: hidden;
   overflow: hidden;
 }
 }
-:deep(.ant-tree-title),
-.node-title {
+.ant-tree-title,
+.ant-tree-title > .node-title {
   display: block;
   display: block;
   width: 100%;
   width: 100%;
   overflow: hidden;
   overflow: hidden;
@@ -824,7 +853,62 @@ height: { type: Number, default: undefined }
 }
 }
 ```
 ```
 
 
-### 3.7 排查渲染问题的铁律
+> `.node-title` 是通用类名,全局规则统一写成 `.ant-tree-title > .node-title`(限树标题层内),避免污染业务同名类。
+
+### 3.7 树样式统一文件与主题变量(`packages/style/tree.less`)
+
+所有树的样式只在这一个文件里,`common.less` 末尾 `@import './tree.less'` 引入。原先散落在 `STree.vue`(scoped)、`SBelowChoosePosition.vue`(scoped 副本)、`common.less`(全局)三处的规则已全部收编。
+
+覆盖的树类型:
+
+| 类型                                                  | 选择器根                             | 用到的组件                                                       |
+| ----------------------------------------------------- | ------------------------------------ | ---------------------------------------------------------------- |
+| 目录树 / 普通树(`a-directory-tree` / `a-tree`)      | `.s-tree-common`、`.ant-tree*`       | `STree`、`SBelowChoosePosition`、业务原生 `<a-tree>`             |
+| 树下拉弹层(`a-tree-select`)                         | `.s-tree-select-popup`               | `STreeSelect`、`SDataRangeTreeSelect`(`popup-class-name` 挂类) |
+| 侧栏树容器高度                                        | `.s-side-tree`                       | `SListLayout` / `SListTableTreeLayout` / `SListCardLayout`       |
+
+颜色与尺寸全部走 `--s-tree-*` 变量,**默认值等于改造前的硬编码值,视觉零变化**:
+
+| 变量                              | 默认值                    | 说明                                             |
+| --------------------------------- | ------------------------- | ------------------------------------------------ |
+| `--s-tree-node-height`            | `30px`                    | 节点内容行高(弹层同用)                         |
+| `--s-tree-node-line-height`       | `32px`                    | 树本体标题行高                                   |
+| `--s-tree-node-padding-x`         | `4px`                     | 弹层节点左右内边距                               |
+| `--s-tree-row-gap`                | `4px`                     | 行间距(整行底色留缝)                           |
+| `--s-tree-node-radius`            | `8px`                     | 整行圆角(悬浮 + 选中,画在 `::before` 上)      |
+| `--s-tree-switcher-color`         | `#000000a6`               | 展开箭头色                                       |
+| `--s-tree-hover-bg`               | `rgba(0,0,0,.04)`         | 悬浮整行底色                                     |
+| `--s-tree-selected-bg`            | `var(--s-color, #1677ff)` | 选中整行底色,**已跟随主题主色**                 |
+| `--s-tree-selected-text`          | `#fff`                    | 选中整行文字/箭头色                              |
+| `--s-tree-directory-selected-bg`  | `#bae7ff`                 | 目录树选中浅色底(antd blue-2)                  |
+| `--s-tree-directory-selected-text`| `#000000a6`               | 目录树选中文字色                                 |
+| `--s-tree-icon-color`             | `#fff`                    | 节点类型图标文字色                               |
+| `--s-tree-icon-bg`                | `transparent`             | 节点图标默认底色                                 |
+| `--s-tree-icon-bg-g` / `-c` / `-d`| `#a9a9f5` / `#d3b403` / `#f09191` | 节点图标 G/C/D 类型底色                  |
+
+换主题色时按需覆盖即可,不用改组件:
+
+```css
+/* 纯 CSS 主题:body 上已由基座挂 theme-xxx 类(见 §2.8) */
+body.theme-green {
+  --s-tree-selected-bg: #00b96b;
+  --s-tree-directory-selected-bg: #d9f7e9;
+  --s-tree-directory-selected-text: #1f1f1f;
+}
+
+/* 全局微调尺寸 */
+:root {
+  --s-tree-node-height: 32px;
+  --s-tree-row-gap: 6px;
+}
+```
+
+注意两点:
+
+1. `--s-tree-selected-bg` 默认是 `var(--s-color, #1677ff)`,切主题色会自动跟随;浅色档 `--s-tree-directory-selected-bg` 默认仍是 antd blue-2,要跟随就显式覆盖。
+2. 变量只放「颜色/长度」本身,不要往里塞整条声明(如 `--x: background:red`)。
+
+### 3.8 排查渲染问题的铁律
 
 
 **页面渲染/高度问题必须用 puppeteer 登录后量真实 `offsetHeight`/`offsetLeft`/盒模型,禁止静态读代码猜根因。**
 **页面渲染/高度问题必须用 puppeteer 登录后量真实 `offsetHeight`/`offsetLeft`/盒模型,禁止静态读代码猜根因。**
 
 
@@ -898,6 +982,13 @@ npm run lint
 | `VITE_APP_MENU_BG_LIGHTNESS` | `93`                          | 菜单底亮度 0-100:越大越白                                                    |
 | `VITE_APP_MENU_BG_LIGHTNESS` | `93`                          | 菜单底亮度 0-100:越大越白                                                    |
 | `VITE_APP_MENU_BG_SATURATION` | `30`                         | 菜单配色饱和度上限 0-100                                                      |
 | `VITE_APP_MENU_BG_SATURATION` | `30`                         | 菜单配色饱和度上限 0-100                                                      |
 | `VITE_APP_MENU_BG_ACTIVE_MIX` | `16`                         | 选中块里主题色的占比 0-100                                                    |
 | `VITE_APP_MENU_BG_ACTIVE_MIX` | `16`                         | 选中块里主题色的占比 0-100                                                    |
+| `VITE_APP_MENU_SUB_BG`     | 空                              | 子菜单展开区底色;留空按主题色推导(见 2.18)                                 |
+| `VITE_APP_MENU_HOVER_BG`   | 空                              | 悬停项底色;留空按主题色推导                                                  |
+| `VITE_APP_MENU_ACTIVE_BG`  | 空                              | 选中块底色;留空按主题色推导                                                  |
+| `VITE_APP_MENU_TEXT`       | 空                              | 普通文字色;留空按底色推导                                                    |
+| `VITE_APP_MENU_TEXT_HOVER` | 空                              | 悬停文字色;留空按底色推导                                                    |
+| `VITE_APP_MENU_TEXT_ACTIVE` | 空                             | 选中文字色;留空按底色推导                                                    |
+| `VITE_APP_MENU_GROUP_TITLE` | 空                             | 分组标题文字色;留空按底色推导                                                |
 
 
 右上角消息铃铛的数量逻辑:进入系统先调 `message/center/counts` 取 `totalCount`,之后由 socket 推送的 `wsEvent` 触发重新拉取。socket 连接为单例(`packages/utils/message-socket.js`),连上后 `emit('sendUserId', userId)`,后端按用户推送。业务侧无需额外注册,只要 `VITE_APP_SOCKET_URL` / `VITE_APP_SOCKET_PATH` 配到消息服务即可。
 右上角消息铃铛的数量逻辑:进入系统先调 `message/center/counts` 取 `totalCount`,之后由 socket 推送的 `wsEvent` 触发重新拉取。socket 连接为单例(`packages/utils/message-socket.js`),连上后 `emit('sendUserId', userId)`,后端按用户推送。业务侧无需额外注册,只要 `VITE_APP_SOCKET_URL` / `VITE_APP_SOCKET_PATH` 配到消息服务即可。
 
 

+ 1 - 1
lib/config.json

@@ -1 +1 @@
-{"_hash":1793358241709,"VITE_APP_PROJECT_NAME":"前端项目架构","VITE_APP_VERSION":"v1.0","VITE_APP_JSS_LICENSE":"","VITE_APP_TITLE":"平台","VITE_APP_BASE_URL":"/","VITE_APP_FOOTER_VISIBLE":false,"VITE_APP_LOGIN_PHONE":false,"VITE_APP_LOGIN_QRCODE":false,"VITE_APP_MESSAGE_VISIBLE":true,"VITE_APP_IS_BASE":false,"VITE_APP_LANG_ENABLE":false,"VITE_APP_LANG":"zh","VITE_APP_API_PATH":"/apig","VITE_APP_SYS_SERVER_NAME":"portal","VITE_APP_MESSAGE_SERVER_NAME":"message","VITE_APP_PORTAL_SERVER_NAME":"portal","VITE_APP_FLOW_SERVER_NAME":"flow","VITE_APP_CLIENT_ID":"mm0001","VITE_APP_PREVIEW_ONLINE":"/filePreview/onlinePreview?url=","VITE_APP_WEB_SITE":"https://sapit.com.cn/#/home","VITE_APP_LOGIN_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_BASE_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_SOCKET_URL":"/","VITE_APP_SOCKET_PATH":"/apig/ws/websocket","VITE_CONFIG_MODE":false,"VITE_APP_API_BASE_URL":"http://192.168.200.7:6801","VITE_APP_API_FILE_URL":"/","VITE_APP_MENU_THEME":"dark","VITE_APP_MENU_BG":"theme","VITE_APP_MENU_BG_LIGHTNESS":93,"VITE_APP_MENU_BG_SATURATION":30,"VITE_APP_MENU_BG_ACTIVE_MIX":16,"VITE_APP_MENU_BAR":"left","VITE_APP_LOGIN_PATH_THEME":"3","VITE_APP_THEME_VALUE":"blue","VITE_APP_THEME":{"blue":{"name":"blue","color":"#1677FF","lightColor":"\t#6495ED","darkColor":"#00008B","borderColor":"#B0C4DE","bgColor":"#f0f2f5"},"green":{"name":"green","color":"#00b96b","lightColor":"#90EE90","darkColor":"#3CB371","borderColor":"#98FB98","bgColor":"#F0FFF0"},"orange":{"name":"orange","color":"#FFA500","lightColor":"\t#FFE4B5","darkColor":"#FF8C00","borderColor":"#FFDEAD","bgColor":"#FFEFD5"}},"VITE_APP_LOGIN_PATH":"/login","VITE_APP_DEFAULT_PATH":"/workplace/index","VITE_USER_NODE_ENV":"production"}
+{"_hash":1793604939047,"VITE_APP_PROJECT_NAME":"前端项目架构","VITE_APP_VERSION":"v1.0","VITE_APP_JSS_LICENSE":"","VITE_APP_TITLE":"平台","VITE_APP_BASE_URL":"/","VITE_APP_FOOTER_VISIBLE":false,"VITE_APP_LOGIN_PHONE":false,"VITE_APP_LOGIN_QRCODE":false,"VITE_APP_MESSAGE_VISIBLE":true,"VITE_APP_IS_BASE":true,"VITE_APP_LANG_ENABLE":false,"VITE_APP_LANG":"zh","VITE_APP_API_PATH":"/apig","VITE_APP_SYS_SERVER_NAME":"portal","VITE_APP_MESSAGE_SERVER_NAME":"message","VITE_APP_PORTAL_SERVER_NAME":"portal","VITE_APP_FLOW_SERVER_NAME":"flow","VITE_APP_CLIENT_ID":"mm0001","VITE_APP_PREVIEW_ONLINE":"/filePreview/onlinePreview?url=","VITE_APP_WEB_SITE":"https://sapit.com.cn/#/home","VITE_APP_LOGIN_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_BASE_CASE_NAME":"辽ICP备14008719号-2","VITE_APP_SOCKET_URL":"/","VITE_APP_SOCKET_PATH":"/apig/ws/websocket","VITE_CONFIG_MODE":false,"VITE_APP_API_BASE_URL":"http://192.168.200.7:6801","VITE_APP_API_FILE_URL":"/","VITE_APP_LOGIN_PATH":"/login","VITE_APP_DEFAULT_PATH":"/workplace/index","VITE_APP_LOGIN_PATH_THEME":"3","VITE_APP_MENU_THEME":"light","VITE_APP_MENU_BG":"#ebf7fe","VITE_APP_MENU_SUB_BG":"#ebf7fe","VITE_APP_MENU_HOVER_BG":"#d5e8f5","VITE_APP_MENU_ACTIVE_BG":"#d5e8f5","VITE_APP_MENU_TEXT":"","VITE_APP_MENU_TEXT_HOVER":"","VITE_APP_MENU_TEXT_ACTIVE":"","VITE_APP_MENU_GROUP_TITLE":"","VITE_APP_MENU_BG_LIGHTNESS":93,"VITE_APP_MENU_BG_SATURATION":66,"VITE_APP_MENU_BG_ACTIVE_MIX":16,"VITE_APP_MENU_BAR":"left","VITE_APP_THEME_VALUE":"blue","VITE_APP_THEME":{"blue":{"name":"blue","color":"#1677FF","lightColor":"\t#6495ED","darkColor":"#00008B","borderColor":"#B0C4DE","bgColor":"#f0f2f5"},"green":{"name":"green","color":"#00b96b","lightColor":"#90EE90","darkColor":"#3CB371","borderColor":"#98FB98","bgColor":"#F0FFF0"},"orange":{"name":"orange","color":"#FFA500","lightColor":"\t#FFE4B5","darkColor":"#FF8C00","borderColor":"#FFDEAD","bgColor":"#FFEFD5"}},"VITE_USER_NODE_ENV":"production"}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
lib/css/style.css


+ 9 - 9
lib/js/ActionButton.js

@@ -1,11 +1,11 @@
-import { c_ as b, B as p, _ as i, cT as y, e as O } from "./index2.js";
-import { shallowRef as s, onBeforeUnmount as m, defineComponent as P, onMounted as R, createVNode as T } from "vue";
-const x = () => {
+import { c$ as b, B as p, _ as i, cU as y, e as O } from "./index2.js";
+import { shallowRef as s, onBeforeUnmount as m, defineComponent as P, onMounted as R, createVNode as x } from "vue";
+const A = () => {
   const n = s(!1);
   const n = s(!1);
   return m(() => {
   return m(() => {
     n.value = !0;
     n.value = !0;
   }), n;
   }), n;
-}, A = {
+}, D = {
   type: {
   type: {
     type: String
     type: String
   },
   },
@@ -20,19 +20,19 @@ const x = () => {
 function d(n) {
 function d(n) {
   return !!(n && n.then);
   return !!(n && n.then);
 }
 }
-const N = P({
+const T = P({
   compatConfig: {
   compatConfig: {
     MODE: 3
     MODE: 3
   },
   },
   name: "ActionButton",
   name: "ActionButton",
-  props: A,
+  props: D,
   setup(n, g) {
   setup(n, g) {
     let {
     let {
       slots: B
       slots: B
     } = g;
     } = g;
     const l = s(!1), c = s(), u = s(!1);
     const l = s(!1), c = s(), u = s(!1);
     let f;
     let f;
-    const v = x();
+    const v = A();
     R(() => {
     R(() => {
       n.autofocus && (f = setTimeout(() => {
       n.autofocus && (f = setTimeout(() => {
         var e, t;
         var e, t;
@@ -79,7 +79,7 @@ const N = P({
         prefixCls: t,
         prefixCls: t,
         buttonProps: o
         buttonProps: o
       } = n;
       } = n;
-      return T(p, i(i(i({}, y(e)), {}, {
+      return x(p, i(i(i({}, y(e)), {}, {
         onClick: C,
         onClick: C,
         loading: u.value,
         loading: u.value,
         prefixCls: t
         prefixCls: t
@@ -90,5 +90,5 @@ const N = P({
   }
   }
 });
 });
 export {
 export {
-  N as A
+  T as A
 };
 };

+ 5 - 5
lib/js/Col.js

@@ -1,4 +1,4 @@
-import { bC as D, g as E, m as T, d as g, u as k, bD as V, bE as j, c as F, _ as C, aw as N } from "./index2.js";
+import { bD as D, g as E, m as T, d as g, u as F, bE as V, bF as j, c as k, _ as C, aw as N } from "./index2.js";
 import { shallowRef as X, onMounted as L, inject as H, computed as m, provide as K, defineComponent as W, ref as R, onBeforeUnmount as P, createVNode as B } from "vue";
 import { shallowRef as X, onMounted as L, inject as H, computed as m, provide as K, defineComponent as W, ref as R, onBeforeUnmount as P, createVNode as B } from "vue";
 const J = () => {
 const J = () => {
   const e = X(!1);
   const e = X(!1);
@@ -149,7 +149,7 @@ const J = () => {
     const {
     const {
       prefixCls: o,
       prefixCls: o,
       direction: s
       direction: s
-    } = k("row", e), [G, y] = ee(o);
+    } = F("row", e), [G, y] = ee(o);
     let b;
     let b;
     const v = V(), x = R({
     const v = V(), x = R({
       xs: !0,
       xs: !0,
@@ -210,7 +210,7 @@ const J = () => {
       supportFlexGap: d,
       supportFlexGap: d,
       wrap: m(() => e.wrap)
       wrap: m(() => e.wrap)
     });
     });
-    const w = m(() => F(o.value, {
+    const w = m(() => k(o.value, {
       [`${o.value}-no-wrap`]: e.wrap === !1,
       [`${o.value}-no-wrap`]: e.wrap === !1,
       [`${o.value}-${p.value}`]: p.value,
       [`${o.value}-${p.value}`]: p.value,
       [`${o.value}-${f.value}`]: f.value,
       [`${o.value}-${f.value}`]: f.value,
@@ -282,7 +282,7 @@ const se = () => ({
     } = q(), {
     } = q(), {
       prefixCls: y,
       prefixCls: y,
       direction: b
       direction: b
-    } = k("col", e), [v, x] = te(y), S = m(() => {
+    } = F("col", e), [v, x] = te(y), S = m(() => {
       const {
       const {
         span: f,
         span: f,
         order: p,
         order: p,
@@ -302,7 +302,7 @@ const se = () => ({
           [`${c}-${r}-pull-${l.pull}`]: l.pull || l.pull === 0,
           [`${c}-${r}-pull-${l.pull}`]: l.pull || l.pull === 0,
           [`${c}-rtl`]: b.value === "rtl"
           [`${c}-rtl`]: b.value === "rtl"
         });
         });
-      }), F(c, {
+      }), k(c, {
         [`${c}-${f}`]: f !== void 0,
         [`${c}-${f}`]: f !== void 0,
         [`${c}-order-${p}`]: p,
         [`${c}-order-${p}`]: p,
         [`${c}-offset-${d}`]: d,
         [`${c}-offset-${d}`]: d,

+ 124 - 128
lib/js/CustomInput.js

@@ -1,33 +1,30 @@
-var Y = (r, L, s) => new Promise((T, e) => {
-  var E = (n) => {
+var L = (o, f, a) => new Promise((l, T) => {
+  var b = (n) => {
     try {
     try {
-      C(s.next(n));
-    } catch (y) {
-      e(y);
+      E(a.next(n));
+    } catch (_) {
+      T(_);
     }
     }
-  }, k = (n) => {
+  }, I = (n) => {
     try {
     try {
-      C(s.throw(n));
-    } catch (y) {
-      e(y);
+      E(a.throw(n));
+    } catch (_) {
+      T(_);
     }
     }
-  }, C = (n) => n.done ? T(n.value) : Promise.resolve(n.value).then(E, k);
-  C((s = s.apply(r, L)).next());
+  }, E = (n) => n.done ? l(n.value) : Promise.resolve(n.value).then(b, I);
+  E((a = a.apply(o, f)).next());
 });
 });
-import { ref as I, computed as D, watch as j, resolveComponent as O, openBlock as o, createElementBlock as P, createBlock as m, createCommentVNode as c, mergeProps as R, withCtx as B, Fragment as z, renderList as q, createTextVNode as J, toDisplayString as K } from "vue";
-import { I as Q, a6 as W, a7 as X, d5 as g, d6 as Z } from "./index2.js";
-import { _ as ee } from "./index8.js";
-import { D as le } from "./dayjs.js";
-const te = {
+import { computed as v, ref as k, watch as V, resolveComponent as C, openBlock as s, createElementBlock as S, createBlock as c, createCommentVNode as m, withCtx as h, Fragment as Y, renderList as F, createTextVNode as O, toDisplayString as P } from "vue";
+import { I as g, a6 as B, a7 as G, d6 as y, d7 as H } from "./index2.js";
+import { _ as $ } from "./index8.js";
+import { D as R } from "./dayjs.js";
+const j = {
   key: 0,
   key: 0,
   class: "custom-input"
   class: "custom-input"
-}, re = /* @__PURE__ */ Object.assign({ name: "CustomInput" }, {
+}, W = /* @__PURE__ */ Object.assign({ name: "CustomInput" }, {
   __name: "CustomInput",
   __name: "CustomInput",
   props: {
   props: {
-    value: {
-      type: [String, Object, Array, Number],
-      default: ""
-    },
+    // 查询条件整行(SettingFilter 的 filters 项),组件直接读写它的 value 字段
     data: {
     data: {
       type: Object,
       type: Object,
       default: () => ({})
       default: () => ({})
@@ -37,145 +34,144 @@ const te = {
       default: !1
       default: !1
     }
     }
   },
   },
-  setup(r) {
-    const L = r, s = I(0), T = I(1), e = I({
-      filterConfig: {}
-    }), E = D(
+  setup(o) {
+    const f = o, a = v({
+      get: () => {
+        var t;
+        const e = (t = f.data) == null ? void 0 : t.value;
+        return e === "" ? void 0 : e;
+      },
+      set: (e) => {
+        f.data && (f.data.value = e == null ? "" : e);
+      }
+    }), l = v(() => {
+      var e;
+      return ((e = f.data) == null ? void 0 : e.filterConfig) || null;
+    }), T = k(1), b = k(0), I = v(
       () => {
       () => {
-        var i, l;
-        return ((l = (i = e.value) == null ? void 0 : i.filterConfig) == null ? void 0 : l.filterType) === "DATETIME" ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
+        var e;
+        return ((e = l.value) == null ? void 0 : e.filterType) === "DATETIME" ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
       }
       }
-    ), k = D(() => {
-      var l, a;
-      return ["SINGLE_SELECT", "MULTIPLE_SELECT", "GANDER", "IS"].includes((a = (l = e.value) == null ? void 0 : l.filterConfig) == null ? void 0 : a.filterType);
-    }), C = D(() => {
-      var l, a;
-      return ["INT", "FLOAT"].includes((a = (l = e.value) == null ? void 0 : l.filterConfig) == null ? void 0 : a.filterType);
-    }), n = D(() => {
-      var l, a;
-      return ["DATE", "DATETIME"].includes((a = (l = e.value) == null ? void 0 : l.filterConfig) == null ? void 0 : a.filterType);
+    ), E = v(() => {
+      var t;
+      const e = (t = l.value) == null ? void 0 : t.filterType;
+      return !e || e === "INPUT";
+    }), n = v(() => {
+      var t;
+      return ["SINGLE_SELECT", "MULTIPLE_SELECT", "GANDER", "IS"].includes((t = l.value) == null ? void 0 : t.filterType);
+    }), _ = v(() => {
+      var t;
+      return ["INT", "FLOAT"].includes((t = l.value) == null ? void 0 : t.filterType);
+    }), U = v(() => {
+      var t;
+      return ["DATE", "DATETIME"].includes((t = l.value) == null ? void 0 : t.filterType);
     });
     });
-    j(
-      () => L.data,
-      (i) => Y(this, null, function* () {
-        var u, f, d, v, p, b, t, V, S, _;
-        e.value = i || {};
-        const a = ["SINGLE_SELECT", "MULTIPLE_SELECT", "GANDER", "IS"].includes((f = (u = e.value) == null ? void 0 : u.filterConfig) == null ? void 0 : f.filterType) && !((v = (d = e.value) == null ? void 0 : d.filterConfig) != null && v.filterData) && !!((b = (p = e.value) == null ? void 0 : p.filterConfig) != null && b.filterApi);
-        if (T.value = ((V = (t = e.value) == null ? void 0 : t.filterConfig) == null ? void 0 : V.step) || 1, s.value = ((_ = (S = e.value) == null ? void 0 : S.filterConfig) == null ? void 0 : _.precision) || 1, a) {
-          const $ = yield e.value.filterConfig.filterApi(
-            { type: "portal_config_type" },
-            { pageSize: 10, pageNo: 1 }
-          );
-          e.value.filterConfig.filterData = ($.list || []).map((h) => {
-            var U, N, w, x, A, M;
+    V(
+      l,
+      (e) => L(this, null, function* () {
+        if (!e) return;
+        const t = ["SINGLE_SELECT", "MULTIPLE_SELECT", "GANDER", "IS"];
+        if (T.value = e.step || 1, b.value = e.precision === void 0 ? 0 : e.precision, t.includes(e.filterType) && !e.filterData && !!e.filterApi) {
+          const r = yield e.filterApi({ type: "portal_config_type" }, { pageSize: 10, pageNo: 1 });
+          e.filterData = (r.list || []).map((d) => {
+            var p, D;
             return {
             return {
-              value: h[(w = (N = (U = e.value) == null ? void 0 : U.filterConfig) == null ? void 0 : N.props) == null ? void 0 : w.value],
-              name: h[(M = (A = (x = e.value) == null ? void 0 : x.filterConfig) == null ? void 0 : A.props) == null ? void 0 : M.key]
+              value: d[(p = e.props) == null ? void 0 : p.value],
+              name: d[(D = e.props) == null ? void 0 : D.key]
             };
             };
           });
           });
         }
         }
       }),
       }),
       { immediate: !0, deep: !0 }
       { immediate: !0, deep: !0 }
     );
     );
-    function y(i, l) {
-      return Z(i, l);
-    }
-    function F(i = g()) {
-      var f, d, v, p;
-      const l = (d = (f = e.value) == null ? void 0 : f.filterConfig) == null ? void 0 : d.startDate, a = (p = (v = e.value) == null ? void 0 : v.filterConfig) == null ? void 0 : p.endDate;
-      if (!l && !a) return !1;
-      const u = g(i).unix();
-      if (l && a)
-        return u < g(l).unix() || u > g(a).unix();
-      if (l)
-        return u <= g(l).unix();
-      if (a)
-        return u >= g(a).unix();
-    }
-    function G(i = "", l = "", a = []) {
-      e.value.value = l;
+    function w(e, t) {
+      return H(e, t);
     }
     }
-    function H(i, l) {
-      e.value.value = l;
+    function x(e = y()) {
+      var d, p;
+      const t = (d = l.value) == null ? void 0 : d.startDate, i = (p = l.value) == null ? void 0 : p.endDate;
+      if (!t && !i) return !1;
+      const r = y(e).unix();
+      if (t && i)
+        return r < y(t).unix() || r > y(i).unix();
+      if (t)
+        return r <= y(t).unix();
+      if (i)
+        return r >= y(i).unix();
     }
     }
-    return (i, l) => {
-      const a = Q, u = X, f = W, d = ee, v = le, p = O("s-office-select"), b = O("s-tree-select");
-      return e.value.filterConfig ? (o(), P("div", te, [
-        !e.value.filterConfig.filterType || e.value.filterConfig.filterType === "INPUT" ? (o(), m(a, {
+    return (e, t) => {
+      const i = g, r = G, d = B, p = $, D = R, M = C("s-office-select"), N = C("s-tree-select");
+      return l.value ? (s(), S("div", j, [
+        E.value ? (s(), c(i, {
           key: 0,
           key: 0,
           style: { width: "100%" },
           style: { width: "100%" },
-          disabled: r.disabled,
-          modelValue: e.value.value,
-          "onUpdate:modelValue": l[0] || (l[0] = (t) => e.value.value = t),
-          placeholder: i.$l("请输入"),
-          maxLength: e.value.filterConfig.length || 200,
-          onBlur: l[1] || (l[1] = (t) => e.value.value = t.target.value)
-        }, null, 8, ["disabled", "modelValue", "placeholder", "maxLength"])) : c("", !0),
-        k.value ? (o(), m(f, R({
+          disabled: o.disabled,
+          value: a.value,
+          "onUpdate:value": t[0] || (t[0] = (u) => a.value = u),
+          placeholder: e.$l("请输入"),
+          maxLength: l.value.length || 200
+        }, null, 8, ["disabled", "value", "placeholder", "maxLength"])) : m("", !0),
+        n.value ? (s(), c(d, {
           key: 1,
           key: 1,
           style: { width: "100%" },
           style: { width: "100%" },
-          disabled: r.disabled,
-          modelValue: e.value.value,
-          "onUpdate:modelValue": l[2] || (l[2] = (t) => e.value.value = t)
-        }, e.value.filterConfig.filterType === "MULTIPLE_SELECT" ? { mode: "multiple" } : {}, {
+          disabled: o.disabled,
+          value: a.value,
+          "onUpdate:value": t[1] || (t[1] = (u) => a.value = u),
+          mode: l.value.filterType === "MULTIPLE_SELECT" ? "multiple" : void 0,
           allowClear: !0,
           allowClear: !0,
-          placeholder: i.$l("请选择"),
-          onChange: l[3] || (l[3] = (t) => e.value.value = t)
-        }), {
-          default: B(() => [
-            (o(!0), P(z, null, q(e.value.filterConfig.filterData, (t, V) => (o(), m(u, {
-              value: t.value,
-              key: V
+          placeholder: e.$l("请选择")
+        }, {
+          default: h(() => [
+            (s(!0), S(Y, null, F(l.value.filterData || [], (u, A) => (s(), c(r, {
+              value: u.value,
+              key: A
             }, {
             }, {
-              default: B(() => [
-                J(K(t.name), 1)
+              default: h(() => [
+                O(P(u.name), 1)
               ]),
               ]),
               _: 2
               _: 2
             }, 1032, ["value"]))), 128))
             }, 1032, ["value"]))), 128))
           ]),
           ]),
           _: 1
           _: 1
-        }, 16, ["disabled", "modelValue", "placeholder"])) : c("", !0),
-        C.value ? (o(), m(d, {
+        }, 8, ["disabled", "value", "mode", "placeholder"])) : m("", !0),
+        _.value ? (s(), c(p, {
           key: 2,
           key: 2,
-          disabled: r.disabled,
-          precision: s.value,
+          disabled: o.disabled,
+          precision: b.value,
           step: T.value,
           step: T.value,
           style: { width: "100%" },
           style: { width: "100%" },
-          modelValue: e.value.value,
-          "onUpdate:modelValue": l[4] || (l[4] = (t) => e.value.value = t),
-          placeholder: i.$l("请输入"),
-          min: e.value.filterConfig.minValue,
-          max: e.value.filterConfig.maxValue,
-          onBlur: l[5] || (l[5] = (t) => e.value.value = t.target.value)
-        }, null, 8, ["disabled", "precision", "step", "modelValue", "placeholder", "min", "max"])) : c("", !0),
-        n.value ? (o(), m(v, {
+          value: a.value,
+          "onUpdate:value": t[2] || (t[2] = (u) => a.value = u),
+          placeholder: e.$l("请输入"),
+          min: l.value.minValue,
+          max: l.value.maxValue
+        }, null, 8, ["disabled", "precision", "step", "value", "placeholder", "min", "max"])) : m("", !0),
+        U.value ? (s(), c(D, {
           key: 3,
           key: 3,
           style: { width: "100%" },
           style: { width: "100%" },
-          disabled: r.disabled,
-          modelValue: e.value.value,
-          "onUpdate:modelValue": l[6] || (l[6] = (t) => e.value.value = t),
-          "show-time": E.value && E.value.split(" ").length > 1 ? { format: "HH:mm:ss" } : !1,
-          placeholder: i.$l("请选择"),
-          "disabled-date": F,
-          onChange: H
-        }, null, 8, ["disabled", "modelValue", "show-time", "placeholder"])) : c("", !0),
-        e.value.filterConfig.filterType === "USER" ? (o(), m(p, {
+          disabled: o.disabled,
+          value: a.value,
+          "onUpdate:value": t[3] || (t[3] = (u) => a.value = u),
+          "value-format": I.value,
+          "show-time": l.value.filterType === "DATETIME" ? { format: "HH:mm:ss" } : !1,
+          placeholder: e.$l("请选择"),
+          "disabled-date": x
+        }, null, 8, ["disabled", "value", "value-format", "show-time", "placeholder"])) : m("", !0),
+        l.value.filterType === "USER" ? (s(), c(M, {
           key: 4,
           key: 4,
-          value: e.value.value,
-          "onUpdate:value": l[7] || (l[7] = (t) => e.value.value = t),
-          onChange: G
-        }, null, 8, ["value"])) : c("", !0),
-        e.value.filterConfig.filterType === "OFFICE" ? (o(), m(b, {
+          value: a.value,
+          "onUpdate:value": t[4] || (t[4] = (u) => a.value = u)
+        }, null, 8, ["value"])) : m("", !0),
+        l.value.filterType === "OFFICE" ? (s(), c(N, {
           key: 5,
           key: 5,
-          modelValue: e.value.value,
-          "onUpdate:modelValue": l[8] || (l[8] = (t) => e.value.value = t),
-          onChange: l[9] || (l[9] = (t) => e.value.value = t),
-          recursionChildren: y
-        }, null, 8, ["modelValue"])) : c("", !0)
-      ])) : c("", !0);
+          value: a.value,
+          "onUpdate:value": t[5] || (t[5] = (u) => a.value = u),
+          recursionChildren: w
+        }, null, 8, ["value"])) : m("", !0)
+      ])) : m("", !0);
     };
     };
   }
   }
 });
 });
 export {
 export {
-  re as default
+  W as default
 };
 };

+ 14 - 14
lib/js/SBelowChoosePosition.js

@@ -26,8 +26,8 @@ var $ = (s, n, o) => new Promise((i, f) => {
   }, y = (r) => r.done ? i(r.value) : Promise.resolve(r.value).then(N, a);
   }, y = (r) => r.done ? i(r.value) : Promise.resolve(r.value).then(N, a);
   y((o = o.apply(s, n)).next());
   y((o = o.apply(s, n)).next());
 });
 });
-import { ref as g, reactive as he, computed as fe, watch as b, nextTick as me, onMounted as ye, resolveComponent as ge, openBlock as w, createBlock as U, withCtx as L, createElementVNode as p, createVNode as x, toDisplayString as m, createTextVNode as V, createElementBlock as S, createCommentVNode as F, Fragment as K, renderList as J, normalizeClass as _e, normalizeStyle as ke, unref as we } from "vue";
-import { n as Ie, p as Le, q as Se, v as Ce, x as $e, y as Ne, I as Ee, C as be, B as xe, z as P } from "./index2.js";
+import { ref as g, reactive as he, computed as fe, watch as E, nextTick as me, onMounted as ye, resolveComponent as ge, openBlock as w, createBlock as U, withCtx as L, createElementVNode as p, createVNode as x, toDisplayString as m, createTextVNode as V, createElementBlock as S, createCommentVNode as F, Fragment as K, renderList as J, normalizeClass as _e, normalizeStyle as ke, unref as we } from "vue";
+import { n as Ie, p as Le, q as Se, v as Ce, x as $e, y as Ne, I as be, C as Ee, B as xe, z as P } from "./index2.js";
 function C() {
 function C() {
   this.map = {}, this.arrayLink = [];
   this.map = {}, this.arrayLink = [];
 }
 }
@@ -122,18 +122,18 @@ const De = { class: "modal-container" }, Oe = { class: "side-tree" }, Be = { cla
       searchValue: null,
       searchValue: null,
       selectedData: {}
       selectedData: {}
     }), y = g(!1), r = g(null), v = g([]), c = g([]), h = g([]), z = g([]), D = g([]), G = g(!1), Q = fe(() => window.$l("岗位"));
     }), y = g(!1), r = g(null), v = g([]), c = g([]), h = g([]), z = g([]), D = g([]), G = g(!1), Q = fe(() => window.$l("岗位"));
-    b(
+    E(
       () => i.selectedIds,
       () => i.selectedIds,
       (e) => {
       (e) => {
         h.value = [...e || []], H();
         h.value = [...e || []], H();
       },
       },
       { deep: !0 }
       { deep: !0 }
-    ), b(
+    ), E(
       () => i.selectedId,
       () => i.selectedId,
       () => {
       () => {
         j();
         j();
       }
       }
-    ), b(
+    ), E(
       () => i.rootId,
       () => i.rootId,
       (e) => {
       (e) => {
         console.log("val", e), B(e);
         console.log("val", e), B(e);
@@ -172,8 +172,8 @@ const De = { class: "modal-container" }, Oe = { class: "side-tree" }, Be = { cla
         containsChild: !0
         containsChild: !0
       });
       });
       a.pageTotal = d.total || 0, i.multiple && d && ((_ = d == null ? void 0 : d.list) != null && _.length) && v.value.length && (d.list || []).forEach((I) => {
       a.pageTotal = d.total || 0, i.multiple && d && ((_ = d == null ? void 0 : d.list) != null && _.length) && v.value.length && (d.list || []).forEach((I) => {
-        const E = v.value.find((u) => u.id === I.id);
-        I.selected = !!E;
+        const b = v.value.find((u) => u.id === I.id);
+        I.selected = !!b;
       }), O(d.list), c.value = d.list || [];
       }), O(d.list), c.value = d.list || [];
     }), Y = () => $(this, null, function* () {
     }), Y = () => $(this, null, function* () {
       var d;
       var d;
@@ -188,7 +188,7 @@ const De = { class: "modal-container" }, Oe = { class: "side-tree" }, Be = { cla
         isEnabled: !0
         isEnabled: !0
       });
       });
       a.pageTotal = t.total || 0, i.multiple && t && ((d = t == null ? void 0 : t.list) != null && d.length) && v.value.length && (t.list || []).forEach((_) => {
       a.pageTotal = t.total || 0, i.multiple && t && ((d = t == null ? void 0 : t.list) != null && d.length) && v.value.length && (t.list || []).forEach((_) => {
-        const I = v.value.find((E) => E.id === _.id);
+        const I = v.value.find((b) => b.id === _.id);
         _.selected = !!I;
         _.selected = !!I;
       }), O(t.list), c.value = (t == null ? void 0 : t.list) || [];
       }), O(t.list), c.value = (t == null ? void 0 : t.list) || [];
     }), Z = () => {
     }), Z = () => {
@@ -303,13 +303,13 @@ const De = { class: "modal-container" }, Oe = { class: "side-tree" }, Be = { cla
     }, ce = (e) => {
     }, ce = (e) => {
       D.value = e;
       D.value = e;
     };
     };
-    return b(
+    return E(
       () => c.value,
       () => c.value,
       () => {
       () => {
         le();
         le();
       },
       },
       { deep: !0 }
       { deep: !0 }
-    ), b(
+    ), E(
       () => i.value,
       () => i.value,
       (e) => {
       (e) => {
         N.value = e, i.multiple ? (h.value = [...i.selectedIds || []], H()) : (c.value = [], j());
         N.value = e, i.multiple ? (h.value = [...i.selectedIds || []], H()) : (c.value = [], j());
@@ -320,8 +320,8 @@ const De = { class: "modal-container" }, Oe = { class: "side-tree" }, Be = { cla
     }), n({ initLeftTreeData: B }), ye(() => {
     }), n({ initLeftTreeData: B }), ye(() => {
       B();
       B();
     }), (e, l) => {
     }), (e, l) => {
-      const t = xe, d = Ne, _ = $e, I = Ee, E = ge("s-modal");
-      return w(), U(E, {
+      const t = xe, d = Ne, _ = $e, I = be, b = ge("s-modal");
+      return w(), U(b, {
         value: N.value,
         value: N.value,
         "onUpdate:value": l[1] || (l[1] = (u) => N.value = u),
         "onUpdate:value": l[1] || (l[1] = (u) => N.value = u),
         title: e.$l(s.title),
         title: e.$l(s.title),
@@ -438,7 +438,7 @@ const De = { class: "modal-container" }, Oe = { class: "side-tree" }, Be = { cla
                         p("div", {
                         p("div", {
                           onClick: (de) => ie(u)
                           onClick: (de) => ie(u)
                         }, [
                         }, [
-                          x(we(be), { class: "remove-icon" })
+                          x(we(Ee), { class: "remove-icon" })
                         ], 8, Xe)
                         ], 8, Xe)
                       ]))), 128))
                       ]))), 128))
                     ])
                     ])
@@ -452,7 +452,7 @@ const De = { class: "modal-container" }, Oe = { class: "side-tree" }, Be = { cla
       }, 8, ["value", "title", "width"]);
       }, 8, ["value", "title", "width"]);
     };
     };
   }
   }
-}, lt = /* @__PURE__ */ Ie(Ye, [["__scopeId", "data-v-8121b7a8"]]);
+}, lt = /* @__PURE__ */ Ie(Ye, [["__scopeId", "data-v-be62bc03"]]);
 export {
 export {
   lt as default
   lt as default
 };
 };

+ 44 - 51
lib/js/SDrawer.js

@@ -1,7 +1,7 @@
-import { ref as f, watch as b, watchEffect as g, openBlock as l, createBlock as r, withCtx as n, createElementVNode as c, renderSlot as m, createCommentVNode as s, createTextVNode as p, toDisplayString as h } from "vue";
-import { n as $, B as C } from "./index2.js";
-import { _ as k } from "./index7.js";
-const S = { class: "s-drawer-body" }, B = { class: "s-drawer-footer" }, N = {
+import { ref as s, watch as w, watchEffect as y, openBlock as b, createBlock as g, withCtx as l, createElementVNode as d, renderSlot as c, createVNode as u, createTextVNode as m, toDisplayString as f } from "vue";
+import { n as C, B as S } from "./index2.js";
+import { _ as N } from "./index7.js";
+const $ = { class: "s-drawer-body" }, k = { class: "s-drawer-footer" }, B = {
   __name: "SDrawer",
   __name: "SDrawer",
   props: {
   props: {
     value: {
     value: {
@@ -23,84 +23,77 @@ const S = { class: "s-drawer-body" }, B = { class: "s-drawer-footer" }, N = {
     height: {
     height: {
       type: Number,
       type: Number,
       default: 378
       default: 378
-    },
-    footer: {
-      type: Boolean,
-      default: !1
     }
     }
   },
   },
   emits: ["update:value", "confirm"],
   emits: ["update:value", "confirm"],
-  setup(t, { emit: y }) {
-    const a = y, o = t, d = f(o.value);
-    b(
-      () => o.value,
+  setup(o, { emit: p }) {
+    const a = p, t = o, n = s(t.value);
+    w(
+      () => t.value,
       (e) => {
       (e) => {
-        d.value = e;
+        n.value = e;
       },
       },
       { immediate: !0 }
       { immediate: !0 }
     );
     );
-    const v = f(o.mode);
-    g(() => {
+    const h = s(t.mode);
+    y(() => {
       const e = {
       const e = {
         left: "",
         left: "",
         right: "",
         right: "",
         top: "",
         top: "",
         bottom: ""
         bottom: ""
       };
       };
-      Object.keys(e).includes(o.mode) || (console.warn(`当前设置mode【${o.mode}】不在【${e}】中,已默认为【right】`), v.value = "right");
+      Object.keys(e).includes(t.mode) || (console.warn(`当前设置mode【${t.mode}】不在【${e}】中,已默认为【right】`), h.value = "right");
     });
     });
-    const i = () => {
+    const r = () => {
       a("update:value", !1);
       a("update:value", !1);
-    }, w = () => {
+    }, _ = () => {
       a("update:value", !1), a("confirm");
       a("update:value", !1), a("confirm");
     };
     };
     return (e, D) => {
     return (e, D) => {
-      const u = C, _ = k;
-      return l(), r(_, {
+      const i = S, v = N;
+      return b(), g(v, {
         rootClassName: "s-drawer-wrap",
         rootClassName: "s-drawer-wrap",
-        title: t.title,
-        placement: t.mode,
-        width: t.width,
-        visible: d.value,
-        onClose: i,
+        title: o.title,
+        placement: o.mode,
+        width: o.width,
+        visible: n.value,
+        onClose: r,
         bodyStyle: {
         bodyStyle: {
           padding: 0,
           padding: 0,
           display: "flex",
           display: "flex",
           flexDirection: "column"
           flexDirection: "column"
         }
         }
       }, {
       }, {
-        default: n(() => [
-          c("div", S, [
-            m(e.$slots, "default", {}, void 0, !0)
+        default: l(() => [
+          d("div", $, [
+            c(e.$slots, "default", {}, void 0, !0)
           ]),
           ]),
-          c("div", B, [
-            e.$slots.footer ? m(e.$slots, "footer", {}, void 0, !0, 0) : s("", !0),
-            !e.$slots.footer && t.footer ? (l(), r(u, {
-              key: 1,
-              onClick: i
-            }, {
-              default: n(() => [
-                p(h(e.$l("取消")), 1)
-              ]),
-              _: 1
-            })) : s("", !0),
-            !e.$slots.footer && t.footer ? (l(), r(u, {
-              key: 2,
-              type: "primary",
-              onClick: w
-            }, {
-              default: n(() => [
-                p(h(e.$l("确定")), 1)
-              ]),
-              _: 1
-            })) : s("", !0)
+          d("div", k, [
+            c(e.$slots, "footer", {}, () => [
+              u(i, { onClick: r }, {
+                default: l(() => [
+                  m(f(e.$l("取消")), 1)
+                ]),
+                _: 1
+              }),
+              u(i, {
+                type: "primary",
+                onClick: _
+              }, {
+                default: l(() => [
+                  m(f(e.$l("确定")), 1)
+                ]),
+                _: 1
+              })
+            ], !0)
           ])
           ])
         ]),
         ]),
         _: 3
         _: 3
       }, 8, ["title", "placement", "width", "visible"]);
       }, 8, ["title", "placement", "width", "visible"]);
     };
     };
   }
   }
-}, I = /* @__PURE__ */ $(N, [["__scopeId", "data-v-30da4429"]]);
+}, j = /* @__PURE__ */ C(B, [["__scopeId", "data-v-1313dce7"]]);
 export {
 export {
-  I as default
+  j as default
 };
 };

+ 135 - 124
lib/js/SFormLayout.js

@@ -1,14 +1,14 @@
-import { useSlots as ne, ref as o, computed as ae, watch as se, nextTick as P, onMounted as ie, onUnmounted as ue, resolveComponent as S, openBlock as l, createElementBlock as c, normalizeStyle as h, createVNode as d, withCtx as m, createElementVNode as a, toDisplayString as g, renderSlot as _, createCommentVNode as u, Fragment as U, renderList as G, createBlock as k, normalizeClass as ce, createTextVNode as x } from "vue";
-import { n as re, ao as de, B as fe } from "./index2.js";
-import { _ as he, S as me } from "./index10.js";
-import { T as ye, _ as ve } from "./index11.js";
-const be = { class: "row" }, pe = { class: "title" }, ge = { class: "btns" }, ke = {
+import { useSlots as ce, ref as a, computed as G, watch as J, nextTick as Q, onMounted as ue, onUnmounted as re, resolveComponent as S, openBlock as l, createElementBlock as r, normalizeStyle as v, createVNode as d, withCtx as m, createElementVNode as c, toDisplayString as g, renderSlot as B, createCommentVNode as u, Fragment as X, renderList as Y, createBlock as k, normalizeClass as de, createTextVNode as R } from "vue";
+import { n as fe, ao as ve, B as me } from "./index2.js";
+import { _ as he, S as ye } from "./index10.js";
+import { T as be, _ as pe } from "./index11.js";
+const ge = { class: "row" }, ke = { class: "title" }, we = { class: "btns" }, _e = {
   key: 0,
   key: 0,
   class: "row sub-title-wrap"
   class: "row sub-title-wrap"
-}, we = { class: "sub-title" }, Se = { class: "form-layout-main-content" }, _e = {
+}, Se = { class: "sub-title" }, Be = { class: "form-layout-main-content" }, $e = {
   key: 1,
   key: 1,
   class: "collapses-content-wrap"
   class: "collapses-content-wrap"
-}, Be = { class: "collapese-container" }, $e = { class: "modal" }, Ce = /* @__PURE__ */ Object.assign({ name: "SFormLayout" }, {
+}, Te = { class: "collapese-container" }, Ce = { class: "modal" }, He = /* @__PURE__ */ Object.assign({ name: "SFormLayout" }, {
   __name: "SFormLayout",
   __name: "SFormLayout",
   props: {
   props: {
     viewHeight: {
     viewHeight: {
@@ -81,230 +81,241 @@ const be = { class: "row" }, pe = { class: "title" }, ge = { class: "btns" }, ke
     }
     }
   },
   },
   emits: ["footer-callback", "tabsChange"],
   emits: ["footer-callback", "tabsChange"],
-  setup(e, { expose: J, emit: Q }) {
-    const s = e, y = Q, X = ne(), B = o(null), R = o(null), F = o(null), N = o(null), V = o(null), Y = o(null), W = o(null), E = o({}), $ = o("100%"), K = o("881px"), z = o(0), D = o(0), n = o(0), Z = ae(() => s.showAnchor && s.width);
-    se(Z, () => I(), { immediate: !0, deep: !0 });
-    function L() {
-      P(() => {
-        var C, H, T, f, A;
-        D.value = (((C = B.value) == null ? void 0 : C.offsetWidth) || 0) + "px";
-        const t = document.documentElement.clientHeight, i = ((H = document.querySelector(".ant-layout-header.header")) == null ? void 0 : H.offsetHeight) || 0;
-        K.value = t - i + "px";
-        const r = ((T = F.value) == null ? void 0 : T.offsetHeight) || 0, b = ((f = N.value) == null ? void 0 : f.offsetHeight) || 0, p = ((A = V.value) == null ? void 0 : A.offsetHeight) || 0;
-        z.value = t - i - r - b - p - 60;
+  setup(t, { expose: Z, emit: ee }) {
+    const o = t, h = ee, te = ce(), $ = a(null), F = a(null), N = a(null), W = a(null), K = a(null), le = a(null), E = a(null), z = a({}), T = a("100%"), D = a("881px"), L = a(0), M = a(0), s = a(0), V = G(() => o.tabKey && o.tabKey.value || "value"), w = a("");
+    J(() => o.tabs, () => {
+      const e = o.tabs || [];
+      if (!e.length) {
+        w.value = "";
+        return;
+      }
+      const n = V.value;
+      e.some((i) => i && i[n] === w.value) || (w.value = e[0][n]);
+    }, { immediate: !0, deep: !0 });
+    const oe = G(() => o.showAnchor && o.width);
+    J(oe, () => U(), { immediate: !0, deep: !0 });
+    function O() {
+      Q(() => {
+        var C, H, A, f, x;
+        M.value = (((C = $.value) == null ? void 0 : C.offsetWidth) || 0) + "px";
+        const e = document.documentElement.clientHeight, n = ((H = document.querySelector(".ant-layout-header.header")) == null ? void 0 : H.offsetHeight) || 0;
+        D.value = e - n + "px";
+        const i = ((A = N.value) == null ? void 0 : A.offsetHeight) || 0, b = ((f = W.value) == null ? void 0 : f.offsetHeight) || 0, p = ((x = K.value) == null ? void 0 : x.offsetHeight) || 0;
+        L.value = e - n - i - b - p - 60;
       });
       });
     }
     }
-    function M() {
-      y("footer-callback", "cancel");
+    function j() {
+      h("footer-callback", "cancel");
     }
     }
-    function O() {
-      n.value--, y("footer-callback", "prev", n.value);
+    function q() {
+      s.value--, h("footer-callback", "prev", s.value);
     }
     }
-    function j() {
-      if (!window.$utils.isFunction(s.stepValid)) {
-        n.value++, y("footer-callback", "next", n.value);
+    function I() {
+      if (!window.$utils.isFunction(o.stepValid)) {
+        s.value++, h("footer-callback", "next", s.value);
         return;
         return;
       }
       }
-      s.stepValid(n.value).then((t) => {
-        t && (n.value++, y("footer-callback", "next", n.value));
+      o.stepValid(s.value).then((e) => {
+        e && (s.value++, h("footer-callback", "next", s.value));
       });
       });
     }
     }
-    function q() {
-      y("footer-callback", "save");
+    function P() {
+      h("footer-callback", "save");
     }
     }
-    function ee(t) {
-      const i = s.tabs.find((r) => r[s.tabKey.value] === t);
-      y("tabsChange", i);
+    function ne(e) {
+      w.value = e;
+      const n = o.tabs.find((i) => i[V.value] === e);
+      h("tabsChange", n);
     }
     }
-    function I() {
-      P(() => {
+    function U() {
+      Q(() => {
         var b, p;
         var b, p;
-        const t = {}, i = ((b = R.value) == null ? void 0 : b.offsetWidth) || 0, r = ((p = W.value) == null ? void 0 : p.offsetWidth) || 0;
-        r + 200 > i ? t.right = "0px" : t.left = s.width, E.value = t, s.showAnchor && X.collapses ? $.value = r + 200 > i ? `${i - 200}px` : s.width : $.value = r > i ? `${i}px` : s.width;
+        const e = {}, n = ((b = F.value) == null ? void 0 : b.offsetWidth) || 0, i = ((p = E.value) == null ? void 0 : p.offsetWidth) || 0;
+        i + 200 > n ? e.right = "0px" : e.left = o.width, z.value = e, o.showAnchor && te.collapses ? T.value = i + 200 > n ? `${n - 200}px` : o.width : T.value = i > n ? `${n}px` : o.width;
       });
       });
     }
     }
-    let v = null;
-    return ie(() => {
-      L(), n.value = s.stepDefaultActive, window.ResizeObserver && B.value && (v = new ResizeObserver(() => {
-        L(), I();
-      }), v.observe(B.value));
-    }), ue(() => {
-      v == null || v.disconnect(), v = null;
-    }), J({
-      save: q,
-      rollback: M,
-      handNext: j,
-      handPrev: O,
-      stepActive: n,
-      formWidth: $
-    }), (t, i) => {
-      const r = me, b = he, p = ve, C = ye, H = S("s-anchor"), T = S("close-outlined"), f = fe, A = S("arrow-left-outlined"), te = S("arrow-right-outlined"), le = S("save-outlined"), oe = de;
-      return l(), c("div", {
+    let y = null;
+    return ue(() => {
+      O(), s.value = o.stepDefaultActive, window.ResizeObserver && $.value && (y = new ResizeObserver(() => {
+        O(), U();
+      }), y.observe($.value));
+    }), re(() => {
+      y == null || y.disconnect(), y = null;
+    }), Z({
+      save: P,
+      rollback: j,
+      handNext: I,
+      handPrev: q,
+      stepActive: s,
+      formWidth: T
+    }), (e, n) => {
+      const i = ye, b = he, p = pe, C = be, H = S("s-anchor"), A = S("close-outlined"), f = me, x = S("arrow-left-outlined"), ae = S("arrow-right-outlined"), se = S("save-outlined"), ie = ve;
+      return l(), r("div", {
         class: "form-layout",
         class: "form-layout",
         ref_key: "layout",
         ref_key: "layout",
-        ref: B,
-        style: h({ height: K.value })
+        ref: $,
+        style: v({ height: D.value })
       }, [
       }, [
-        d(oe, { spinning: e.loading }, {
+        d(ie, { spinning: t.loading }, {
           default: m(() => [
           default: m(() => [
-            e.title || e.subTitle || t.$slots.otherBtns ? (l(), c("div", {
+            t.title || t.subTitle || e.$slots.otherBtns ? (l(), r("div", {
               key: 0,
               key: 0,
               class: "tools",
               class: "tools",
               ref_key: "toolsRef",
               ref_key: "toolsRef",
-              ref: F
+              ref: N
             }, [
             }, [
-              a("div", be, [
-                a("div", pe, [
-                  a("span", null, g(e.title), 1)
+              c("div", ge, [
+                c("div", ke, [
+                  c("span", null, g(t.title), 1)
                 ]),
                 ]),
-                a("div", ge, [
-                  _(t.$slots, "otherBtns", {}, void 0, !0)
+                c("div", we, [
+                  B(e.$slots, "otherBtns", {}, void 0, !0)
                 ])
                 ])
               ]),
               ]),
-              e.subTitle ? (l(), c("div", ke, [
-                a("div", we, g(e.subTitle), 1)
+              t.subTitle ? (l(), r("div", _e, [
+                c("div", Se, g(t.subTitle), 1)
               ])) : u("", !0)
               ])) : u("", !0)
             ], 512)) : u("", !0),
             ], 512)) : u("", !0),
-            e.steps && e.steps.length ? (l(), c("div", {
+            t.steps && t.steps.length ? (l(), r("div", {
               key: 1,
               key: 1,
               class: "step-wrap",
               class: "step-wrap",
               ref_key: "stepRef",
               ref_key: "stepRef",
-              ref: N
+              ref: W
             }, [
             }, [
               d(b, {
               d(b, {
-                current: n.value,
+                current: s.value,
                 type: "navigation",
                 type: "navigation",
                 size: "small"
                 size: "small"
               }, {
               }, {
                 default: m(() => [
                 default: m(() => [
-                  (l(!0), c(U, null, G(e.steps, (w) => (l(), k(r, {
-                    title: w,
-                    key: w,
+                  (l(!0), r(X, null, Y(t.steps, (_) => (l(), k(i, {
+                    title: _,
+                    key: _,
                     disabled: !0
                     disabled: !0
                   }, null, 8, ["title"]))), 128))
                   }, null, 8, ["title"]))), 128))
                 ]),
                 ]),
                 _: 1
                 _: 1
               }, 8, ["current"])
               }, 8, ["current"])
             ], 512)) : u("", !0),
             ], 512)) : u("", !0),
-            e.tabs && e.tabs.length ? (l(), c("div", {
+            t.tabs && t.tabs.length ? (l(), r("div", {
               key: 2,
               key: 2,
               class: "tabs-wrap",
               class: "tabs-wrap",
               ref_key: "tabsRef",
               ref_key: "tabsRef",
-              ref: V
+              ref: K
             }, [
             }, [
               d(C, {
               d(C, {
-                "default-active-key": e.tabs[0][e.tabKey.label],
-                onChange: ee
+                "active-key": w.value,
+                onChange: ne
               }, {
               }, {
                 default: m(() => [
                 default: m(() => [
-                  (l(!0), c(U, null, G(e.tabs, (w) => (l(), k(p, {
-                    tab: w[e.tabKey.label],
-                    key: w[e.tabKey.value]
+                  (l(!0), r(X, null, Y(t.tabs, (_) => (l(), k(p, {
+                    tab: _[t.tabKey.label],
+                    key: _[V.value]
                   }, null, 8, ["tab"]))), 128))
                   }, null, 8, ["tab"]))), 128))
                 ]),
                 ]),
                 _: 1
                 _: 1
-              }, 8, ["default-active-key"])
+              }, 8, ["active-key"])
             ], 512)) : u("", !0),
             ], 512)) : u("", !0),
-            a("div", Se, [
-              a("div", {
+            c("div", Be, [
+              c("div", {
                 class: "form-layout-main-scroll",
                 class: "form-layout-main-scroll",
                 ref_key: "mainScroll",
                 ref_key: "mainScroll",
-                ref: R,
-                style: h({ height: z.value + "px" })
+                ref: F,
+                style: v({ height: L.value + "px" })
               }, [
               }, [
-                a("div", {
-                  class: ce(["form-layout-main", { whiteBg: !!t.$slots.form }]),
+                c("div", {
+                  class: de(["form-layout-main", { whiteBg: !!e.$slots.form }]),
                   ref_key: "formMain",
                   ref_key: "formMain",
-                  ref: Y,
-                  style: h({
-                    width: $.value
+                  ref: le,
+                  style: v({
+                    width: T.value
                   }),
                   }),
                   id: "form-container"
                   id: "form-container"
                 }, [
                 }, [
-                  t.$slots.form ? (l(), c("div", {
+                  e.$slots.form ? (l(), r("div", {
                     key: 0,
                     key: 0,
                     class: "form-container-wrap",
                     class: "form-container-wrap",
-                    style: h(e.formStyle)
+                    style: v(t.formStyle)
                   }, [
                   }, [
-                    _(t.$slots, "form", {}, void 0, !0)
+                    B(e.$slots, "form", {}, void 0, !0)
                   ], 4)) : u("", !0),
                   ], 4)) : u("", !0),
-                  t.$slots.collapses ? (l(), c("div", _e, [
-                    a("div", Be, [
-                      _(t.$slots, "collapses", {}, void 0, !0)
+                  e.$slots.collapses ? (l(), r("div", $e, [
+                    c("div", Te, [
+                      B(e.$slots, "collapses", {}, void 0, !0)
                     ])
                     ])
                   ])) : u("", !0)
                   ])) : u("", !0)
                 ], 6)
                 ], 6)
               ], 4),
               ], 4),
-              e.showAnchor && t.$slots.collapses ? (l(), c("div", {
+              t.showAnchor && e.$slots.collapses ? (l(), r("div", {
                 key: 0,
                 key: 0,
                 class: "collapses-nav",
                 class: "collapses-nav",
-                style: h(E.value)
+                style: v(z.value)
               }, [
               }, [
                 d(H, { el: "form-layout-main-scroll" })
                 d(H, { el: "form-layout-main-scroll" })
               ], 4)) : u("", !0)
               ], 4)) : u("", !0)
             ]),
             ]),
-            a("div", $e, [
-              _(t.$slots, "other", {}, void 0, !0)
+            c("div", Ce, [
+              B(e.$slots, "other", {}, void 0, !0)
             ]),
             ]),
-            a("div", {
+            c("div", {
               class: "form-fixed-footer",
               class: "form-fixed-footer",
-              style: h({ width: D.value })
+              style: v({ width: M.value })
             }, [
             }, [
-              e.goBack ? (l(), k(f, {
+              t.goBack ? (l(), k(f, {
                 key: 0,
                 key: 0,
-                onClick: M,
+                onClick: j,
                 class: "btn"
                 class: "btn"
               }, {
               }, {
                 default: m(() => [
                 default: m(() => [
-                  d(T),
-                  x(g(t.$l("取消")), 1)
+                  d(A),
+                  R(g(e.$l("取消")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               })) : u("", !0),
               })) : u("", !0),
-              e.steps.length ? (l(), k(f, {
+              t.steps.length ? (l(), k(f, {
                 key: 1,
                 key: 1,
                 class: "btn",
                 class: "btn",
-                disabled: n.value === e.stepDefaultActive,
-                onClick: O
+                disabled: s.value === t.stepDefaultActive,
+                onClick: q
               }, {
               }, {
                 default: m(() => [
                 default: m(() => [
-                  d(A),
-                  x(g(t.$l("上一步")), 1)
+                  d(x),
+                  R(g(e.$l("上一步")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               }, 8, ["disabled"])) : u("", !0),
               }, 8, ["disabled"])) : u("", !0),
-              e.steps.length ? (l(), k(f, {
+              t.steps.length ? (l(), k(f, {
                 key: 2,
                 key: 2,
                 class: "btn",
                 class: "btn",
                 type: "primary",
                 type: "primary",
-                disabled: n.value === e.steps.length - 1,
-                onClick: j
+                disabled: s.value === t.steps.length - 1,
+                onClick: I
               }, {
               }, {
                 default: m(() => [
                 default: m(() => [
-                  d(te),
-                  x(g(t.$l("下一步")), 1)
+                  d(ae),
+                  R(g(e.$l("下一步")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               }, 8, ["disabled"])) : u("", !0),
               }, 8, ["disabled"])) : u("", !0),
-              e.isShowSave ? (l(), k(f, {
+              t.isShowSave ? (l(), k(f, {
                 key: 3,
                 key: 3,
                 style: { "margin-right": "8px" },
                 style: { "margin-right": "8px" },
                 type: "primary",
                 type: "primary",
-                onClick: q
+                onClick: P
               }, {
               }, {
                 default: m(() => [
                 default: m(() => [
-                  d(le),
-                  x(" " + g(t.$l(e.saveBtnText)), 1)
+                  d(se),
+                  R(" " + g(e.$l(t.saveBtnText)), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               })) : u("", !0),
               })) : u("", !0),
-              _(t.$slots, "footer", {}, void 0, !0)
+              B(e.$slots, "footer", {}, void 0, !0)
             ], 4),
             ], 4),
-            a("div", {
+            c("div", {
               class: "calc-width",
               class: "calc-width",
               ref_key: "caclWidth",
               ref_key: "caclWidth",
-              ref: W,
-              style: h({ width: e.width })
+              ref: E,
+              style: v({ width: t.width })
             }, null, 4)
             }, null, 4)
           ]),
           ]),
           _: 3
           _: 3
@@ -312,7 +323,7 @@ const be = { class: "row" }, pe = { class: "title" }, ge = { class: "btns" }, ke
       ], 4);
       ], 4);
     };
     };
   }
   }
-}), Re = /* @__PURE__ */ re(Ce, [["__scopeId", "data-v-5519a258"]]);
+}), Ne = /* @__PURE__ */ fe(He, [["__scopeId", "data-v-f76c8d40"]]);
 export {
 export {
-  Re as default
+  Ne as default
 };
 };

+ 332 - 206
lib/js/SListCardLayout.js

@@ -1,31 +1,56 @@
-import { ref as n, computed as G, watch as ye, onMounted as ve, onActivated as we, nextTick as C, resolveComponent as S, resolveDirective as he, openBlock as o, createElementBlock as s, createElementVNode as u, toDisplayString as O, Fragment as $e, renderList as ke, withDirectives as D, createBlock as k, withCtx as g, createTextVNode as J, resolveDynamicComponent as ge, createCommentVNode as r, vShow as E, renderSlot as d, normalizeStyle as v, createVNode as R, h as _e } from "vue";
-import { useRoute as be } from "vue-router";
-import { n as Ce, B as Se, y as Oe } from "./index2.js";
-const De = { class: "tools" }, Be = { class: "title" }, He = { class: "btns" }, Le = {
+var ce = ($, G, S) => new Promise((f, v) => {
+  var H = (y) => {
+    try {
+      O(S.next(y));
+    } catch (N) {
+      v(N);
+    }
+  }, T = (y) => {
+    try {
+      O(S.throw(y));
+    } catch (N) {
+      v(N);
+    }
+  }, O = (y) => y.done ? f(y.value) : Promise.resolve(y.value).then(H, T);
+  O((S = S.apply($, G)).next());
+});
+import { ref as s, computed as de, watch as De, onMounted as He, onActivated as Le, nextTick as X, resolveComponent as j, resolveDirective as Be, openBlock as n, createElementBlock as a, createElementVNode as d, toDisplayString as _, Fragment as pe, renderList as fe, withDirectives as q, createBlock as D, withCtx as w, createTextVNode as F, resolveDynamicComponent as Me, createCommentVNode as u, vShow as te, renderSlot as p, normalizeStyle as b, createVNode as C, h as Pe } from "vue";
+import { n as Fe, B as Te, y as Ee, ao as Ue, ah as Ve, aO as Ke } from "./index2.js";
+const Ie = { class: "tools" }, Re = { class: "title" }, We = { class: "btns" }, Xe = {
   key: 0,
   key: 0,
   style: { "margin-left": "8px" }
   style: { "margin-left": "8px" }
-}, Ae = {
+}, je = {
   key: 0,
   key: 0,
   class: "filter-content"
   class: "filter-content"
-}, Me = { class: "filter" }, Ne = {
+}, qe = { class: "filter" }, Ge = {
   key: 1,
   key: 1,
   class: "reset-wrap"
   class: "reset-wrap"
-}, ze = {
+}, Je = {
   key: 1,
   key: 1,
   class: "filter-more-content"
   class: "filter-more-content"
-}, Pe = {
+}, Qe = {
   key: 2,
   key: 2,
   class: "desc-wrap"
   class: "desc-wrap"
-}, Te = { class: "table-content" }, Ee = { class: "other" }, Re = /* @__PURE__ */ Object.assign({ name: "SListCardLayout" }, {
+}, Ye = { class: "table-content" }, Ze = {
+  key: 0,
+  class: "s-card-header"
+}, xe = { class: "s-card-body" }, et = { class: "s-card-footer" }, tt = { class: "other" }, ot = /* @__PURE__ */ Object.assign({ name: "SListCardLayout" }, {
   __name: "SListCardLayout",
   __name: "SListCardLayout",
   props: {
   props: {
-    col: {
+    // 每行卡片个数(不传默认每行 5 个)
+    column: {
       type: [Number, String],
       type: [Number, String],
-      default: 4
+      default: 5
     },
     },
-    cardHeight: {
-      type: Number,
-      default: 300
+    // 卡片数据主键字段(用于 v-for key)
+    rowKey: {
+      type: [Function, String],
+      default: "id"
+    },
+    // 每页条数可选项
+    pageSizeOptions: {
+      type: Array,
+      default: () => ["10", "20", "40", "80"]
     },
     },
     // 页面标题
     // 页面标题
     title: {
     title: {
@@ -89,13 +114,9 @@ const De = { class: "tools" }, Be = { class: "title" }, He = { class: "btns" },
       default: 20
       default: 20
     }
     }
   },
   },
-  emits: ["reset", "btnCallback"],
-  setup(B, { expose: Q, emit: Y }) {
-    const V = B, w = Y;
-    be();
-    const H = n(null), Z = n(null), F = n(null), U = n(null), L = n(null), ee = n(null), _ = n(!1), c = n(0), I = n(0);
-    n(!1);
-    const h = n(!1), $ = n(!1), te = n(20), b = n(232), oe = n(!1), f = n([]), m = n([]), ne = {
+  emits: ["reset", "btnCallback", "cardAction"],
+  setup($, { expose: G, emit: S }) {
+    const f = $, v = S, H = s(null), T = s(null), O = s(null), y = s(null), N = s(null), E = s(!1), h = s(0), oe = s(0), L = s(!1), B = s(!1), M = s(20), U = s(232), ve = s(!1), z = s([]), A = s([]), P = s([]), V = s(0), g = s(1), K = s(!1), ye = {
       add: "PlusCircleOutlined",
       add: "PlusCircleOutlined",
       edit: "FormOutlined",
       edit: "FormOutlined",
       delete: "DeleteOutlined",
       delete: "DeleteOutlined",
@@ -111,136 +132,165 @@ const De = { class: "tools" }, Be = { class: "title" }, He = { class: "btns" },
       TopOfType: "VerticalAlignTopOutlined",
       TopOfType: "VerticalAlignTopOutlined",
       TOP: "VerticalAlignTopOutlined",
       TOP: "VerticalAlignTopOutlined",
       synchronize: "SyncOutlined"
       synchronize: "SyncOutlined"
-    }, W = G(() => m.value.map((e) => e.key).includes("import")), A = G(() => m.value.find((e) => e.key === "import") || {});
-    ye(
-      () => V.buttons,
+    }, ne = de(() => A.value.map((e) => e.key).includes("import")), J = de(() => A.value.find((e) => e.key === "import") || {});
+    De(
+      () => f.buttons,
       (e) => {
       (e) => {
-        e && e.length && se(e);
+        e && e.length && he(e);
       },
       },
       { immediate: !0, deep: !0 }
       { immediate: !0, deep: !0 }
     );
     );
-    function le(e, t = "") {
+    function me(e, t = "") {
       return !!(e && typeof e == "function");
       return !!(e && typeof e == "function");
     }
     }
-    function x(e) {
-      return typeof e.icon == "string" ? e.icon : typeof e.icon == "boolean" && e.icon && ne[e.key] || "";
+    function le(e) {
+      return typeof e.icon == "string" ? e.icon : typeof e.icon == "boolean" && e.icon && ye[e.key] || "";
+    }
+    function he(e) {
+      A.value = e.map((t) => (t.key === "remove" && (ve.value = !0), t));
+    }
+    function ge() {
+      X(() => {
+        ee(), M.value = f.pSize, I();
+      });
     }
     }
-    function se(e) {
-      m.value = e.map((t) => (t.key === "remove" && (oe.value = !0), t));
+    function Q() {
+      L.value = !L.value, ee();
     }
     }
-    function ie() {
-      C(() => {
-        T(), te.value = V.pSize;
+    function Y() {
+      v("reset");
+    }
+    function Z(e = !1) {
+      I(e);
+    }
+    function I(e = !1) {
+      return ce(this, null, function* () {
+        var t, l, i, m, c;
+        if (typeof f.loadData == "function") {
+          e && (g.value = 1), K.value = !0;
+          try {
+            const r = (yield f.loadData({ pageNo: g.value, pageSize: Number(M.value) })) || {}, R = r.list || r.data || [];
+            P.value = Array.isArray(R) ? R : [], V.value = (m = (i = (l = r.total) != null ? l : (t = r.pagination) == null ? void 0 : t.total) != null ? i : r.totalCount) != null ? m : 0;
+            const W = r.pageNo || r.pageNum || ((c = r.pagination) == null ? void 0 : c.current);
+            W && (g.value = W);
+          } catch (r) {
+            console.warn("[SListCardLayout] 卡片数据加载失败:", r), P.value = [], V.value = 0;
+          } finally {
+            K.value = !1;
+          }
+        }
       });
       });
     }
     }
-    function M() {
-      h.value = !h.value, T();
+    function we(e, t) {
+      t && Number(t) !== Number(M.value) ? (M.value = Number(t), g.value = 1) : g.value = e, I();
     }
     }
-    function N() {
-      w("reset");
+    function se(e, t, l) {
+      v("cardAction", e, t, l);
     }
     }
-    function z() {
-      L.value && L.value.refresh(!0);
+    function $e(e, t) {
+      if (typeof f.rowKey == "function") return f.rowKey(e, t);
+      const l = e == null ? void 0 : e[f.rowKey];
+      return l == null || l === "" ? t : l;
     }
     }
-    function X(e) {
-      w("btnCallback", e.key, f.value);
-      const t = de[e.key];
-      typeof t == "function" ? t(e) : P(e);
+    function ae(e) {
+      v("btnCallback", e.key, z.value);
+      const t = Ce[e.key];
+      typeof t == "function" ? t(e) : x(e);
     }
     }
-    function P(e) {
-      if (e.selection !== !1 && !f.value.length) {
+    function x(e) {
+      if (e.selection !== !1 && !z.value.length) {
         window.$message.warn(`${window.$l("请选择要")}${window.$l(e.name)}${window.$l("的数据")}`);
         window.$message.warn(`${window.$l("请选择要")}${window.$l(e.name)}${window.$l("的数据")}`);
         return;
         return;
       }
       }
-      if (le(e.api, e.name, e.key)) {
+      if (me(e.api, e.name, e.key)) {
         if (e.confirm) {
         if (e.confirm) {
           window.$confirm({
           window.$confirm({
             title: `${e.name}`,
             title: `${e.name}`,
-            content: () => _e(
+            content: () => Pe(
               "div",
               "div",
               { style: "color:red" },
               { style: "color:red" },
               `${window.$l("确认要")}{${window.$l(e.name)}}${window.$l("数据吗?")}`
               `${window.$l("确认要")}{${window.$l(e.name)}}${window.$l("数据吗?")}`
             ),
             ),
             onOk: () => {
             onOk: () => {
-              $.value = !0, e.api(f.value).then(() => {
-                window.$message.success(`${window.$l(e.name)}${window.$l("成功")}`), w("reset");
+              B.value = !0, e.api(z.value).then(() => {
+                window.$message.success(`${window.$l(e.name)}${window.$l("成功")}`), v("reset");
               }).finally(() => {
               }).finally(() => {
-                $.value = !1;
+                B.value = !1;
               });
               });
             }
             }
           });
           });
           return;
           return;
         }
         }
-        $.value = !0, e.api(f.value).then(() => {
-          window.$message.success(`${window.$l(e.name)}${window.$l("成功")}`), w("reset");
+        B.value = !0, e.api(z.value).then(() => {
+          window.$message.success(`${window.$l(e.name)}${window.$l("成功")}`), v("reset");
         }).finally(() => {
         }).finally(() => {
-          $.value = !1;
+          B.value = !1;
         });
         });
       }
       }
     }
     }
-    function j(e, t) {
-      typeof e == "string" ? q(e, t) : e.forEach((a) => {
-        q(a, t);
+    function ie(e, t) {
+      typeof e == "string" ? re(e, t) : e.forEach((l) => {
+        re(l, t);
       });
       });
     }
     }
-    function q(e, t) {
-      const a = m.value.find((l) => l.key === e);
-      if (!a) {
+    function re(e, t) {
+      const l = A.value.find((i) => i.key === e);
+      if (!l) {
         console.error(`按钮(${e})未定义, 请确认该变更状态按钮是否设置正确`);
         console.error(`按钮(${e})未定义, 请确认该变更状态按钮是否设置正确`);
         return;
         return;
       }
       }
-      Object.keys(t).forEach((l) => {
-        a[l] = t[l];
+      Object.keys(t).forEach((i) => {
+        l[i] = t[i];
       });
       });
     }
     }
-    function ae() {
+    function ke() {
     }
     }
-    function re(e) {
-      P(e);
+    function _e(e) {
+      x(e);
     }
     }
-    function ue() {
-      if (!W.value) {
-        w("btnCallback", "import");
+    function be() {
+      if (!ne.value) {
+        v("btnCallback", "import");
         return;
         return;
       }
       }
-      _.value = !0;
+      E.value = !0;
     }
     }
-    function T() {
-      C(() => {
+    function ee() {
+      X(() => {
         var e, t;
         var e, t;
-        c.value = (((t = (e = H.value) == null ? void 0 : e.parentNode) == null ? void 0 : t.offsetHeight) || 0) - 76, K();
+        h.value = (((t = (e = H.value) == null ? void 0 : e.parentNode) == null ? void 0 : t.offsetHeight) || 0) - 76, ue();
       });
       });
     }
     }
-    function K() {
-      C(() => {
-        var l, y;
-        const t = ((l = F.value) == null ? void 0 : l.offsetHeight) || 0, a = ((y = U.value) == null ? void 0 : y.offsetHeight) || 0;
-        I.value = c.value - t - 0 - a;
+    function ue() {
+      X(() => {
+        var m, c, r;
+        const t = ((m = T.value) == null ? void 0 : m.offsetHeight) || 0, l = ((c = O.value) == null ? void 0 : c.offsetHeight) || 0, i = ((r = N.value) == null ? void 0 : r.offsetHeight) || 0;
+        oe.value = Math.max(0, h.value - t - 0 - l - i);
       });
       });
     }
     }
-    const de = {
-      add: ae,
-      delete: re,
-      import: ue,
-      reload: z,
-      filterReset: N,
-      toggleFilter: M,
-      setStateBtn: j,
-      handAction: P
-    }, ce = {
+    const Ce = {
+      add: ke,
+      delete: _e,
+      import: be,
+      reload: Z,
+      filterReset: Y,
+      toggleFilter: Q,
+      setStateBtn: ie,
+      handAction: x
+    }, Se = {
       mounted(e) {
       mounted(e) {
         e.style.cursor = "e-resize", document.addEventListener("selectstart", (t) => {
         e.style.cursor = "e-resize", document.addEventListener("selectstart", (t) => {
           t.preventDefault();
           t.preventDefault();
         }), e.onmousedown = (t) => {
         }), e.onmousedown = (t) => {
-          const a = t.clientX, l = b.value;
-          document.onmousemove = (y) => {
-            const p = y.clientX - a;
-            if (p < 0) {
-              if (l + p <= 232) return;
-              b.value = l + p;
+          const l = t.clientX, i = U.value;
+          document.onmousemove = (m) => {
+            const c = m.clientX - l;
+            if (c < 0) {
+              if (i + c <= 232) return;
+              U.value = i + c;
             } else {
             } else {
-              if (l + p >= 500) return;
-              b.value = l + p;
+              if (i + c >= 500) return;
+              U.value = i + c;
             }
             }
           }, document.onmouseup = () => {
           }, document.onmouseup = () => {
             document.onmousemove = document.onmousedown = null;
             document.onmousemove = document.onmousedown = null;
@@ -248,193 +298,269 @@ const De = { class: "tools" }, Be = { class: "title" }, He = { class: "btns" },
         };
         };
       }
       }
     };
     };
-    return ve(() => {
-      ie();
-    }), we(() => {
-      C(() => {
+    return He(() => {
+      ge();
+    }), Le(() => {
+      X(() => {
         var e, t;
         var e, t;
-        c.value = (((t = (e = H.value) == null ? void 0 : e.parentNode) == null ? void 0 : t.offsetHeight) || 0) - 76, K();
+        h.value = (((t = (e = H.value) == null ? void 0 : e.parentNode) == null ? void 0 : t.offsetHeight) || 0) - 76, ue();
       });
       });
-    }), Q({
-      reload: z,
-      spinning: $,
-      selectedRowKeys: f,
-      renderButtons: m,
-      setStateBtn: j,
-      btnCallback: X,
-      filterReset: N,
-      toggleFilter: M,
-      table: L,
-      importVisible: _,
-      measureLayout: T
+    }), G({
+      reload: Z,
+      spinning: B,
+      selectedRowKeys: z,
+      renderButtons: A,
+      setStateBtn: ie,
+      btnCallback: ae,
+      filterReset: Y,
+      toggleFilter: Q,
+      table: y,
+      importVisible: E,
+      measureLayout: ee,
+      // 卡片列表
+      list: P,
+      total: V,
+      pageNo: g,
+      fetchList: I
     }), (e, t) => {
     }), (e, t) => {
-      const a = Se, l = S("down-outlined"), y = S("up-outlined"), p = S("sync-outlined"), pe = Oe, fe = S("s-import-modal"), me = he("action");
-      return o(), s("div", {
+      const l = Te, i = j("down-outlined"), m = j("up-outlined"), c = j("sync-outlined"), r = Ee, R = Ve, W = Ue, Oe = Ke, Ne = j("s-import-modal"), ze = Be("action");
+      return n(), a("div", {
         class: "list-layout",
         class: "list-layout",
         ref_key: "layout",
         ref_key: "layout",
         ref: H
         ref: H
       }, [
       }, [
-        u("div", De, [
-          u("div", Be, O(B.title), 1),
-          u("div", He, [
-            (o(!0), s($e, null, ke(m.value, (i) => (o(), s("span", {
+        d("div", Ie, [
+          d("div", Re, _($.title), 1),
+          d("div", We, [
+            (n(!0), a(pe, null, fe(A.value, (o) => (n(), a("span", {
               class: "item-btn",
               class: "item-btn",
-              key: i.key
+              key: o.key
             }, [
             }, [
-              D((o(), k(a, {
+              q((n(), D(l, {
                 class: "btn",
                 class: "btn",
-                disabled: !!i.disabled,
-                type: i.type || i.key === "add" ? "primary" : "default",
-                onClick: (Ve) => X(i)
+                disabled: !!o.disabled,
+                type: o.type || o.key === "add" ? "primary" : "default",
+                onClick: (k) => ae(o)
               }, {
               }, {
-                icon: g(() => [
-                  x(i) ? (o(), k(ge(x(i)), { key: 0 })) : r("", !0)
+                icon: w(() => [
+                  le(o) ? (n(), D(Me(le(o)), { key: 0 })) : u("", !0)
                 ]),
                 ]),
-                default: g(() => [
-                  J(" " + O(e.$l(i.name)), 1)
+                default: w(() => [
+                  F(" " + _(e.$l(o.name)), 1)
                 ]),
                 ]),
                 _: 2
                 _: 2
               }, 1032, ["disabled", "type", "onClick"])), [
               }, 1032, ["disabled", "type", "onClick"])), [
-                [me, i.action || i.key],
-                [E, i.show !== !1]
+                [ze, o.action || o.key],
+                [te, o.show !== !1]
               ])
               ])
             ]))), 128)),
             ]))), 128)),
-            e.$slots.otherBtns ? (o(), s("span", Le, [
-              d(e.$slots, "otherBtns", { selections: f.value }, void 0, !0)
-            ])) : r("", !0)
+            e.$slots.otherBtns ? (n(), a("span", Xe, [
+              p(e.$slots, "otherBtns", { selections: z.value }, void 0, !0)
+            ])) : u("", !0)
           ])
           ])
         ]),
         ]),
-        u("div", {
+        d("div", {
           class: "list-layout-main",
           class: "list-layout-main",
-          style: v({ height: c.value + "px" })
+          style: b({ height: h.value + "px" })
         }, [
         }, [
-          e.$slots.tree ? (o(), s("div", {
+          e.$slots.tree ? (n(), a("div", {
             key: 0,
             key: 0,
             class: "side s-side-tree",
             class: "side s-side-tree",
-            ref_key: "side",
-            ref: Z,
-            style: v([{ height: c.value + "px", width: b.value + "px" }, { "overflow-y": "auto" }])
+            ref: "side",
+            style: b([{ height: h.value + "px", width: U.value + "px" }, { "overflow-y": "auto" }])
           }, [
           }, [
-            d(e.$slots, "tree", {}, void 0, !0)
-          ], 4)) : r("", !0),
-          e.$slots.tree ? D((o(), s("div", {
+            p(e.$slots, "tree", {}, void 0, !0)
+          ], 4)) : u("", !0),
+          e.$slots.tree ? q((n(), a("div", {
             key: 1,
             key: 1,
             class: "side-bar s-theme-bg",
             class: "side-bar s-theme-bg",
-            style: v({ height: c.value + "px" })
+            style: b({ height: h.value + "px" })
           }, null, 4)), [
           }, null, 4)), [
-            [ce]
-          ]) : r("", !0),
-          e.$slots.empty ? (o(), s("div", {
+            [Se]
+          ]) : u("", !0),
+          e.$slots.empty ? (n(), a("div", {
             key: 3,
             key: 3,
             class: "layout-list-content",
             class: "layout-list-content",
-            style: v({ height: c.value + "px" })
+            style: b({ height: h.value + "px" })
           }, [
           }, [
-            d(e.$slots, "empty", {}, void 0, !0)
-          ], 4)) : (o(), s("div", {
+            p(e.$slots, "empty", {}, void 0, !0)
+          ], 4)) : (n(), a("div", {
             key: 2,
             key: 2,
             class: "layout-list-content",
             class: "layout-list-content",
-            style: v({ height: c.value - 1 + "px" })
+            style: b({ height: h.value - 1 + "px" })
           }, [
           }, [
-            D(u("div", {
+            q(d("div", {
               class: "list-filter-wrap",
               class: "list-filter-wrap",
               ref_key: "filters",
               ref_key: "filters",
-              ref: F
+              ref: T
             }, [
             }, [
-              e.$slots.filter ? (o(), s("div", Ae, [
-                u("div", Me, [
-                  d(e.$slots, "filter", {}, void 0, !0)
+              e.$slots.filter ? (n(), a("div", je, [
+                d("div", qe, [
+                  p(e.$slots, "filter", {}, void 0, !0)
                 ]),
                 ]),
-                e.$slots.filterMore ? (o(), s("a", {
+                e.$slots.filterMore ? (n(), a("a", {
                   key: 0,
                   key: 0,
                   class: "filter-more-btn",
                   class: "filter-more-btn",
-                  onClick: M
+                  onClick: Q
                 }, [
                 }, [
-                  J(O(h.value ? e.$l("收起") : e.$l("更多")) + " ", 1),
-                  h.value ? (o(), k(y, {
+                  F(_(L.value ? e.$l("收起") : e.$l("更多")) + " ", 1),
+                  L.value ? (n(), D(m, {
                     key: 1,
                     key: 1,
                     style: { "font-size": "12px" }
                     style: { "font-size": "12px" }
-                  })) : (o(), k(l, {
+                  })) : (n(), D(i, {
                     key: 0,
                     key: 0,
                     style: { "font-size": "12px" }
                     style: { "font-size": "12px" }
                   }))
                   }))
-                ])) : r("", !0),
-                e.$slots.filter ? (o(), s("div", Ne, [
-                  R(pe, {
+                ])) : u("", !0),
+                e.$slots.filter ? (n(), a("div", Ge, [
+                  C(r, {
                     placement: "top",
                     placement: "top",
                     overlayStyle: { maxWidth: "500px" },
                     overlayStyle: { maxWidth: "500px" },
                     mouseEnterDelay: 1.5,
                     mouseEnterDelay: 1.5,
                     mouseLeaveDelay: 0.5
                     mouseLeaveDelay: 0.5
                   }, {
                   }, {
-                    title: g(() => [
-                      u("span", null, O(e.$l("条件重置")), 1)
+                    title: w(() => [
+                      d("span", null, _(e.$l("条件重置")), 1)
                     ]),
                     ]),
-                    default: g(() => [
-                      R(a, {
+                    default: w(() => [
+                      C(l, {
                         style: { "padding-bottom": "2px" },
                         style: { "padding-bottom": "2px" },
-                        onClick: N
+                        onClick: Y
                       }, {
                       }, {
-                        icon: g(() => [
-                          R(p)
+                        icon: w(() => [
+                          C(c)
                         ]),
                         ]),
                         _: 1
                         _: 1
                       })
                       })
                     ]),
                     ]),
                     _: 1
                     _: 1
                   })
                   })
-                ])) : r("", !0)
-              ])) : r("", !0),
-              e.$slots.filterMore ? D((o(), s("div", ze, [
-                d(e.$slots, "filterMore", {}, void 0, !0)
+                ])) : u("", !0)
+              ])) : u("", !0),
+              e.$slots.filterMore ? q((n(), a("div", Je, [
+                p(e.$slots, "filterMore", {}, void 0, !0)
               ], 512)), [
               ], 512)), [
-                [E, h.value]
-              ]) : r("", !0),
-              e.$slots.desc ? (o(), s("div", Pe, [
-                d(e.$slots, "desc", {}, void 0, !0)
-              ])) : r("", !0)
+                [te, L.value]
+              ]) : u("", !0),
+              e.$slots.desc ? (n(), a("div", Qe, [
+                p(e.$slots, "desc", {}, void 0, !0)
+              ])) : u("", !0)
             ], 512), [
             ], 512), [
-              [E, e.$slots.filter]
+              [te, e.$slots.filter]
             ]),
             ]),
-            u("div", Te, [
-              e.$slots.tabs ? (o(), s("div", {
+            d("div", Ye, [
+              e.$slots.tabs ? (n(), a("div", {
                 key: 0,
                 key: 0,
                 class: "tabs-wrap",
                 class: "tabs-wrap",
                 ref_key: "tabs",
                 ref_key: "tabs",
-                ref: U
+                ref: O
               }, [
               }, [
-                d(e.$slots, "tabs", {}, void 0, !0)
-              ], 512)) : r("", !0),
-              u("div", {
+                p(e.$slots, "tabs", {}, void 0, !0)
+              ], 512)) : u("", !0),
+              d("div", {
                 class: "table-container",
                 class: "table-container",
-                style: v({
-                  display: "grid",
-                  gridTemplateColumns: `repeat(${B.col}, 1fr)`,
-                  gap: "12px",
-                  height: I.value - 1 + "px"
-                })
+                style: b({ height: oe.value - 1 + "px" })
+              }, [
+                C(W, { spinning: K.value }, {
+                  default: w(() => [
+                    d("div", {
+                      class: "s-card-grid",
+                      style: b({ gridTemplateColumns: `repeat(${$.column}, 1fr)` })
+                    }, [
+                      (n(!0), a(pe, null, fe(P.value, (o, k) => (n(), a("div", {
+                        class: "s-card-item",
+                        key: $e(o, k)
+                      }, [
+                        e.$slots.cardHeader || o.title ? (n(), a("div", Ze, [
+                          p(e.$slots, "cardHeader", {
+                            item: o,
+                            index: k
+                          }, () => [
+                            F(_(o.title), 1)
+                          ], !0)
+                        ])) : u("", !0),
+                        d("div", xe, [
+                          p(e.$slots, "default", {
+                            item: o,
+                            index: k
+                          }, void 0, !0)
+                        ]),
+                        d("div", et, [
+                          p(e.$slots, "cardFooter", {
+                            item: o,
+                            index: k
+                          }, () => [
+                            C(l, {
+                              type: "link",
+                              size: "small",
+                              onClick: (Ae) => se("edit", o, k)
+                            }, {
+                              default: w(() => [
+                                F(_(e.$l("编辑")), 1)
+                              ]),
+                              _: 1
+                            }, 8, ["onClick"]),
+                            C(l, {
+                              type: "link",
+                              size: "small",
+                              danger: "",
+                              onClick: (Ae) => se("delete", o, k)
+                            }, {
+                              default: w(() => [
+                                F(_(e.$l("删除")), 1)
+                              ]),
+                              _: 1
+                            }, 8, ["onClick"])
+                          ], !0)
+                        ])
+                      ]))), 128)),
+                      !K.value && !P.value.length ? (n(), D(R, {
+                        key: 0,
+                        class: "s-card-empty",
+                        description: e.$l("暂无数据")
+                      }, null, 8, ["description"])) : u("", !0)
+                    ], 4)
+                  ]),
+                  _: 3
+                }, 8, ["spinning"])
+              ], 4),
+              $.showPagination ? (n(), a("div", {
+                key: 1,
+                class: "s-card-pagination",
+                ref_key: "pager",
+                ref: N
               }, [
               }, [
-                d(e.$slots, "default", {}, void 0, !0)
-              ], 4)
+                C(Oe, {
+                  current: g.value,
+                  "onUpdate:current": t[0] || (t[0] = (o) => g.value = o),
+                  "page-size": Number(M.value),
+                  total: V.value,
+                  "show-size-changer": "",
+                  "page-size-options": $.pageSizeOptions,
+                  "show-total": (o) => `${e.$l("共")}${o}${e.$l("条")}`,
+                  onChange: we
+                }, null, 8, ["current", "page-size", "total", "page-size-options", "show-total"])
+              ], 512)) : u("", !0)
             ])
             ])
           ], 4))
           ], 4))
         ], 4),
         ], 4),
-        u("div", Ee, [
-          d(e.$slots, "other", {}, void 0, !0)
+        d("div", tt, [
+          p(e.$slots, "other", {}, void 0, !0)
         ]),
         ]),
-        W.value ? (o(), k(fe, {
+        ne.value ? (n(), D(Ne, {
           key: 0,
           key: 0,
-          ref_key: "importModalRef",
-          ref: ee,
-          "upload-url": A.value.importUploadUrl,
-          value: _.value,
-          "onUpdate:value": t[0] || (t[0] = (i) => _.value = i),
-          columns: A.value.importColumns,
-          apis: A.value.importApis,
-          onReload: z
-        }, null, 8, ["upload-url", "value", "columns", "apis"])) : r("", !0)
+          ref: "importModalRef",
+          "upload-url": J.value.importUploadUrl,
+          value: E.value,
+          "onUpdate:value": t[1] || (t[1] = (o) => E.value = o),
+          columns: J.value.importColumns,
+          apis: J.value.importApis,
+          onReload: Z
+        }, null, 8, ["upload-url", "value", "columns", "apis"])) : u("", !0)
       ], 512);
       ], 512);
     };
     };
   }
   }
-}), We = /* @__PURE__ */ Ce(Re, [["__scopeId", "data-v-078574c4"]]);
+}), at = /* @__PURE__ */ Fe(ot, [["__scopeId", "data-v-65914cae"]]);
 export {
 export {
-  We as default
+  at as default
 };
 };

+ 32 - 32
lib/js/SListLayout.js

@@ -1,6 +1,6 @@
-import { ref as a, computed as te, watch as oe, onMounted as Oe, onActivated as xe, nextTick as D, resolveComponent as I, resolveDirective as De, openBlock as n, createElementBlock as l, createElementVNode as d, toDisplayString as g, Fragment as ne, renderList as Ie, withDirectives as K, createBlock as b, withCtx as k, createTextVNode as le, resolveDynamicComponent as Be, createCommentVNode as i, vShow as ae, renderSlot as u, normalizeStyle as C, createVNode as B, unref as Ae, h as Re } from "vue";
-import { n as Te, B as ze, y as He, aO as Le } from "./index2.js";
-const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" }, Ee = {
+import { ref as a, computed as te, watch as oe, onMounted as Oe, onActivated as xe, nextTick as D, resolveComponent as I, resolveDirective as De, openBlock as n, createElementBlock as l, createElementVNode as d, toDisplayString as g, Fragment as ne, renderList as Ie, withDirectives as K, createBlock as b, withCtx as k, createTextVNode as le, resolveDynamicComponent as Be, createCommentVNode as i, vShow as ae, renderSlot as u, normalizeStyle as C, createVNode as B, unref as Ae, h as Pe } from "vue";
+import { n as Re, B as Te, y as ze, aP as He } from "./index2.js";
+const Le = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" }, Ee = {
   key: 0,
   key: 0,
   style: { "margin-left": "8px" }
   style: { "margin-left": "8px" }
 }, Fe = {
 }, Fe = {
@@ -95,7 +95,7 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
   },
   },
   emits: ["reset", "btnCallback", "tableColCallback"],
   emits: ["reset", "btnCallback", "tableColCallback"],
   setup(y, { expose: se, emit: ie }) {
   setup(y, { expose: se, emit: ie }) {
-    const S = y, v = ie, A = a(null), E = a(null), F = a(null), _ = a(null), O = a(!1), $ = a(!1), c = a(0), N = a(0), m = a(!1), U = a(20), x = a(232), V = a(!1), f = a([]), q = a([]), R = a([]), w = a([]), re = {
+    const S = y, v = ie, A = a(null), E = a(null), F = a(null), _ = a(null), O = a(!1), $ = a(!1), c = a(0), N = a(0), m = a(!1), U = a(20), x = a(232), V = a(!1), f = a([]), q = a([]), P = a([]), w = a([]), re = {
       add: "PlusCircleOutlined",
       add: "PlusCircleOutlined",
       edit: "FormOutlined",
       edit: "FormOutlined",
       delete: "DeleteOutlined",
       delete: "DeleteOutlined",
@@ -111,7 +111,7 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
       TopOfType: "VerticalAlignTopOutlined",
       TopOfType: "VerticalAlignTopOutlined",
       TOP: "VerticalAlignTopOutlined",
       TOP: "VerticalAlignTopOutlined",
       synchronize: "SyncOutlined"
       synchronize: "SyncOutlined"
-    }, W = te(() => w.value.map((e) => e.key).includes("import")), T = te(() => w.value.find((e) => e.key === "import") || {});
+    }, W = te(() => w.value.map((e) => e.key).includes("import")), R = te(() => w.value.find((e) => e.key === "import") || {});
     oe(
     oe(
       () => S.buttons,
       () => S.buttons,
       (e) => {
       (e) => {
@@ -133,7 +133,7 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
     }
     }
     function de() {
     function de() {
       D(() => {
       D(() => {
-        Z(), U.value = S.pSize, R.value = S.columns.map((e) => ((e.template || e.isClick || e.dataIndex === "action" && !e.customRender) && !e.scopedSlots && (e.scopedSlots = { customRender: e.dataIndex }), e));
+        Z(), U.value = S.pSize, P.value = S.columns.map((e) => ((e.template || e.isClick || e.dataIndex === "action" && !e.customRender) && !e.scopedSlots && (e.scopedSlots = { customRender: e.dataIndex }), e));
       }), setTimeout(() => {
       }), setTimeout(() => {
         const e = document.querySelector(".ant-table-cell.ant-table-cell-scrollbar"), t = document.querySelector(".ant-table-thead tr");
         const e = document.querySelector(".ant-table-cell.ant-table-cell-scrollbar"), t = document.querySelector(".ant-table-thead tr");
         e && t && t.removeChild(e);
         e && t && t.removeChild(e);
@@ -142,21 +142,21 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
     function G() {
     function G() {
       de();
       de();
     }
     }
-    function z() {
+    function T() {
       $.value = !$.value, Z();
       $.value = !$.value, Z();
     }
     }
-    function H() {
+    function z() {
       v("reset");
       v("reset");
     }
     }
-    function L() {
+    function H() {
       _.value && _.value.refresh(!0);
       _.value && _.value.refresh(!0);
     }
     }
     function J(e) {
     function J(e) {
       v("btnCallback", e.key, f.value);
       v("btnCallback", e.key, f.value);
       const t = $e[e.key];
       const t = $e[e.key];
-      typeof t == "function" ? t(e) : P(e);
+      typeof t == "function" ? t(e) : L(e);
     }
     }
-    function P(e) {
+    function L(e) {
       if (e.selection !== !1 && !f.value.length) {
       if (e.selection !== !1 && !f.value.length) {
         window.$message.warn(`${window.$l("请选择要")}${window.$l(e.name)}${window.$l("的数据")}`);
         window.$message.warn(`${window.$l("请选择要")}${window.$l(e.name)}${window.$l("的数据")}`);
         return;
         return;
@@ -165,7 +165,7 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
         if (e.confirm) {
         if (e.confirm) {
           window.$confirm({
           window.$confirm({
             title: `${e.name}`,
             title: `${e.name}`,
-            content: () => Re(
+            content: () => Pe(
               "div",
               "div",
               { style: "color:red" },
               { style: "color:red" },
               `${window.$l("确认要")}{${window.$l(e.name)}}${window.$l("数据吗?")}`
               `${window.$l("确认要")}{${window.$l(e.name)}}${window.$l("数据吗?")}`
@@ -205,7 +205,7 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
     function ce() {
     function ce() {
     }
     }
     function fe(e) {
     function fe(e) {
-      P(e);
+      L(e);
     }
     }
     function me() {
     function me() {
       if (!W.value) {
       if (!W.value) {
@@ -223,7 +223,7 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
       v("tableColCallback", e, t);
       v("tableColCallback", e, t);
     }
     }
     function M(e) {
     function M(e) {
-      return R.value.find((t) => t.dataIndex === e);
+      return P.value.find((t) => t.dataIndex === e);
     }
     }
     function ve(e) {
     function ve(e) {
       const t = M(e);
       const t = M(e);
@@ -257,11 +257,11 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
       delete: fe,
       delete: fe,
       import: me,
       import: me,
       export: pe,
       export: pe,
-      reload: L,
-      filterReset: H,
-      toggleFilter: z,
+      reload: H,
+      filterReset: z,
+      toggleFilter: T,
       setStateBtn: Q,
       setStateBtn: Q,
-      handAction: P
+      handAction: L
     }, ge = {
     }, ge = {
       mounted(e) {
       mounted(e) {
         e.style.cursor = "e-resize", document.addEventListener("selectstart", (t) => {
         e.style.cursor = "e-resize", document.addEventListener("selectstart", (t) => {
@@ -291,24 +291,24 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
         c.value = ((t = (e = A.value) == null ? void 0 : e.parentNode) == null ? void 0 : t.offsetHeight) - 76, ee();
         c.value = ((t = (e = A.value) == null ? void 0 : e.parentNode) == null ? void 0 : t.offsetHeight) - 76, ee();
       });
       });
     }), se({
     }), se({
-      reload: L,
+      reload: H,
       spinning: m,
       spinning: m,
       selectedRowKeys: f,
       selectedRowKeys: f,
       renderButtons: w,
       renderButtons: w,
       setStateBtn: Q,
       setStateBtn: Q,
       btnCallback: J,
       btnCallback: J,
-      filterReset: H,
-      toggleFilter: z,
+      filterReset: z,
+      toggleFilter: T,
       table: _,
       table: _,
       importVisible: O
       importVisible: O
     }), (e, t) => {
     }), (e, t) => {
-      const r = ze, s = I("down-outlined"), h = I("up-outlined"), p = I("sync-outlined"), be = He, Ce = I("s-import-modal"), Se = De("action");
+      const r = Te, s = I("down-outlined"), h = I("up-outlined"), p = I("sync-outlined"), be = ze, Ce = I("s-import-modal"), Se = De("action");
       return n(), l("div", {
       return n(), l("div", {
         class: "list-layout",
         class: "list-layout",
         ref_key: "layoutRef",
         ref_key: "layoutRef",
         ref: A
         ref: A
       }, [
       }, [
-        d("div", Pe, [
+        d("div", Le, [
           d("div", Me, g(y.title), 1),
           d("div", Me, g(y.title), 1),
           d("div", Ke, [
           d("div", Ke, [
             (n(!0), l(ne, null, Ie(w.value, (o) => (n(), l("span", {
             (n(!0), l(ne, null, Ie(w.value, (o) => (n(), l("span", {
@@ -384,7 +384,7 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
                 e.$slots.filterMore ? (n(), l("a", {
                 e.$slots.filterMore ? (n(), l("a", {
                   key: 0,
                   key: 0,
                   class: "filter-more-btn",
                   class: "filter-more-btn",
-                  onClick: z
+                  onClick: T
                 }, [
                 }, [
                   le(g($.value ? e.$l("收起") : e.$l("更多")) + " ", 1),
                   le(g($.value ? e.$l("收起") : e.$l("更多")) + " ", 1),
                   $.value ? (n(), b(h, {
                   $.value ? (n(), b(h, {
@@ -408,7 +408,7 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
                     default: k(() => [
                     default: k(() => [
                       B(r, {
                       B(r, {
                         style: { "padding-bottom": "2px" },
                         style: { "padding-bottom": "2px" },
-                        onClick: H
+                        onClick: z
                       }, {
                       }, {
                         icon: k(() => [
                         icon: k(() => [
                           B(p)
                           B(p)
@@ -436,14 +436,14 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
                 u(e.$slots, "tabs", {}, void 0, !0)
                 u(e.$slots, "tabs", {}, void 0, !0)
               ], 512)) : i("", !0),
               ], 512)) : i("", !0),
               d("div", je, [
               d("div", je, [
-                B(Ae(Le), {
+                B(Ae(He), {
                   ref_key: "table",
                   ref_key: "table",
                   ref: _,
                   ref: _,
                   size: "middle",
                   size: "middle",
                   scroll: { y: N.value, x: "100%" },
                   scroll: { y: N.value, x: "100%" },
                   pageSize: U.value,
                   pageSize: U.value,
                   rowKey: y.rowKey,
                   rowKey: y.rowKey,
-                  columns: R.value,
+                  columns: P.value,
                   data: y.loadData,
                   data: y.loadData,
                   "expanded-row-keys": q.value,
                   "expanded-row-keys": q.value,
                   "onUpdate:expandedRowKeys": t[0] || (t[0] = (o) => q.value = o),
                   "onUpdate:expandedRowKeys": t[0] || (t[0] = (o) => q.value = o),
@@ -477,17 +477,17 @@ const Pe = { class: "tools" }, Me = { class: "title" }, Ke = { class: "btns" },
         W.value ? (n(), b(Ce, {
         W.value ? (n(), b(Ce, {
           key: 0,
           key: 0,
           ref: "importModalRef",
           ref: "importModalRef",
-          "upload-url": T.value.importUploadUrl,
+          "upload-url": R.value.importUploadUrl,
           value: O.value,
           value: O.value,
           "onUpdate:value": t[1] || (t[1] = (o) => O.value = o),
           "onUpdate:value": t[1] || (t[1] = (o) => O.value = o),
-          columns: T.value.importColumns,
-          apis: T.value.importApis,
-          onReload: L
+          columns: R.value.importColumns,
+          apis: R.value.importApis,
+          onReload: H
         }, null, 8, ["upload-url", "value", "columns", "apis"])) : i("", !0)
         }, null, 8, ["upload-url", "value", "columns", "apis"])) : i("", !0)
       ], 512);
       ], 512);
     };
     };
   }
   }
-}), Ze = /* @__PURE__ */ Te(Je, [["__scopeId", "data-v-c420bdb9"]]);
+}), Ze = /* @__PURE__ */ Re(Je, [["__scopeId", "data-v-9418abe0"]]);
 export {
 export {
   Ze as default
   Ze as default
 };
 };

+ 1 - 1
lib/js/SListTableTreeLayout.js

@@ -507,7 +507,7 @@ const Fe = { class: "tools" }, Ue = { class: "title" }, Ve = { class: "btns" },
       ], 512);
       ], 512);
     };
     };
   }
   }
-}), at = /* @__PURE__ */ Ke(et, [["__scopeId", "data-v-99511031"]]);
+}), at = /* @__PURE__ */ Ke(et, [["__scopeId", "data-v-ec3fd17c"]]);
 export {
 export {
   at as default
   at as default
 };
 };

+ 3 - 3
lib/js/SModal.js

@@ -12,7 +12,7 @@ var De = (e, t, o) => t in e ? bt(e, t, { enumerable: !0, configurable: !0, writ
 }, Fe = (e, t) => ht(e, xt(t));
 }, Fe = (e, t) => ht(e, xt(t));
 import { defineComponent as J, ref as B, computed as Q, createVNode as a, Transition as Qe, withDirectives as Ze, vShow as qe, nextTick as Je, shallowRef as D, watch as j, onBeforeUnmount as et, watchEffect as tt, Fragment as Me, render as Le, unref as Ie, isRef as ot, toRefs as wt, customRef as Tt, getCurrentScope as Bt, onScopeDispose as Pt, useAttrs as Ft, resolveComponent as we, openBlock as E, createBlock as ne, mergeProps as Ot, withCtx as k, createElementVNode as pe, createElementBlock as le, renderList as ke, createCommentVNode as q, renderSlot as _e, normalizeStyle as Mt, resolveDynamicComponent as At, createTextVNode as ue, toDisplayString as ae } from "vue";
 import { defineComponent as J, ref as B, computed as Q, createVNode as a, Transition as Qe, withDirectives as Ze, vShow as qe, nextTick as Je, shallowRef as D, watch as j, onBeforeUnmount as et, watchEffect as tt, Fragment as Me, render as Le, unref as Ie, isRef as ot, toRefs as wt, customRef as Tt, getCurrentScope as Bt, onScopeDispose as Pt, useAttrs as Ft, resolveComponent as we, openBlock as E, createBlock as ne, mergeProps as Ot, withCtx as k, createElementVNode as pe, createElementBlock as le, renderList as ke, createCommentVNode as q, renderSlot as _e, normalizeStyle as Mt, resolveDynamicComponent as At, createTextVNode as ue, toDisplayString as ae } from "vue";
 import Ht from "./ModalHeader.js";
 import Ht from "./ModalHeader.js";
-import { cQ as It, aI as nt, P as N, _ as P, az as lt, d as f, au as Nt, c as ye, o as at, i as Be, cR as zt, K as We, cS as Rt, bZ as Et, g as Dt, m as Lt, bM as kt, r as _t, cO as Wt, aH as Vt, aL as Ne, u as jt, bA as it, a3 as Te, c1 as Gt, B as Ae, cT as Xt, e as ge, cU as Kt, a as Yt, bs as Ut, br as Qt, bt as Zt, cV as qt, cW as Jt, cX as eo, cP as to, cY as oo, cZ as no, aM as lo, n as ao, ao as io } from "./index2.js";
+import { cR as It, aI as nt, P as N, _ as P, az as lt, d as f, au as Nt, c as ye, o as at, i as Be, cS as zt, K as We, cT as Rt, b_ as Et, g as Dt, m as Lt, bN as kt, r as _t, cP as Wt, aH as Vt, aL as Ne, u as jt, bB as it, a3 as Te, c2 as Gt, B as Ae, cU as Xt, e as ge, cV as Kt, a as Yt, bt as Ut, bs as Qt, bu as Zt, cW as qt, cX as Jt, cY as eo, cQ as to, cZ as oo, c_ as no, aM as lo, n as ao, ao as io } from "./index2.js";
 import { A as Ve } from "./ActionButton.js";
 import { A as Ve } from "./ActionButton.js";
 import { T as ro, _ as so } from "./index11.js";
 import { T as ro, _ as so } from "./index11.js";
 import { _ as co, S as uo } from "./index10.js";
 import { _ as co, S as uo } from "./index10.js";
@@ -1698,7 +1698,7 @@ const Vo = { class: "modalHeader" }, jo = {
     ), et(() => {
     ), et(() => {
       R && (R.disconnect(), R = null), L && (cancelAnimationFrame(L), L = null);
       R && (R.disconnect(), R = null), L && (cancelAnimationFrame(L), L = null);
     }), (b, V) => {
     }), (b, V) => {
-      const K = so, Z = ro, xe = uo, Se = co, $e = io, te = we("close-outlined"), ce = Ae, Re = we("save-outlined"), gt = we("arrow-left-outlined"), yt = we("arrow-right-outlined"), Ct = _;
+      const K = so, Z = ro, xe = uo, Se = co, $e = io, te = we("poweroff-outlined"), ce = Ae, Re = we("save-outlined"), gt = we("arrow-left-outlined"), yt = we("arrow-right-outlined"), Ct = _;
       return E(), ne(Ct, Ot({
       return E(), ne(Ct, Ot({
         open: O.value,
         open: O.value,
         "body-style": G.value,
         "body-style": G.value,
@@ -1864,7 +1864,7 @@ const Vo = { class: "modalHeader" }, jo = {
       }, 16, ["open", "body-style", "width", "centered", "destroyOnClose", "keyboard", "style", "maskClosable", "mask", "wrap-class-name"]);
       }, 16, ["open", "body-style", "width", "centered", "destroyOnClose", "keyboard", "style", "maskClosable", "mask", "wrap-class-name"]);
     };
     };
   }
   }
-}), tn = /* @__PURE__ */ ao(Ko, [["__scopeId", "data-v-5b9cbe76"]]);
+}), tn = /* @__PURE__ */ ao(Ko, [["__scopeId", "data-v-a4e2333d"]]);
 export {
 export {
   tn as default
   tn as default
 };
 };

+ 32 - 32
lib/js/SNewestDataListLayout.js

@@ -1,6 +1,6 @@
-import { ref as s, computed as ne, watch as le, nextTick as C, onMounted as Ae, onActivated as Ie, resolveComponent as I, resolveDirective as Pe, openBlock as n, createElementBlock as l, createVNode as O, withCtx as y, createElementVNode as p, toDisplayString as $, Fragment as ae, renderList as xe, withDirectives as K, createBlock as g, createTextVNode as N, resolveDynamicComponent as Ee, createCommentVNode as a, vShow as se, renderSlot as u, normalizeStyle as b, unref as Re, h as ze } from "vue";
+import { ref as s, computed as ne, watch as le, nextTick as C, onMounted as Te, onActivated as Ae, resolveComponent as A, resolveDirective as Ie, openBlock as n, createElementBlock as l, createVNode as _, withCtx as y, createElementVNode as p, toDisplayString as $, Fragment as ae, renderList as xe, withDirectives as K, createBlock as g, createTextVNode as N, resolveDynamicComponent as Ee, createCommentVNode as a, vShow as se, renderSlot as u, normalizeStyle as b, unref as Re, h as ze } from "vue";
 import { useRoute as He } from "vue-router";
 import { useRoute as He } from "vue-router";
-import { n as Me, ao as Le, B as Fe, y as Ke, aO as Ne } from "./index2.js";
+import { n as Me, ao as Le, B as Fe, y as Ke, aP as Ne } from "./index2.js";
 const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" }, We = {
 const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" }, We = {
   key: 0,
   key: 0,
   style: { "margin-left": "8px" }
   style: { "margin-left": "8px" }
@@ -127,9 +127,9 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
   },
   },
   emits: ["reset", "btnCallback", "tableColCallback", "advancedSearch"],
   emits: ["reset", "btnCallback", "tableColCallback", "advancedSearch"],
   setup(r, { expose: ie, emit: ue }) {
   setup(r, { expose: ie, emit: ue }) {
-    const _ = r, v = ue;
+    const B = r, v = ue;
     He();
     He();
-    const P = s(null), re = s(null), U = s(null), V = s(null), B = s(null), de = s(null), D = s(!1), c = s(0), q = s(0), S = s(!1), f = s(!1), W = s(20), T = s(256), j = s(!1), m = s([]), x = s([]), A = s([]), w = s([]), ce = {
+    const I = s(null), re = s(null), U = s(null), V = s(null), O = s(null), de = s(null), D = s(!1), c = s(0), q = s(0), S = s(!1), f = s(!1), W = s(20), P = s(256), j = s(!1), m = s([]), x = s([]), T = s([]), w = s([]), ce = {
       add: "PlusCircleOutlined",
       add: "PlusCircleOutlined",
       edit: "FormOutlined",
       edit: "FormOutlined",
       delete: "DeleteOutlined",
       delete: "DeleteOutlined",
@@ -147,13 +147,13 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
       synchronize: "SyncOutlined"
       synchronize: "SyncOutlined"
     }, X = ne(() => w.value.map((e) => e.key).includes("import")), E = ne(() => w.value.find((e) => e.key === "import") || {});
     }, X = ne(() => w.value.map((e) => e.key).includes("import")), E = ne(() => w.value.find((e) => e.key === "import") || {});
     le(
     le(
-      () => _.buttons,
+      () => B.buttons,
       (e) => {
       (e) => {
         e && e.length && fe(e);
         e && e.length && fe(e);
       },
       },
       { immediate: !0, deep: !0 }
       { immediate: !0, deep: !0 }
     ), le(
     ), le(
-      () => _.columns,
+      () => B.columns,
       () => Q()
       () => Q()
     );
     );
     function G(e, t = "") {
     function G(e, t = "") {
@@ -167,7 +167,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
     }
     }
     function me() {
     function me() {
       C(() => {
       C(() => {
-        F(), W.value = _.pSize, A.value = _.columns.map((e) => ((e.template || e.isClick || e.dataIndex === "action" && !e.customRender) && !e.scopedSlots && (e.scopedSlots = { customRender: e.dataIndex }), e));
+        F(), W.value = B.pSize, T.value = B.columns.map((e) => ((e.template || e.isClick || e.dataIndex === "action" && !e.customRender) && !e.scopedSlots && (e.scopedSlots = { customRender: e.dataIndex }), e));
       }), setTimeout(() => {
       }), setTimeout(() => {
         const e = document.querySelector(".ant-table-cell.ant-table-cell-scrollbar"), t = document.querySelector(".ant-table-thead tr");
         const e = document.querySelector(".ant-table-cell.ant-table-cell-scrollbar"), t = document.querySelector(".ant-table-thead tr");
         e && t && t.removeChild(e);
         e && t && t.removeChild(e);
@@ -185,7 +185,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
       v("reset");
       v("reset");
     }
     }
     function H() {
     function H() {
-      B.value && B.value.refresh(!0);
+      O.value && O.value.refresh(!0);
     }
     }
     function Y(e) {
     function Y(e) {
       v("btnCallback", e.key, m.value);
       v("btnCallback", e.key, m.value);
@@ -261,7 +261,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
       v("tableColCallback", e, t);
       v("tableColCallback", e, t);
     }
     }
     function L(e) {
     function L(e) {
-      return A.value.find((t) => t.dataIndex === e);
+      return T.value.find((t) => t.dataIndex === e);
     }
     }
     function ke(e) {
     function ke(e) {
       const t = L(e);
       const t = L(e);
@@ -280,7 +280,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
     function F() {
     function F() {
       C(() => {
       C(() => {
         var e;
         var e;
-        c.value = (((e = P.value) == null ? void 0 : e.offsetHeight) || 0) - 48, te();
+        c.value = (((e = I.value) == null ? void 0 : e.offsetHeight) || 0) - 48, te();
       });
       });
     }
     }
     function te() {
     function te() {
@@ -308,15 +308,15 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
         e.style.cursor = "e-resize", document.addEventListener("selectstart", (t) => {
         e.style.cursor = "e-resize", document.addEventListener("selectstart", (t) => {
           t.preventDefault();
           t.preventDefault();
         }), e.onmousedown = (t) => {
         }), e.onmousedown = (t) => {
-          const d = t.clientX, i = T.value;
+          const d = t.clientX, i = P.value;
           document.onmousemove = (k) => {
           document.onmousemove = (k) => {
             const h = k.clientX - d;
             const h = k.clientX - d;
             if (h < 0) {
             if (h < 0) {
               if (i + h <= 256) return;
               if (i + h <= 256) return;
-              T.value = i + h;
+              P.value = i + h;
             } else {
             } else {
               if (i + h >= 500) return;
               if (i + h >= 500) return;
-              T.value = i + h;
+              P.value = i + h;
             }
             }
           }, document.onmouseup = () => {
           }, document.onmouseup = () => {
             document.onmousemove = document.onmousedown = null;
             document.onmousemove = document.onmousedown = null;
@@ -324,36 +324,36 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
         };
         };
       }
       }
     };
     };
-    return Ae(() => {
+    return Te(() => {
       Q();
       Q();
-    }), Ie(() => {
+    }), Ae(() => {
       C(() => {
       C(() => {
         var e;
         var e;
-        c.value = (((e = P.value) == null ? void 0 : e.offsetHeight) || 0) - 48, te();
+        c.value = (((e = I.value) == null ? void 0 : e.offsetHeight) || 0) - 48, te();
       });
       });
     }), ie({
     }), ie({
       reload: H,
       reload: H,
       spinning: f,
       spinning: f,
       selectedRowKeys: m,
       selectedRowKeys: m,
       expandedRowKeys: x,
       expandedRowKeys: x,
-      renderColumns: A,
+      renderColumns: T,
       renderButtons: w,
       renderButtons: w,
       setStateBtn: Z,
       setStateBtn: Z,
       btnCallback: Y,
       btnCallback: Y,
       filterReset: z,
       filterReset: z,
       toggleFilter: R,
       toggleFilter: R,
-      table: B,
+      table: O,
       importVisible: D,
       importVisible: D,
       measureLayout: F,
       measureLayout: F,
       advancedSearch: oe
       advancedSearch: oe
     }), (e, t) => {
     }), (e, t) => {
-      const d = Fe, i = I("down-outlined"), k = I("up-outlined"), h = I("sync-outlined"), Oe = Ke, _e = Le, Be = I("s-import-modal"), De = Pe("action");
+      const d = Fe, i = A("down-outlined"), k = A("up-outlined"), h = A("sync-outlined"), _e = Ke, Be = Le, Oe = A("s-import-modal"), De = Ie("action");
       return n(), l("div", {
       return n(), l("div", {
         class: "list-layout",
         class: "list-layout",
         ref_key: "layout",
         ref_key: "layout",
-        ref: P
+        ref: I
       }, [
       }, [
-        O(_e, { spinning: f.value }, {
+        _(Be, { spinning: f.value }, {
           default: y(() => [
           default: y(() => [
             p("div", Ue, [
             p("div", Ue, [
               p("div", Ve, $(e.$l(r.title)), 1),
               p("div", Ve, $(e.$l(r.title)), 1),
@@ -366,7 +366,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
                     class: "btn",
                     class: "btn",
                     disabled: !!o.disabled,
                     disabled: !!o.disabled,
                     type: o.type || (o.key === "add" ? "primary" : "default"),
                     type: o.type || (o.key === "add" ? "primary" : "default"),
-                    onClick: (Te) => Y(o)
+                    onClick: (Pe) => Y(o)
                   }, {
                   }, {
                     icon: y(() => [
                     icon: y(() => [
                       J(o) ? (n(), g(Ee(J(o)), { key: 0 })) : a("", !0)
                       J(o) ? (n(), g(Ee(J(o)), { key: 0 })) : a("", !0)
@@ -394,7 +394,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
                 class: "side s-side-tree",
                 class: "side s-side-tree",
                 ref_key: "side",
                 ref_key: "side",
                 ref: re,
                 ref: re,
-                style: b([{ height: c.value + "px", width: T.value + "px" }, { "overflow-y": "auto" }])
+                style: b([{ height: c.value + "px", width: P.value + "px" }, { "overflow-y": "auto" }])
               }, [
               }, [
                 u(e.$slots, "tree", {}, void 0, !0)
                 u(e.$slots, "tree", {}, void 0, !0)
               ], 4)) : a("", !0),
               ], 4)) : a("", !0),
@@ -446,7 +446,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
                         ]),
                         ]),
                         _: 1
                         _: 1
                       })) : a("", !0),
                       })) : a("", !0),
-                      O(Oe, {
+                      _(_e, {
                         placement: "top",
                         placement: "top",
                         overlayStyle: { maxWidth: "500px" }
                         overlayStyle: { maxWidth: "500px" }
                       }, {
                       }, {
@@ -454,12 +454,12 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
                           p("span", null, $(e.$l("条件重置")), 1)
                           p("span", null, $(e.$l("条件重置")), 1)
                         ]),
                         ]),
                         default: y(() => [
                         default: y(() => [
-                          O(d, {
+                          _(d, {
                             style: { "padding-bottom": "2px" },
                             style: { "padding-bottom": "2px" },
                             onClick: z
                             onClick: z
                           }, {
                           }, {
                             icon: y(() => [
                             icon: y(() => [
-                              O(h)
+                              _(h)
                             ]),
                             ]),
                             _: 1
                             _: 1
                           })
                           })
@@ -493,14 +493,14 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
                     u(e.$slots, "tabs", {}, void 0, !0)
                     u(e.$slots, "tabs", {}, void 0, !0)
                   ], 512)) : a("", !0),
                   ], 512)) : a("", !0),
                   p("div", tt, [
                   p("div", tt, [
-                    O(Re(Ne), {
+                    _(Re(Ne), {
                       ref_key: "table",
                       ref_key: "table",
-                      ref: B,
+                      ref: O,
                       size: "middle",
                       size: "middle",
                       scroll: { y: q.value, x: "100%" },
                       scroll: { y: q.value, x: "100%" },
                       pageSize: W.value,
                       pageSize: W.value,
                       rowKey: r.rowKey,
                       rowKey: r.rowKey,
-                      columns: A.value,
+                      columns: T.value,
                       data: r.loadData,
                       data: r.loadData,
                       "expanded-row-keys": x.value,
                       "expanded-row-keys": x.value,
                       "onUpdate:expandedRowKeys": t[0] || (t[0] = (o) => x.value = o),
                       "onUpdate:expandedRowKeys": t[0] || (t[0] = (o) => x.value = o),
@@ -520,7 +520,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
                             item: L(o.column.dataIndex)
                             item: L(o.column.dataIndex)
                           }, void 0, !0, 0) : $e(o.column.dataIndex) ? (n(), l("a", {
                           }, void 0, !0, 0) : $e(o.column.dataIndex) ? (n(), l("a", {
                             key: 1,
                             key: 1,
-                            onClick: (Te) => we(o.column.dataIndex, o.record)
+                            onClick: (Pe) => we(o.column.dataIndex, o.record)
                           }, $(ge(o.text)), 9, ot)) : o.column.dataIndex === "action" ? u(e.$slots, "action", {
                           }, $(ge(o.text)), 9, ot)) : o.column.dataIndex === "action" ? u(e.$slots, "action", {
                             record: o.record
                             record: o.record
                           }, void 0, !0, 2) : a("", !0)
                           }, void 0, !0, 2) : a("", !0)
@@ -552,7 +552,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
           ]),
           ]),
           _: 3
           _: 3
         }, 8, ["spinning"]),
         }, 8, ["spinning"]),
-        X.value ? (n(), g(Be, {
+        X.value ? (n(), g(Oe, {
           key: 0,
           key: 0,
           ref_key: "importModalRef",
           ref_key: "importModalRef",
           ref: de,
           ref: de,
@@ -566,7 +566,7 @@ const Ue = { class: "tools" }, Ve = { class: "title" }, qe = { class: "btns" },
       ], 512);
       ], 512);
     };
     };
   }
   }
-}), ut = /* @__PURE__ */ Me(lt, [["__scopeId", "data-v-bd675fb8"]]);
+}), ut = /* @__PURE__ */ Me(lt, [["__scopeId", "data-v-6d60c476"]]);
 export {
 export {
   ut as default
   ut as default
 };
 };

+ 18 - 18
lib/js/SOfficeSelect.js

@@ -1,5 +1,5 @@
 var U = ($, D, p) => new Promise((b, m) => {
 var U = ($, D, p) => new Promise((b, m) => {
-  var V = (c) => {
+  var A = (c) => {
     try {
     try {
       u(p.next(c));
       u(p.next(c));
     } catch (_) {
     } catch (_) {
@@ -11,12 +11,12 @@ var U = ($, D, p) => new Promise((b, m) => {
     } catch (_) {
     } catch (_) {
       m(_);
       m(_);
     }
     }
-  }, u = (c) => c.done ? b(c.value) : Promise.resolve(c.value).then(V, w);
+  }, u = (c) => c.done ? b(c.value) : Promise.resolve(c.value).then(A, w);
   u((p = p.apply($, D)).next());
   u((p = p.apply($, D)).next());
 });
 });
 import { ref as o, watch as re, resolveComponent as B, openBlock as k, createElementBlock as S, createVNode as d, withCtx as h, createElementVNode as t, toDisplayString as i, createTextVNode as I, withModifiers as ve, Fragment as G, renderList as J, createCommentVNode as he } from "vue";
 import { ref as o, watch as re, resolveComponent as B, openBlock as k, createElementBlock as S, createVNode as d, withCtx as h, createElementVNode as t, toDisplayString as i, createTextVNode as I, withModifiers as ve, Fragment as G, renderList as J, createCommentVNode as he } from "vue";
-import { aq as _e, B as pe, c$ as me, cL as fe, cM as ge, d0 as we, d1 as Ce, d2 as ye, d3 as ke, d4 as Se } from "./index2.js";
-const $e = { class: "s-office-select-common" }, be = { class: "modal-container" }, Oe = { class: "side" }, Ne = { class: "main" }, Le = { class: "filter" }, Ve = { class: "list-wrap" }, Ae = { class: "item left-wrap" }, Te = { class: "head" }, je = { class: "sub-title" }, Ue = { class: "right" }, Be = { href: "javascript:;" }, Ie = ["onClick"], De = { class: "icon s-theme-icon-bg" }, Ee = { class: "cont" }, Me = { class: "name" }, Fe = { class: "job" }, qe = {
+import { aq as _e, B as pe, d0 as me, cM as fe, cN as ge, d1 as we, d2 as Ce, d3 as ye, d4 as ke, d5 as Se } from "./index2.js";
+const $e = { class: "s-office-select-common" }, be = { class: "modal-container" }, Oe = { class: "side" }, Ne = { class: "main" }, Ve = { class: "filter" }, Ae = { class: "list-wrap" }, Le = { class: "item left-wrap" }, Te = { class: "head" }, je = { class: "sub-title" }, Ue = { class: "right" }, Be = { href: "javascript:;" }, Ie = ["onClick"], De = { class: "icon s-theme-icon-bg" }, Ee = { class: "cont" }, Me = { class: "name" }, Fe = { class: "job" }, qe = {
   key: 0,
   key: 0,
   class: "not-more"
   class: "not-more"
 }, ze = { class: "item right-wrap" }, Ge = { class: "head" }, Je = { class: "sub-title" }, Re = { class: "icon s-theme-icon-bg" }, xe = { class: "cont" }, He = { class: "name" }, Ke = { class: "job" }, Pe = ["onClick"], Ze = {
 }, ze = { class: "item right-wrap" }, Ge = { class: "head" }, Je = { class: "sub-title" }, Re = { class: "icon s-theme-icon-bg" }, xe = { class: "cont" }, He = { class: "name" }, Ke = { class: "job" }, Pe = ["onClick"], Ze = {
@@ -49,7 +49,7 @@ const $e = { class: "s-office-select-common" }, be = { class: "modal-container"
   },
   },
   emits: ["change", "update:value"],
   emits: ["change", "update:value"],
   setup($, { emit: D }) {
   setup($, { emit: D }) {
-    const p = D, b = $, m = o(""), V = o(""), w = o(""), u = o(!1), c = o(!1), _ = o({}), f = o([]), s = o([]), C = o(1), A = o(0), O = o(!1);
+    const p = D, b = $, m = o(""), A = o(""), w = o(""), u = o(!1), c = o(!1), _ = o({}), f = o([]), s = o([]), C = o(1), L = o(0), O = o(!1);
     let T = null;
     let T = null;
     const N = o(""), v = o([]), j = o(1), F = o(20), E = o(0);
     const N = o(""), v = o([]), j = o(1), F = o(20), E = o(0);
     re(
     re(
@@ -117,10 +117,10 @@ const $e = { class: "s-office-select-common" }, be = { class: "modal-container"
       O.value = !1, m.value = "", s.value = [], v.value = [];
       O.value = !1, m.value = "", s.value = [], v.value = [];
     }, Y = () => {
     }, Y = () => {
       c.value = !1;
       c.value = !1;
-      const e = v.value.filter((g) => s.value.includes(g.id)), l = e.map((g) => g.name), n = l.length - 1, r = l.slice(0, 1).join(",") + (n > 0 ? " +" + n : ""), L = e.map((g) => g.id);
-      p("update:value", b.multiple ? L : L[0] || ""), p("change", r, l, L, e);
+      const e = v.value.filter((g) => s.value.includes(g.id)), l = e.map((g) => g.name), n = l.length - 1, r = l.slice(0, 1).join(",") + (n > 0 ? " +" + n : ""), V = e.map((g) => g.id);
+      p("update:value", b.multiple ? V : V[0] || ""), p("change", r, l, V, e);
     }, Z = (e, l) => {
     }, Z = (e, l) => {
-      _.value = l.node, C.value = 1, A.value = 0, f.value = [], u.value = !0, N.value = e, M(e);
+      _.value = l.node, C.value = 1, L.value = 0, f.value = [], u.value = !0, N.value = e, M(e);
     }, M = (e) => U(this, null, function* () {
     }, M = (e) => U(this, null, function* () {
       const l = {
       const l = {
         pageNo: C.value,
         pageNo: C.value,
@@ -131,7 +131,7 @@ const $e = { class: "s-office-select-common" }, be = { class: "modal-container"
       };
       };
       u.value = !0;
       u.value = !0;
       const n = yield ke(l);
       const n = yield ke(l);
-      f.value = f.value.concat(n.list), A.value = n.pages, T = setTimeout(() => {
+      f.value = f.value.concat(n.list), L.value = n.pages, T = setTimeout(() => {
         u.value = !1, clearTimeout(T);
         u.value = !1, clearTimeout(T);
       }, 200);
       }, 200);
     }), ee = (e) => {
     }), ee = (e) => {
@@ -139,12 +139,12 @@ const $e = { class: "s-office-select-common" }, be = { class: "modal-container"
     }, le = (e, l) => {
     }, le = (e, l) => {
       v.value.splice(l, 1), s.value.splice(s.value.indexOf(e.id), 1), y();
       v.value.splice(l, 1), s.value.splice(s.value.indexOf(e.id), 1), y();
     }, te = ({ target: { offsetHeight: e, scrollHeight: l, scrollTop: n } }) => {
     }, te = ({ target: { offsetHeight: e, scrollHeight: l, scrollTop: n } }) => {
-      u.value || e + n >= l - 20 && C.value <= A.value && (C.value++, M([_.value.id]));
+      u.value || e + n >= l - 20 && C.value <= L.value && (C.value++, M([_.value.id]));
     }, ne = ({ target: { offsetHeight: e, scrollHeight: l, scrollTop: n } }) => {
     }, ne = ({ target: { offsetHeight: e, scrollHeight: l, scrollTop: n } }) => {
       u.value || e + n >= l - 20 && (E.value = j.value, j.value++, y(j.value, E.value));
       u.value || e + n >= l - 20 && (E.value = j.value, j.value++, y(j.value, E.value));
     }, ae = (e) => Ce(e), se = (e) => we(e);
     }, ae = (e) => Ce(e), se = (e) => we(e);
     return (e, l) => {
     return (e, l) => {
-      const n = _e, r = pe, L = B("s-tree"), g = B("DownOutlined"), oe = ge, ie = fe, ue = me, ce = B("CloseCircleOutlined"), de = B("s-modal");
+      const n = _e, r = pe, V = B("s-tree"), g = B("DownOutlined"), oe = ge, ie = fe, ue = me, ce = B("CloseCircleOutlined"), de = B("s-modal");
       return k(), S("div", $e, [
       return k(), S("div", $e, [
         d(n, {
         d(n, {
           value: m.value,
           value: m.value,
@@ -186,17 +186,17 @@ const $e = { class: "s-office-select-common" }, be = { class: "modal-container"
           default: h(() => [
           default: h(() => [
             t("div", be, [
             t("div", be, [
               t("div", Oe, [
               t("div", Oe, [
-                d(L, {
+                d(V, {
                   levelOneChildren: ae,
                   levelOneChildren: ae,
                   levelTwoChildren: se,
                   levelTwoChildren: se,
                   "onSelect:modelValue": Z,
                   "onSelect:modelValue": Z,
-                  select: V.value,
-                  "onUpdate:select": l[1] || (l[1] = (a) => V.value = a),
+                  select: A.value,
+                  "onUpdate:select": l[1] || (l[1] = (a) => A.value = a),
                   height: 470
                   height: 470
                 }, null, 8, ["select"])
                 }, null, 8, ["select"])
               ]),
               ]),
               t("div", Ne, [
               t("div", Ne, [
-                t("div", Le, [
+                t("div", Ve, [
                   d(n, {
                   d(n, {
                     value: w.value,
                     value: w.value,
                     "onUpdate:value": l[2] || (l[2] = (a) => w.value = a),
                     "onUpdate:value": l[2] || (l[2] = (a) => w.value = a),
@@ -205,8 +205,8 @@ const $e = { class: "s-office-select-common" }, be = { class: "modal-container"
                     onSearch: x
                     onSearch: x
                   }, null, 8, ["value", "placeholder"])
                   }, null, 8, ["value", "placeholder"])
                 ]),
                 ]),
-                t("div", Ve, [
-                  t("div", Ae, [
+                t("div", Ae, [
+                  t("div", Le, [
                     t("div", Te, [
                     t("div", Te, [
                       t("div", je, i(_.value.title || _.value.name), 1),
                       t("div", je, i(_.value.title || _.value.name), 1),
                       t("div", Ue, [
                       t("div", Ue, [
@@ -261,7 +261,7 @@ const $e = { class: "s-office-select-common" }, be = { class: "modal-container"
                           t("div", Fe, i(a.deptName), 1)
                           t("div", Fe, i(a.deptName), 1)
                         ])
                         ])
                       ], 8, Ie))), 128)),
                       ], 8, Ie))), 128)),
-                      C.value >= A.value ? (k(), S("div", qe, i(e.$l("没有更多了")), 1)) : he("", !0)
+                      C.value >= L.value ? (k(), S("div", qe, i(e.$l("没有更多了")), 1)) : he("", !0)
                     ], 32)
                     ], 32)
                   ]),
                   ]),
                   t("div", ze, [
                   t("div", ze, [

+ 51 - 51
lib/js/SSideMenu.js

@@ -1,39 +1,39 @@
-import { ref as R, computed as u, reactive as T, watch as h, onMounted as L, resolveComponent as _, openBlock as p, createElementBlock as U, createElementVNode as v, createVNode as w, withCtx as A, normalizeStyle as B, createBlock as k } from "vue";
-import { useRouter as D } from "vue-router";
-import { n as V, ad as g, cP as I, cL as N } from "./index2.js";
-const j = { class: "s-menu-slide-common" }, z = { class: "menu-wrap" }, H = {
+import { ref as R, computed as i, reactive as T, watch as K, onMounted as U, resolveComponent as _, openBlock as u, createElementBlock as B, createElementVNode as w, createVNode as v, withCtx as D, createBlock as g } from "vue";
+import { useRouter as L } from "vue-router";
+import { n as V, ad as $, cQ as A, cM as I } from "./index2.js";
+const N = { class: "s-menu-slide-common" }, j = { class: "menu-wrap" }, H = {
   __name: "SSideMenu",
   __name: "SSideMenu",
   emits: ["collapsed"],
   emits: ["collapsed"],
-  setup(W, { emit: $ }) {
-    const d = D(), M = $, m = g(), r = R(""), b = u(() => {
+  setup(Q, { emit: k }) {
+    const a = L(), b = k, p = $(), m = R(""), M = i(() => {
       const e = window.$menuTheme;
       const e = window.$menuTheme;
-      return r.value !== "dark" || !e || !e.token ? {} : { components: { Menu: e.token } };
+      return !e || !e.token ? {} : { components: { Menu: e.token } };
     }), n = T({
     }), n = T({
       collapsed: !1,
       collapsed: !1,
       selectedKeys: [],
       selectedKeys: [],
       openKeys: [],
       openKeys: [],
       preOpenKeys: []
       preOpenKeys: []
     });
     });
-    h(
+    K(
       () => n.openKeys,
       () => n.openKeys,
       (e, t) => {
       (e, t) => {
         n.preOpenKeys = t;
         n.preOpenKeys = t;
       }
       }
     );
     );
     const O = (e, t) => t ? t.startsWith("/") ? t : e ? `${e.replace(/\/+$/, "")}/${t}` : `/${t}` : e || "", y = (e, t, l = 0, o = "") => e.map((s) => {
     const O = (e, t) => t ? t.startsWith("/") ? t : e ? `${e.replace(/\/+$/, "")}/${t}` : `/${t}` : e || "", y = (e, t, l = 0, o = "") => e.map((s) => {
-      var K;
-      const c = window.$l(((K = s.meta) == null ? void 0 : K.title) || s.name || ""), a = l === 0 && !s.children, i = O(o, s.path), f = {
-        key: i,
+      var h;
+      const c = window.$l(((h = s.meta) == null ? void 0 : h.title) || s.name || ""), r = l === 0 && !s.children, d = O(o, s.path), f = {
+        key: d,
         // icon: item.icon ? () => h(item.icon) : null,
         // icon: item.icon ? () => h(item.icon) : null,
         icon: null,
         icon: null,
-        label: t && a ? c.slice(0, 1) : c,
-        title: c,
-        path: i
+        label: t && r ? c.slice(0, 1) : c,
+        // title: name,
+        path: d
       };
       };
-      return s.children && (f.children = y(s.children, t, l + 1, i)), f;
-    }), C = u(() => {
+      return s.children && (f.children = y(s.children, t, l + 1, d)), f;
+    }), C = i(() => {
       var l;
       var l;
-      const e = ((l = m.dynamics[0]) == null ? void 0 : l.children) || [], t = (window.$staticRoutes || []).filter(
+      const e = ((l = p.dynamics[0]) == null ? void 0 : l.children) || [], t = (window.$staticRoutes || []).filter(
         (o) => {
         (o) => {
           var s, c;
           var s, c;
           return o && o.path && ((s = o.meta) == null ? void 0 : s.title) && !((c = o.meta) != null && c.hidden);
           return o && o.path && ((s = o.meta) == null ? void 0 : s.title) && !((c = o.meta) != null && c.hidden);
@@ -43,65 +43,65 @@ const j = { class: "s-menu-slide-common" }, z = { class: "menu-wrap" }, H = {
         var s;
         var s;
         return !((s = o.meta) != null && s.hidden);
         return !((s = o.meta) != null && s.hidden);
       });
       });
-    }), S = u(() => y(C.value, n.collapsed)), E = () => {
-      n.collapsed = !n.collapsed, n.openKeys = n.collapsed ? [] : n.preOpenKeys, M("collapsed", n.collapsed);
-    }, P = (e) => {
-      d.push(e.key), n.selectedKeys = [e.key], window.$utils.ls.set("selectedKeys", n.selectedKeys);
+    }), E = i(() => y(C.value, n.collapsed)), S = () => {
+      n.collapsed = !n.collapsed, n.openKeys = n.collapsed ? [] : n.preOpenKeys, b("collapsed", n.collapsed);
     }, x = (e) => {
     }, x = (e) => {
-      n.openKeys = e, g().setMenuOpenKeys(n.openKeys);
+      a.push(e.key), n.selectedKeys = [e.key], window.$utils.ls.set("selectedKeys", n.selectedKeys);
+    }, P = (e) => {
+      n.openKeys = e, $().setMenuOpenKeys(n.openKeys);
     };
     };
-    return L(() => {
+    return U(() => {
       var o;
       var o;
-      r.value = window.$utils.env.VITE_APP_MENU_THEME || "dark";
+      m.value = window.$utils.env.VITE_APP_MENU_THEME || "light";
       const e = (window.$utils.env.VITE_APP_BASE_URL || "/").replace(/\/+$/, "");
       const e = (window.$utils.env.VITE_APP_BASE_URL || "/").replace(/\/+$/, "");
-      let t = ((o = d.currentRoute.value) == null ? void 0 : o.path) || "";
+      let t = ((o = a.currentRoute.value) == null ? void 0 : o.path) || "";
       t || (t = location.pathname, e && t.indexOf(e) === 0 && (t = t.slice(e.length) || "/")), window.$utils.ls.set("selectedKeys", [t]), n.selectedKeys = window.$utils.ls.get("selectedKeys") || [];
       t || (t = location.pathname, e && t.indexOf(e) === 0 && (t = t.slice(e.length) || "/")), window.$utils.ls.set("selectedKeys", [t]), n.selectedKeys = window.$utils.ls.get("selectedKeys") || [];
-      const l = m.openKeys || [];
+      const l = p.openKeys || [];
       n.openKeys = l;
       n.openKeys = l;
-    }), h(
+    }), K(
       () => {
       () => {
         var e;
         var e;
-        return (e = d.currentRoute.value) == null ? void 0 : e.path;
+        return (e = a.currentRoute.value) == null ? void 0 : e.path;
       },
       },
       (e) => {
       (e) => {
         e && (n.selectedKeys = [e], window.$utils.ls.set("selectedKeys", n.selectedKeys));
         e && (n.selectedKeys = [e], window.$utils.ls.set("selectedKeys", n.selectedKeys));
       }
       }
     ), (e, t) => {
     ), (e, t) => {
-      const l = N, o = I, s = _("DoubleRightOutlined"), c = _("DoubleLeftOutlined");
-      return p(), U("div", j, [
-        v("div", z, [
-          w(o, { theme: b.value }, {
-            default: A(() => [
-              w(l, {
+      const l = I, o = A, s = _("DoubleRightOutlined"), c = _("DoubleLeftOutlined");
+      return u(), B("div", N, [
+        w("div", j, [
+          v(o, { theme: M.value }, {
+            default: D(() => [
+              v(l, {
                 openKeys: n.openKeys,
                 openKeys: n.openKeys,
-                "onUpdate:openKeys": t[0] || (t[0] = (a) => n.openKeys = a),
+                "onUpdate:openKeys": t[0] || (t[0] = (r) => n.openKeys = r),
                 selectedKeys: n.selectedKeys,
                 selectedKeys: n.selectedKeys,
-                "onUpdate:selectedKeys": t[1] || (t[1] = (a) => n.selectedKeys = a),
+                "onUpdate:selectedKeys": t[1] || (t[1] = (r) => n.selectedKeys = r),
                 mode: "inline",
                 mode: "inline",
-                items: S.value,
-                theme: r.value,
-                onSelect: P,
-                onOpenChange: x
+                items: E.value,
+                theme: m.value,
+                onSelect: x,
+                onOpenChange: P
               }, null, 8, ["openKeys", "selectedKeys", "items", "theme"])
               }, null, 8, ["openKeys", "selectedKeys", "items", "theme"])
             ]),
             ]),
             _: 1
             _: 1
           }, 8, ["theme"])
           }, 8, ["theme"])
         ]),
         ]),
-        v("div", {
+        w("div", {
           class: "right-border-btn",
           class: "right-border-btn",
-          style: B({
-            backgroundColor: r.value === "dark" ? "var(--s-menu-bg, #e8ecf3)" : "#fff",
-            color: r.value === "dark" ? "var(--s-menu-text, #344051)" : "#000000A6",
-            border: `1px solid ${r.value === "dark" ? "var(--s-menu-bg, #e8ecf3)" : "#ececec"}`
-          }),
-          onClick: E
+          style: {
+            backgroundColor: "var(--s-menu-bg, #ebf7fe)",
+            color: "var(--s-menu-text, #344051)",
+            border: "1px solid var(--s-menu-bg, #ebf7fe)"
+          },
+          onClick: S
         }, [
         }, [
-          n.collapsed ? (p(), k(s, { key: 0 })) : (p(), k(c, { key: 1 }))
-        ], 4)
+          n.collapsed ? (u(), g(s, { key: 0 })) : (u(), g(c, { key: 1 }))
+        ])
       ]);
       ]);
     };
     };
   }
   }
-}, J = /* @__PURE__ */ V(H, [["__scopeId", "data-v-778de210"]]);
+}, F = /* @__PURE__ */ V(H, [["__scopeId", "data-v-2ec64017"]]);
 export {
 export {
-  J as default
+  F as default
 };
 };

+ 1 - 1
lib/js/SSkeletonLayout.js

@@ -154,7 +154,7 @@ const F = { class: "title" }, I = { class: "btns" }, j = {
       ], 4);
       ], 4);
     };
     };
   }
   }
-}), J = /* @__PURE__ */ W(q, [["__scopeId", "data-v-b7a47f05"]]);
+}), J = /* @__PURE__ */ W(q, [["__scopeId", "data-v-b1e7dba2"]]);
 export {
 export {
   J as default
   J as default
 };
 };

+ 281 - 195
lib/js/SSuperListLayout.js

@@ -1,13 +1,32 @@
-import { ref as l, computed as X, watch as Y, onMounted as Ce, onActivated as Se, resolveComponent as $, resolveDirective as be, openBlock as a, createElementBlock as s, createElementVNode as u, toDisplayString as g, Fragment as Z, renderList as Oe, withDirectives as _e, createBlock as D, withCtx as C, createTextVNode as P, resolveDynamicComponent as xe, createCommentVNode as d, vShow as Re, renderSlot as c, createVNode as y, normalizeStyle as H, unref as Ie, nextTick as L, h as Be } from "vue";
-import { useRoute as Te } from "vue-router";
-import { n as Ae, B as De, aO as Pe } from "./index2.js";
-const He = { class: "tools" }, Le = { class: "title" }, ze = { class: "btn-list" }, Ke = {
+var Ke = Object.defineProperty;
+var le = Object.getOwnPropertySymbols;
+var Ee = Object.prototype.hasOwnProperty, Ue = Object.prototype.propertyIsEnumerable;
+var ae = (u, r, d) => r in u ? Ke(u, r, { enumerable: !0, configurable: !0, writable: !0, value: d }) : u[r] = d, M = (u, r) => {
+  for (var d in r || (r = {}))
+    Ee.call(r, d) && ae(u, d, r[d]);
+  if (le)
+    for (var d of le(r))
+      Ue.call(r, d) && ae(u, d, r[d]);
+  return u;
+};
+import { ref as a, computed as K, watch as ie, onMounted as Ve, onActivated as qe, resolveComponent as h, resolveDirective as Ne, openBlock as l, createElementBlock as s, createElementVNode as f, toDisplayString as C, Fragment as se, renderList as je, withDirectives as ue, createBlock as R, withCtx as k, createTextVNode as T, resolveDynamicComponent as We, createCommentVNode as c, vShow as re, renderSlot as p, createVNode as m, normalizeStyle as E, unref as Ge, nextTick as U, h as Je } from "vue";
+import { n as Qe, B as Xe, y as Ye, aP as Ze } from "./index2.js";
+const et = { class: "tools" }, tt = { class: "title" }, nt = { class: "btn-list" }, ot = {
   key: 0,
   key: 0,
   style: { "margin-left": "8px" }
   style: { "margin-left": "8px" }
-}, Ue = { class: "filter-content" }, Ve = { class: "filter" }, Me = {
+}, lt = {
   key: 0,
   key: 0,
+  class: "filter-content"
+}, at = { class: "filter" }, it = {
+  key: 1,
+  class: "reset-wrap"
+}, st = {
+  key: 1,
+  class: "filter-more-content"
+}, ut = {
+  key: 2,
   class: "desc-wrap"
   class: "desc-wrap"
-}, Ne = { class: "table-content" }, Ee = { class: "table-container" }, Fe = ["onClick"], qe = { class: "other" }, je = /* @__PURE__ */ Object.assign({ name: "SSuperListLayout" }, {
+}, rt = { class: "table-content" }, dt = { class: "table-container" }, ct = ["onClick"], ft = { class: "other" }, mt = /* @__PURE__ */ Object.assign({ name: "SSuperListLayout" }, {
   __name: "SSuperListLayout",
   __name: "SSuperListLayout",
   props: {
   props: {
     // 页面标题
     // 页面标题
@@ -111,10 +130,8 @@ const He = { class: "tools" }, Le = { class: "title" }, ze = { class: "btn-list"
     }
     }
   },
   },
   emits: ["reset", "btnCallback", "tableColCallback"],
   emits: ["reset", "btnCallback", "tableColCallback"],
-  setup(v, { expose: ee, emit: te }) {
-    const _ = v, k = te;
-    Te();
-    const z = l(null), K = l(null), U = l(null), S = l(null), V = l(null), M = l(null), ne = l(null), b = l(!1), h = l(0), N = l(0), f = l(!1), E = l(20), F = l(!1), r = l([]), x = l([]), m = l([]), w = l([]), oe = {
+  setup(u, { expose: r, emit: d }) {
+    const _ = u, b = d, V = a(null), q = a(null), N = a(null), v = a(null), j = a(null), W = a(null), I = a(!1), O = a(!1), x = a(0), G = a(0), $ = a(!1), J = a(20), Q = a(!1), y = a([]), A = a([]), w = a([]), S = a([]), P = a({}), de = {
       add: "PlusCircleOutlined",
       add: "PlusCircleOutlined",
       edit: "FormOutlined",
       edit: "FormOutlined",
       delete: "DeleteOutlined",
       delete: "DeleteOutlined",
@@ -130,87 +147,87 @@ const He = { class: "tools" }, Le = { class: "title" }, ze = { class: "btn-list"
       TopOfType: "VerticalAlignTopOutlined",
       TopOfType: "VerticalAlignTopOutlined",
       TOP: "VerticalAlignTopOutlined",
       TOP: "VerticalAlignTopOutlined",
       synchronize: "SyncOutlined"
       synchronize: "SyncOutlined"
-    }, q = X(() => w.value.map((e) => e.key).includes("import")), R = X(() => w.value.find((e) => e.key === "import") || {});
-    Y(
+    }, ce = K(() => w.value.filter((e) => e.show !== !1)), X = K(() => S.value.map((e) => e.key).includes("import")), L = K(() => S.value.find((e) => e.key === "import") || {});
+    ie(
       () => _.buttons,
       () => _.buttons,
       (e) => {
       (e) => {
-        e && e.length && le(e);
+        e && e.length && fe(e);
       },
       },
       { immediate: !0, deep: !0 }
       { immediate: !0, deep: !0 }
-    ), Y(
+    ), ie(
       () => _.columns,
       () => _.columns,
       (e) => {
       (e) => {
-        ie(e || []);
+        ee(e || []);
       },
       },
       { deep: !0, immediate: !0 }
       { deep: !0, immediate: !0 }
     );
     );
-    function j(e, t = "") {
+    function Y(e, t = "") {
       return !!(e && typeof e == "function");
       return !!(e && typeof e == "function");
     }
     }
-    function G(e) {
-      return typeof e.icon == "string" ? e.icon : typeof e.icon == "boolean" && e.icon && oe[e.key] || "";
+    function Z(e) {
+      return typeof e.icon == "string" ? e.icon : typeof e.icon == "boolean" && e.icon && de[e.key] || "";
     }
     }
-    function le(e) {
-      w.value = e.map((t) => (t.key === "remove" && (F.value = !0), t));
+    function fe(e) {
+      S.value = e.map((t) => (t.key === "remove" && (Q.value = !0), t));
     }
     }
-    function ae(e) {
-      L(() => {
-        A(), E.value = _.pSize, m.value = e.map((o) => ((o.template || o.isClick || o.dataIndex === "action" && !o.customRender) && !o.scopedSlots && (o.scopedSlots = { customRender: o.dataIndex }), (o.dataIndex === "action" || o.title === "操作") && (o.fixed = "right"), o));
+    function me(e) {
+      U(() => {
+        D(), J.value = _.pSize, w.value = e.map((o) => ((o.template || o.isClick || o.dataIndex === "action" && !o.customRender) && !o.scopedSlots && (o.scopedSlots = { customRender: o.dataIndex }), (o.dataIndex === "action" || o.title === "操作") && (o.fixed = "right"), o));
       });
       });
       const t = setTimeout(() => {
       const t = setTimeout(() => {
         const o = document.querySelector(".ant-table-cell.ant-table-cell-scrollbar"), i = document.querySelector(".ant-table-thead tr");
         const o = document.querySelector(".ant-table-cell.ant-table-cell-scrollbar"), i = document.querySelector(".ant-table-thead tr");
         o && i && i.removeChild(o), clearTimeout(t);
         o && i && i.removeChild(o), clearTimeout(t);
       }, 100);
       }, 100);
     }
     }
-    function ie(e = []) {
-      ae(e);
+    function ee(e = []) {
+      me(e);
     }
     }
-    function I() {
-      S.value && S.value.refresh(!0);
+    function z() {
+      v.value && v.value.refresh(!0);
     }
     }
-    function J(e) {
-      k("btnCallback", e.key, r.value);
-      const t = we[e.key];
-      typeof t == "function" ? t(e) : B(e);
+    function te(e) {
+      b("btnCallback", e.key, y.value);
+      const t = Be[e.key];
+      typeof t == "function" ? t(e) : F(e);
     }
     }
-    function B(e) {
-      if (e.selection !== !1 && !r.value.length) {
+    function F(e) {
+      if (e.selection !== !1 && !y.value.length) {
         window.$message.warn(`${window.$l("请选择要")}${window.$l(e.name)}${window.$l("的数据")}`);
         window.$message.warn(`${window.$l("请选择要")}${window.$l(e.name)}${window.$l("的数据")}`);
         return;
         return;
       }
       }
-      if (j(e.api, e.name, e.key)) {
+      if (Y(e.api, e.name, e.key)) {
         if (e.confirm) {
         if (e.confirm) {
           window.$confirm({
           window.$confirm({
             title: `${window.$l(e.name)}`,
             title: `${window.$l(e.name)}`,
-            content: () => Be(
+            content: () => Je(
               "div",
               "div",
               { style: "color:red" },
               { style: "color:red" },
               `${window.$l("确认要")}{${window.$l(e.name)}}${window.$l("数据吗?")}`
               `${window.$l("确认要")}{${window.$l(e.name)}}${window.$l("数据吗?")}`
             ),
             ),
             onOk: () => {
             onOk: () => {
-              f.value = !0, e.api(r.value).then(() => {
-                window.$message.success(`${window.$l(e.name)}${window.$l("成功")}`), k("reset");
+              $.value = !0, e.api(y.value).then(() => {
+                window.$message.success(`${window.$l(e.name)}${window.$l("成功")}`), b("reset");
               }).finally(() => {
               }).finally(() => {
-                f.value = !1;
+                $.value = !1;
               });
               });
             }
             }
           });
           });
           return;
           return;
         }
         }
-        f.value = !0, e.api(r.value).then(() => {
-          window.$message.success(`${window.$l(e.name)}${window.$l("成功")}`), k("reset");
+        $.value = !0, e.api(y.value).then(() => {
+          window.$message.success(`${window.$l(e.name)}${window.$l("成功")}`), b("reset");
         }).finally(() => {
         }).finally(() => {
-          f.value = !1;
+          $.value = !1;
         });
         });
       }
       }
     }
     }
-    function Q(e, t) {
-      typeof e == "string" ? W(e, t) : e.forEach((o) => {
-        W(o, t);
+    function ne(e, t) {
+      typeof e == "string" ? oe(e, t) : e.forEach((o) => {
+        oe(o, t);
       });
       });
     }
     }
-    function W(e, t) {
-      const o = w.value.find((i) => i.key === e);
+    function oe(e, t) {
+      const o = S.value.find((i) => i.key === e);
       if (!o) {
       if (!o) {
         console.error(`按钮(${e})未定义, 请确认该变更状态按钮是否设置正确`);
         console.error(`按钮(${e})未定义, 请确认该变更状态按钮是否设置正确`);
         return;
         return;
@@ -219,248 +236,317 @@ const He = { class: "tools" }, Le = { class: "title" }, ze = { class: "btn-list"
         o[i] = t[i];
         o[i] = t[i];
       });
       });
     }
     }
-    function se() {
+    function pe() {
     }
     }
-    function ue(e) {
-      B(e);
+    function ve(e) {
+      F(e);
     }
     }
-    function re() {
-      if (!q.value) {
-        k("btnCallback", "import");
+    function ye() {
+      if (!X.value) {
+        b("btnCallback", "import");
         return;
         return;
       }
       }
-      b.value = !0;
+      I.value = !0;
     }
     }
-    function de(e) {
-      j(e.api, e.name, e.key) && (f.value = !0, e.api().then(() => {
-        f.value = !1;
+    function we(e) {
+      Y(e.api, e.name, e.key) && ($.value = !0, e.api().then(() => {
+        $.value = !1;
       }));
       }));
     }
     }
-    function ce(e, t) {
-      k("tableColCallback", e, t);
+    function he(e) {
+      return _.loadData(M(M({}, e), P.value));
     }
     }
-    function T(e) {
-      return m.value.find((t) => t.dataIndex === e);
+    function ke(e = [], t = 1) {
+      const o = { filterMode: t, filterConditions: e };
+      e.forEach((i) => {
+        ["equal", "includes"].includes(i.equals) && o[i.dataIndex] === void 0 && (o[i.dataIndex] = i.value);
+      }), P.value = o, v.value && v.value.refresh(!0);
     }
     }
-    function fe(e) {
-      const t = T(e);
+    function $e() {
+      P.value = {}, v.value && v.value.refresh(!0);
+    }
+    function ge(e) {
+      w.value = e;
+    }
+    function Ce() {
+      ee(_.columns || []);
+    }
+    function be(e, t) {
+      b("tableColCallback", e, t);
+    }
+    function H(e) {
+      return w.value.find((t) => t.dataIndex === e);
+    }
+    function Se(e) {
+      const t = H(e);
       return !!(t && t.template);
       return !!(t && t.template);
     }
     }
-    function me(e) {
-      const t = T(e);
+    function _e(e) {
+      const t = H(e);
       return !!(t && t.isClick);
       return !!(t && t.isClick);
     }
     }
-    function pe(e) {
+    function Oe(e) {
       return e == null ? "" : typeof e == "object" ? e.name === void 0 ? "" : e.name : e;
       return e == null ? "" : typeof e == "object" ? e.name === void 0 ? "" : e.name : e;
     }
     }
-    function ye(e) {
-      r.value = e;
+    function xe(e) {
+      y.value = e;
     }
     }
-    function A() {
-      L(() => {
+    function D() {
+      U(() => {
         var e, t;
         var e, t;
-        h.value = (((t = (e = z.value) == null ? void 0 : e.parentNode) == null ? void 0 : t.offsetHeight) || 0) - 76, ve();
+        x.value = (((t = (e = V.value) == null ? void 0 : e.parentNode) == null ? void 0 : t.offsetHeight) || 0) - 76, Re();
       });
       });
     }
     }
-    function ve() {
-      L(() => {
-        var i, O;
-        const t = ((i = K.value) == null ? void 0 : i.offsetHeight) || 0, o = ((O = U.value) == null ? void 0 : O.offsetHeight) || 0;
-        N.value = h.value - t - 103 - o;
+    function Re() {
+      U(() => {
+        var i, B;
+        const t = ((i = q.value) == null ? void 0 : i.offsetHeight) || 0, o = ((B = N.value) == null ? void 0 : B.offsetHeight) || 0;
+        G.value = x.value - t - 103 - o;
       });
       });
     }
     }
-    const we = {
-      add: se,
-      delete: ue,
-      import: re,
-      export: de,
-      reload: I,
-      setStateBtn: Q,
-      handAction: B
+    function Ie() {
+      O.value = !O.value, D();
+    }
+    function De() {
+      b("reset");
+    }
+    const Be = {
+      add: pe,
+      delete: ve,
+      import: ye,
+      export: we,
+      reload: z,
+      setStateBtn: ne,
+      handAction: F
     };
     };
-    return Ce(() => {
-    }), Se(() => A()), ee({
-      reload: I,
-      spinning: f,
-      selectedRowKeys: r,
-      expandedRowKeys: x,
-      renderColumns: m,
-      renderButtons: w,
-      setStateBtn: Q,
-      btnCallback: J,
-      table: S,
-      importVisible: b,
-      measureLayout: A
+    return Ve(() => {
+    }), qe(() => D()), r({
+      reload: z,
+      spinning: $,
+      selectedRowKeys: y,
+      expandedRowKeys: A,
+      renderColumns: w,
+      renderButtons: S,
+      setStateBtn: ne,
+      btnCallback: te,
+      table: v,
+      importVisible: I,
+      measureLayout: D
     }), (e, t) => {
     }), (e, t) => {
-      const o = De, i = $("SearchOutlined"), O = $("SettingOutlined"), ke = $("setting-filter"), he = $("setting-columns"), $e = $("s-import-modal"), ge = be("action");
-      return a(), s("div", {
+      const o = Xe, i = h("SearchOutlined"), B = h("SettingOutlined"), Te = h("down-outlined"), Ae = h("up-outlined"), Pe = h("sync-outlined"), Le = Ye, ze = h("setting-filter"), Fe = h("setting-columns"), He = h("s-import-modal"), Me = Ne("action");
+      return l(), s("div", {
         class: "list-layout",
         class: "list-layout",
         ref_key: "layout",
         ref_key: "layout",
-        ref: z
+        ref: V
       }, [
       }, [
-        u("div", He, [
-          u("div", Le, g(v.title), 1),
-          u("div", ze, [
-            (a(!0), s(Z, null, Oe(w.value, (n) => (a(), s("span", {
+        f("div", et, [
+          f("div", tt, C(u.title), 1),
+          f("div", nt, [
+            (l(!0), s(se, null, je(S.value, (n) => (l(), s("span", {
               class: "item-btn",
               class: "item-btn",
               key: n.key
               key: n.key
             }, [
             }, [
-              _e((a(), D(o, {
+              ue((l(), R(o, {
                 class: "btn",
                 class: "btn",
                 disabled: !!n.disabled,
                 disabled: !!n.disabled,
                 type: n.type || n.key === "add" ? "primary" : "default",
                 type: n.type || n.key === "add" ? "primary" : "default",
-                onClick: (p) => J(n)
+                onClick: (g) => te(n)
               }, {
               }, {
-                icon: C(() => [
-                  G(n) ? (a(), D(xe(G(n)), { key: 0 })) : d("", !0)
+                icon: k(() => [
+                  Z(n) ? (l(), R(We(Z(n)), { key: 0 })) : c("", !0)
                 ]),
                 ]),
-                default: C(() => [
-                  P(" " + g(e.$l(n.name)), 1)
+                default: k(() => [
+                  T(" " + C(e.$l(n.name)), 1)
                 ]),
                 ]),
                 _: 2
                 _: 2
               }, 1032, ["disabled", "type", "onClick"])), [
               }, 1032, ["disabled", "type", "onClick"])), [
-                [ge, n.action || n.key],
-                [Re, n.show !== !1]
+                [Me, n.action || n.key],
+                [re, n.show !== !1]
               ])
               ])
             ]))), 128)),
             ]))), 128)),
-            e.$slots.otherBtns ? (a(), s("span", Ke, [
-              c(e.$slots, "otherBtns", { selections: r.value }, void 0, !0)
-            ])) : d("", !0),
-            u("span", null, [
-              y(o, {
+            e.$slots.otherBtns ? (l(), s("span", ot, [
+              p(e.$slots, "otherBtns", { selections: y.value }, void 0, !0)
+            ])) : c("", !0),
+            f("span", null, [
+              m(o, {
                 class: "btn",
                 class: "btn",
                 onClick: t[0] || (t[0] = (n) => {
                 onClick: t[0] || (t[0] = (n) => {
-                  var p;
-                  return (p = V.value) == null ? void 0 : p.show(m.value);
+                  var g;
+                  return (g = j.value) == null ? void 0 : g.show(w.value);
                 })
                 })
               }, {
               }, {
-                default: C(() => [
-                  y(i),
-                  P(" " + g(e.$l("高级搜索")), 1)
+                default: k(() => [
+                  m(i),
+                  T(" " + C(e.$l("高级搜索")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               }),
               }),
-              y(o, {
+              m(o, {
                 class: "btn",
                 class: "btn",
                 onClick: t[1] || (t[1] = (n) => {
                 onClick: t[1] || (t[1] = (n) => {
-                  var p;
-                  return (p = M.value) == null ? void 0 : p.show(m.value);
+                  var g;
+                  return (g = W.value) == null ? void 0 : g.show();
                 })
                 })
               }, {
               }, {
-                default: C(() => [
-                  y(O),
-                  P(" " + g(e.$l("高级表格")), 1)
+                default: k(() => [
+                  m(B),
+                  T(" " + C(e.$l("高级表格")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               })
               })
             ])
             ])
           ])
           ])
         ]),
         ]),
-        u("div", {
+        f("div", {
           class: "list-layout-main",
           class: "list-layout-main",
-          style: H({ height: h.value + "px" })
+          style: E({ height: x.value + "px" })
         }, [
         }, [
-          e.$slots.empty ? (a(), s("div", {
+          e.$slots.empty ? (l(), s("div", {
             key: 1,
             key: 1,
             class: "layout-list-content",
             class: "layout-list-content",
-            style: H({ height: h.value + "px" })
+            style: E({ height: x.value + "px" })
           }, [
           }, [
-            c(e.$slots, "empty", {}, void 0, !0)
-          ], 4)) : (a(), s("div", {
+            p(e.$slots, "empty", {}, void 0, !0)
+          ], 4)) : (l(), s("div", {
             key: 0,
             key: 0,
             class: "layout-list-content",
             class: "layout-list-content",
-            style: H({ height: h.value + "px" })
+            style: E({ height: x.value + "px" })
           }, [
           }, [
-            e.$slots.filter || e.$slots.desc ? (a(), s("div", {
+            e.$slots.filter || e.$slots.desc ? (l(), s("div", {
               key: 0,
               key: 0,
               class: "list-filter-wrap",
               class: "list-filter-wrap",
               ref_key: "filters",
               ref_key: "filters",
-              ref: K
+              ref: q
             }, [
             }, [
-              u("div", Ue, [
-                u("div", Ve, [
-                  c(e.$slots, "filter", {}, void 0, !0)
-                ])
-              ]),
-              e.$slots.desc ? (a(), s("div", Me, [
-                c(e.$slots, "desc", {}, void 0, !0)
-              ])) : d("", !0)
-            ], 512)) : d("", !0),
-            u("div", Ne, [
-              e.$slots.tabs ? (a(), s("div", {
+              e.$slots.filter ? (l(), s("div", lt, [
+                f("div", at, [
+                  p(e.$slots, "filter", {}, void 0, !0)
+                ]),
+                e.$slots.filterMore ? (l(), s("a", {
+                  key: 0,
+                  class: "filter-more-btn",
+                  onClick: Ie
+                }, [
+                  T(C(O.value ? e.$l("收起") : e.$l("更多")) + " ", 1),
+                  O.value ? (l(), R(Ae, {
+                    key: 1,
+                    style: { "font-size": "12px" }
+                  })) : (l(), R(Te, {
+                    key: 0,
+                    style: { "font-size": "12px" }
+                  }))
+                ])) : c("", !0),
+                e.$slots.filter ? (l(), s("div", it, [
+                  m(Le, {
+                    placement: "top",
+                    overlayStyle: { maxWidth: "500px" },
+                    mouseEnterDelay: 1.5,
+                    mouseLeaveDelay: 0.5
+                  }, {
+                    title: k(() => [
+                      f("span", null, C(e.$l("条件重置")), 1)
+                    ]),
+                    default: k(() => [
+                      m(o, {
+                        style: { "padding-bottom": "2px" },
+                        onClick: De
+                      }, {
+                        icon: k(() => [
+                          m(Pe)
+                        ]),
+                        _: 1
+                      })
+                    ]),
+                    _: 1
+                  })
+                ])) : c("", !0)
+              ])) : c("", !0),
+              e.$slots.filterMore ? ue((l(), s("div", st, [
+                p(e.$slots, "filterMore", {}, void 0, !0)
+              ], 512)), [
+                [re, O.value]
+              ]) : c("", !0),
+              e.$slots.desc ? (l(), s("div", ut, [
+                p(e.$slots, "desc", {}, void 0, !0)
+              ])) : c("", !0)
+            ], 512)) : c("", !0),
+            f("div", rt, [
+              e.$slots.tabs ? (l(), s("div", {
                 key: 0,
                 key: 0,
                 class: "tabs-wrap",
                 class: "tabs-wrap",
                 ref_key: "tabs",
                 ref_key: "tabs",
-                ref: U
+                ref: N
               }, [
               }, [
-                c(e.$slots, "tabs", {}, void 0, !0)
-              ], 512)) : d("", !0),
-              u("div", Ee, [
-                y(Ie(Pe), {
+                p(e.$slots, "tabs", {}, void 0, !0)
+              ], 512)) : c("", !0),
+              f("div", dt, [
+                m(Ge(Ze), {
                   ref_key: "table",
                   ref_key: "table",
-                  ref: S,
+                  ref: v,
                   size: "middle",
                   size: "middle",
-                  scroll: { y: N.value, x: "100%" },
-                  pageSize: E.value,
-                  rowKey: v.rowKey,
-                  columns: m.value,
-                  data: v.loadData,
-                  "expanded-row-keys": x.value,
-                  "onUpdate:expandedRowKeys": t[2] || (t[2] = (n) => x.value = n),
-                  rowSelection: F.value || v.isSelection ? { selectedRowKeys: r.value, onChange: ye } : null,
-                  showPagination: v.showPagination
+                  scroll: { y: G.value, x: "100%" },
+                  pageSize: J.value,
+                  rowKey: u.rowKey,
+                  columns: ce.value,
+                  data: he,
+                  "expanded-row-keys": A.value,
+                  "onUpdate:expandedRowKeys": t[2] || (t[2] = (n) => A.value = n),
+                  rowSelection: Q.value || u.isSelection ? { selectedRowKeys: y.value, onChange: xe } : null,
+                  showPagination: u.showPagination
                 }, {
                 }, {
-                  bodyCell: C((n) => [
-                    n.column ? (a(), s(Z, { key: 0 }, [
-                      fe(n.column.dataIndex) ? c(e.$slots, n.column.dataIndex, {
+                  bodyCell: k((n) => [
+                    n.column ? (l(), s(se, { key: 0 }, [
+                      Se(n.column.dataIndex) ? p(e.$slots, n.column.dataIndex, {
                         text: n.text,
                         text: n.text,
                         record: n.record,
                         record: n.record,
                         index: n.index,
                         index: n.index,
-                        item: T(n.column.dataIndex)
-                      }, void 0, !0, 0) : me(n.column.dataIndex) ? (a(), s("a", {
+                        item: H(n.column.dataIndex)
+                      }, void 0, !0, 0) : _e(n.column.dataIndex) ? (l(), s("a", {
                         key: 1,
                         key: 1,
-                        onClick: (p) => ce(n.column.dataIndex, n.record)
-                      }, g(pe(n.text)), 9, Fe)) : n.column.dataIndex === "action" ? c(e.$slots, "action", {
+                        onClick: (g) => be(n.column.dataIndex, n.record)
+                      }, C(Oe(n.text)), 9, ct)) : n.column.dataIndex === "action" ? p(e.$slots, "action", {
                         record: n.record
                         record: n.record
-                      }, void 0, !0, 2) : d("", !0)
-                    ], 64)) : d("", !0)
+                      }, void 0, !0, 2) : c("", !0)
+                    ], 64)) : c("", !0)
                   ]),
                   ]),
                   _: 3
                   _: 3
-                }, 8, ["scroll", "pageSize", "rowKey", "columns", "data", "expanded-row-keys", "rowSelection", "showPagination"])
+                }, 8, ["scroll", "pageSize", "rowKey", "columns", "expanded-row-keys", "rowSelection", "showPagination"])
               ])
               ])
             ])
             ])
           ], 4))
           ], 4))
         ], 4),
         ], 4),
-        y(ke, {
+        m(ze, {
           ref_key: "filterRef",
           ref_key: "filterRef",
-          ref: V
-        }, null, 512),
-        y(he, {
+          ref: j,
+          columns: w.value,
+          onSubmit: ke,
+          onReset: $e
+        }, null, 8, ["columns"]),
+        m(Fe, {
           ref_key: "columnsRef",
           ref_key: "columnsRef",
-          ref: M,
+          ref: W,
           pageCode: "demo",
           pageCode: "demo",
-          onReset: t[3] || (t[3] = (n = null) => {
-            n && n(m.value);
-          })
-        }, null, 512),
-        u("div", qe, [
-          c(e.$slots, "other", {}, void 0, !0)
+          columns: w.value,
+          onSave: ge,
+          onReset: Ce
+        }, null, 8, ["columns"]),
+        f("div", ft, [
+          p(e.$slots, "other", {}, void 0, !0)
         ]),
         ]),
-        q.value ? (a(), D($e, {
+        X.value ? (l(), R(He, {
           key: 0,
           key: 0,
-          ref_key: "importModalRef",
-          ref: ne,
-          "upload-url": R.value.importUploadUrl,
-          value: b.value,
-          "onUpdate:value": t[4] || (t[4] = (n) => b.value = n),
-          columns: R.value.importColumns,
-          apis: R.value.importApis,
-          onReload: I
-        }, null, 8, ["upload-url", "value", "columns", "apis"])) : d("", !0)
+          ref: "importModalRef",
+          "upload-url": L.value.importUploadUrl,
+          value: I.value,
+          "onUpdate:value": t[3] || (t[3] = (n) => I.value = n),
+          columns: L.value.importColumns,
+          apis: L.value.importApis,
+          onReload: z
+        }, null, 8, ["upload-url", "value", "columns", "apis"])) : c("", !0)
       ], 512);
       ], 512);
     };
     };
   }
   }
-}), We = /* @__PURE__ */ Ae(je, [["__scopeId", "data-v-48633fc5"]]);
+}), wt = /* @__PURE__ */ Qe(mt, [["__scopeId", "data-v-bdd1580a"]]);
 export {
 export {
-  We as default
+  wt as default
 };
 };

Разница между файлами не показана из-за своего большого размера
+ 2 - 2
lib/js/SToggleLanguage.js


+ 79 - 79
lib/js/STopMenu.js

@@ -1,12 +1,12 @@
-import { ref as bn, computed as Ft, reactive as mn, watch as kt, onMounted as wn, openBlock as vn, createElementBlock as Tn, createElementVNode as An, createVNode as Vt, withCtx as Sn } from "vue";
+import { ref as bn, computed as Ft, reactive as mn, watch as Vt, onMounted as wn, openBlock as vn, createElementBlock as Tn, createElementVNode as An, createVNode as kt, withCtx as Sn } from "vue";
 import { useRouter as Cn } from "vue-router";
 import { useRouter as Cn } from "vue-router";
-import { cg as xn, cf as F, n as Kn, ad as Wt, cP as On, cL as jn } from "./index2.js";
-var k = { exports: {} };
-k.exports;
+import { ch as xn, cg as F, n as Kn, ad as Wt, cQ as On, cM as jn } from "./index2.js";
+var V = { exports: {} };
+V.exports;
 (function(p, h) {
 (function(p, h) {
-  var C = 200, g = "__lodash_hash_undefined__", _ = 9007199254740991, s = "[object Arguments]", I = "[object Array]", P = "[object Boolean]", $ = "[object Date]", V = "[object Error]", o = "[object Function]", c = "[object GeneratorFunction]", i = "[object Map]", d = "[object Number]", y = "[object Object]", ot = "[object Promise]", at = "[object RegExp]", R = "[object Set]", st = "[object String]", it = "[object Symbol]", W = "[object WeakMap]", ct = "[object ArrayBuffer]", B = "[object DataView]", ut = "[object Float32Array]", ft = "[object Float64Array]", lt = "[object Int8Array]", pt = "[object Int16Array]", ht = "[object Int32Array]", dt = "[object Uint8Array]", _t = "[object Uint8ClampedArray]", gt = "[object Uint16Array]", yt = "[object Uint32Array]", qt = /[\\^$.*+?()[\]{}|]/g, zt = /\w*$/, Jt = /^\[object .+?Constructor\]$/, Xt = /^(?:0|[1-9]\d*)$/, a = {};
-  a[s] = a[I] = a[ct] = a[B] = a[P] = a[$] = a[ut] = a[ft] = a[lt] = a[pt] = a[ht] = a[i] = a[d] = a[y] = a[at] = a[R] = a[st] = a[it] = a[dt] = a[_t] = a[gt] = a[yt] = !0, a[V] = a[o] = a[W] = !1;
-  var Yt = typeof F == "object" && F && F.Object === Object && F, Zt = typeof self == "object" && self && self.Object === Object && self, b = Yt || Zt || Function("return this")(), bt = h && !h.nodeType && h, mt = bt && !0 && p && !p.nodeType && p, Qt = mt && mt.exports === bt;
+  var C = 200, w = "__lodash_hash_undefined__", _ = 9007199254740991, s = "[object Arguments]", I = "[object Array]", P = "[object Boolean]", $ = "[object Date]", k = "[object Error]", o = "[object Function]", c = "[object GeneratorFunction]", i = "[object Map]", d = "[object Number]", g = "[object Object]", ot = "[object Promise]", at = "[object RegExp]", R = "[object Set]", st = "[object String]", it = "[object Symbol]", W = "[object WeakMap]", ct = "[object ArrayBuffer]", B = "[object DataView]", ut = "[object Float32Array]", ft = "[object Float64Array]", lt = "[object Int8Array]", pt = "[object Int16Array]", ht = "[object Int32Array]", dt = "[object Uint8Array]", _t = "[object Uint8ClampedArray]", gt = "[object Uint16Array]", yt = "[object Uint32Array]", qt = /[\\^$.*+?()[\]{}|]/g, zt = /\w*$/, Jt = /^\[object .+?Constructor\]$/, Qt = /^(?:0|[1-9]\d*)$/, a = {};
+  a[s] = a[I] = a[ct] = a[B] = a[P] = a[$] = a[ut] = a[ft] = a[lt] = a[pt] = a[ht] = a[i] = a[d] = a[g] = a[at] = a[R] = a[st] = a[it] = a[dt] = a[_t] = a[gt] = a[yt] = !0, a[k] = a[o] = a[W] = !1;
+  var Xt = typeof F == "object" && F && F.Object === Object && F, Yt = typeof self == "object" && self && self.Object === Object && self, y = Xt || Yt || Function("return this")(), bt = h && !h.nodeType && h, mt = bt && !0 && p && !p.nodeType && p, Zt = mt && mt.exports === bt;
   function te(t, e) {
   function te(t, e) {
     return t.set(e[0], e[1]), t;
     return t.set(e[0], e[1]), t;
   }
   }
@@ -62,12 +62,12 @@ k.exports;
       n[++e] = r;
       n[++e] = r;
     }), n;
     }), n;
   }
   }
-  var se = Array.prototype, ie = Function.prototype, G = Object.prototype, z = b["__core-js_shared__"], St = function() {
+  var se = Array.prototype, ie = Function.prototype, G = Object.prototype, z = y["__core-js_shared__"], St = function() {
     var t = /[^.]+$/.exec(z && z.keys && z.keys.IE_PROTO || "");
     var t = /[^.]+$/.exec(z && z.keys && z.keys.IE_PROTO || "");
     return t ? "Symbol(src)_1." + t : "";
     return t ? "Symbol(src)_1." + t : "";
   }(), Ct = ie.toString, v = G.hasOwnProperty, U = G.toString, ce = RegExp(
   }(), Ct = ie.toString, v = G.hasOwnProperty, U = G.toString, ce = RegExp(
     "^" + Ct.call(v).replace(qt, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$"
     "^" + Ct.call(v).replace(qt, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$"
-  ), xt = Qt ? b.Buffer : void 0, Kt = b.Symbol, Ot = b.Uint8Array, ue = q(Object.getPrototypeOf, Object), fe = Object.create, le = G.propertyIsEnumerable, pe = se.splice, jt = Object.getOwnPropertySymbols, he = xt ? xt.isBuffer : void 0, de = q(Object.keys, Object), J = O(b, "DataView"), E = O(b, "Map"), X = O(b, "Promise"), Y = O(b, "Set"), Z = O(b, "WeakMap"), M = O(Object, "create"), _e = S(J), ge = S(E), ye = S(X), be = S(Y), me = S(Z), Et = Kt ? Kt.prototype : void 0, Mt = Et ? Et.valueOf : void 0;
+  ), xt = Zt ? y.Buffer : void 0, Kt = y.Symbol, Ot = y.Uint8Array, ue = q(Object.getPrototypeOf, Object), fe = Object.create, le = G.propertyIsEnumerable, pe = se.splice, jt = Object.getOwnPropertySymbols, he = xt ? xt.isBuffer : void 0, de = q(Object.keys, Object), J = O(y, "DataView"), E = O(y, "Map"), Q = O(y, "Promise"), X = O(y, "Set"), Y = O(y, "WeakMap"), M = O(Object, "create"), _e = S(J), ge = S(E), ye = S(Q), be = S(X), me = S(Y), Et = Kt ? Kt.prototype : void 0, Mt = Et ? Et.valueOf : void 0;
   function T(t) {
   function T(t) {
     var e = -1, n = t ? t.length : 0;
     var e = -1, n = t ? t.length : 0;
     for (this.clear(); ++e < n; ) {
     for (this.clear(); ++e < n; ) {
@@ -85,7 +85,7 @@ k.exports;
     var e = this.__data__;
     var e = this.__data__;
     if (M) {
     if (M) {
       var n = e[t];
       var n = e[t];
-      return n === g ? void 0 : n;
+      return n === w ? void 0 : n;
     }
     }
     return v.call(e, t) ? e[t] : void 0;
     return v.call(e, t) ? e[t] : void 0;
   }
   }
@@ -95,10 +95,10 @@ k.exports;
   }
   }
   function Se(t, e) {
   function Se(t, e) {
     var n = this.__data__;
     var n = this.__data__;
-    return n[t] = M && e === void 0 ? g : e, this;
+    return n[t] = M && e === void 0 ? w : e, this;
   }
   }
   T.prototype.clear = we, T.prototype.delete = ve, T.prototype.get = Te, T.prototype.has = Ae, T.prototype.set = Se;
   T.prototype.clear = we, T.prototype.delete = ve, T.prototype.get = Te, T.prototype.has = Ae, T.prototype.set = Se;
-  function m(t) {
+  function b(t) {
     var e = -1, n = t ? t.length : 0;
     var e = -1, n = t ? t.length : 0;
     for (this.clear(); ++e < n; ) {
     for (this.clear(); ++e < n; ) {
       var r = t[e];
       var r = t[e];
@@ -109,24 +109,24 @@ k.exports;
     this.__data__ = [];
     this.__data__ = [];
   }
   }
   function xe(t) {
   function xe(t) {
-    var e = this.__data__, n = L(e, t);
+    var e = this.__data__, n = H(e, t);
     if (n < 0)
     if (n < 0)
       return !1;
       return !1;
     var r = e.length - 1;
     var r = e.length - 1;
     return n == r ? e.pop() : pe.call(e, n, 1), !0;
     return n == r ? e.pop() : pe.call(e, n, 1), !0;
   }
   }
   function Ke(t) {
   function Ke(t) {
-    var e = this.__data__, n = L(e, t);
+    var e = this.__data__, n = H(e, t);
     return n < 0 ? void 0 : e[n][1];
     return n < 0 ? void 0 : e[n][1];
   }
   }
   function Oe(t) {
   function Oe(t) {
-    return L(this.__data__, t) > -1;
+    return H(this.__data__, t) > -1;
   }
   }
   function je(t, e) {
   function je(t, e) {
-    var n = this.__data__, r = L(n, t);
+    var n = this.__data__, r = H(n, t);
     return r < 0 ? n.push([t, e]) : n[r][1] = e, this;
     return r < 0 ? n.push([t, e]) : n[r][1] = e, this;
   }
   }
-  m.prototype.clear = Ce, m.prototype.delete = xe, m.prototype.get = Ke, m.prototype.has = Oe, m.prototype.set = je;
+  b.prototype.clear = Ce, b.prototype.delete = xe, b.prototype.get = Ke, b.prototype.has = Oe, b.prototype.set = je;
   function x(t) {
   function x(t) {
     var e = -1, n = t ? t.length : 0;
     var e = -1, n = t ? t.length : 0;
     for (this.clear(); ++e < n; ) {
     for (this.clear(); ++e < n; ) {
@@ -137,28 +137,28 @@ k.exports;
   function Ee() {
   function Ee() {
     this.__data__ = {
     this.__data__ = {
       hash: new T(),
       hash: new T(),
-      map: new (E || m)(),
+      map: new (E || b)(),
       string: new T()
       string: new T()
     };
     };
   }
   }
   function Me(t) {
   function Me(t) {
-    return H(this, t).delete(t);
+    return L(this, t).delete(t);
   }
   }
   function Ie(t) {
   function Ie(t) {
-    return H(this, t).get(t);
+    return L(this, t).get(t);
   }
   }
   function Pe(t) {
   function Pe(t) {
-    return H(this, t).has(t);
+    return L(this, t).has(t);
   }
   }
   function $e(t, e) {
   function $e(t, e) {
-    return H(this, t).set(t, e), this;
+    return L(this, t).set(t, e), this;
   }
   }
   x.prototype.clear = Ee, x.prototype.delete = Me, x.prototype.get = Ie, x.prototype.has = Pe, x.prototype.set = $e;
   x.prototype.clear = Ee, x.prototype.delete = Me, x.prototype.get = Ie, x.prototype.has = Pe, x.prototype.set = $e;
   function K(t) {
   function K(t) {
-    this.__data__ = new m(t);
+    this.__data__ = new b(t);
   }
   }
   function Re() {
   function Re() {
-    this.__data__ = new m();
+    this.__data__ = new b();
   }
   }
   function Be(t) {
   function Be(t) {
     return this.__data__.delete(t);
     return this.__data__.delete(t);
@@ -169,9 +169,9 @@ k.exports;
   function Ue(t) {
   function Ue(t) {
     return this.__data__.has(t);
     return this.__data__.has(t);
   }
   }
-  function Le(t, e) {
+  function He(t, e) {
     var n = this.__data__;
     var n = this.__data__;
-    if (n instanceof m) {
+    if (n instanceof b) {
       var r = n.__data__;
       var r = n.__data__;
       if (!E || r.length < C - 1)
       if (!E || r.length < C - 1)
         return r.push([t, e]), this;
         return r.push([t, e]), this;
@@ -179,8 +179,8 @@ k.exports;
     }
     }
     return n.set(t, e), this;
     return n.set(t, e), this;
   }
   }
-  K.prototype.clear = Re, K.prototype.delete = Be, K.prototype.get = Ge, K.prototype.has = Ue, K.prototype.set = Le;
-  function He(t, e) {
+  K.prototype.clear = Re, K.prototype.delete = Be, K.prototype.get = Ge, K.prototype.has = Ue, K.prototype.set = He;
+  function Le(t, e) {
     var n = et(t) || ln(t) ? oe(t.length, String) : [], r = n.length, u = !!r;
     var n = et(t) || ln(t) ? oe(t.length, String) : [], r = n.length, u = !!r;
     for (var f in t)
     for (var f in t)
       v.call(t, f) && !(u && (f == "length" || sn(f, r))) && n.push(f);
       v.call(t, f) && !(u && (f == "length" || sn(f, r))) && n.push(f);
@@ -190,7 +190,7 @@ k.exports;
     var r = t[e];
     var r = t[e];
     (!(v.call(t, e) && Bt(r, n)) || n === void 0 && !(e in t)) && (t[e] = n);
     (!(v.call(t, e) && Bt(r, n)) || n === void 0 && !(e in t)) && (t[e] = n);
   }
   }
-  function L(t, e) {
+  function H(t, e) {
     for (var n = t.length; n--; )
     for (var n = t.length; n--; )
       if (Bt(t[n][0], e))
       if (Bt(t[n][0], e))
         return n;
         return n;
@@ -199,39 +199,39 @@ k.exports;
   function Ne(t, e) {
   function Ne(t, e) {
     return t && Pt(e, nt(e), t);
     return t && Pt(e, nt(e), t);
   }
   }
-  function Q(t, e, n, r, u, f, w) {
+  function Z(t, e, n, r, u, f, m) {
     var l;
     var l;
-    if (r && (l = f ? r(t, u, f, w) : r(t)), l !== void 0)
+    if (r && (l = f ? r(t, u, f, m) : r(t)), l !== void 0)
       return l;
       return l;
     if (!N(t))
     if (!N(t))
       return t;
       return t;
-    var Lt = et(t);
-    if (Lt) {
+    var Ht = et(t);
+    if (Ht) {
       if (l = rn(t), !e)
       if (l = rn(t), !e)
         return tn(t, l);
         return tn(t, l);
     } else {
     } else {
-      var j = A(t), Ht = j == o || j == c;
+      var j = A(t), Lt = j == o || j == c;
       if (hn(t))
       if (hn(t))
         return qe(t, e);
         return qe(t, e);
-      if (j == y || j == s || Ht && !f) {
+      if (j == g || j == s || Lt && !f) {
         if (vt(t))
         if (vt(t))
           return f ? t : {};
           return f ? t : {};
-        if (l = on(Ht ? {} : t), !e)
+        if (l = on(Lt ? {} : t), !e)
           return en(t, Ne(l, t));
           return en(t, Ne(l, t));
       } else {
       } else {
         if (!a[j])
         if (!a[j])
           return f ? t : {};
           return f ? t : {};
-        l = an(t, j, Q, e);
+        l = an(t, j, Z, e);
       }
       }
     }
     }
-    w || (w = new K());
-    var Nt = w.get(t);
+    m || (m = new K());
+    var Nt = m.get(t);
     if (Nt)
     if (Nt)
       return Nt;
       return Nt;
-    if (w.set(t, l), !Lt)
+    if (m.set(t, l), !Ht)
       var Dt = n ? nn(t) : nt(t);
       var Dt = n ? nn(t) : nt(t);
     return ne(Dt || t, function(rt, D) {
     return ne(Dt || t, function(rt, D) {
-      Dt && (D = rt, rt = t[D]), It(l, D, Q(rt, e, n, r, D, t, w));
+      Dt && (D = rt, rt = t[D]), It(l, D, Z(rt, e, n, r, D, t, m));
     }), l;
     }), l;
   }
   }
   function De(t) {
   function De(t) {
@@ -241,10 +241,10 @@ k.exports;
     var r = e(t);
     var r = e(t);
     return et(t) ? r : re(r, n(t));
     return et(t) ? r : re(r, n(t));
   }
   }
-  function ke(t) {
+  function Ve(t) {
     return U.call(t);
     return U.call(t);
   }
   }
-  function Ve(t) {
+  function ke(t) {
     if (!N(t) || un(t))
     if (!N(t) || un(t))
       return !1;
       return !1;
     var e = Ut(t) || vt(t) ? ce : Jt;
     var e = Ut(t) || vt(t) ? ce : Jt;
@@ -276,18 +276,18 @@ k.exports;
     var r = e ? n(Tt(t), !0) : Tt(t);
     var r = e ? n(Tt(t), !0) : Tt(t);
     return wt(r, te, new t.constructor());
     return wt(r, te, new t.constructor());
   }
   }
-  function Xe(t) {
+  function Qe(t) {
     var e = new t.constructor(t.source, zt.exec(t));
     var e = new t.constructor(t.source, zt.exec(t));
     return e.lastIndex = t.lastIndex, e;
     return e.lastIndex = t.lastIndex, e;
   }
   }
-  function Ye(t, e, n) {
+  function Xe(t, e, n) {
     var r = e ? n(At(t), !0) : At(t);
     var r = e ? n(At(t), !0) : At(t);
     return wt(r, ee, new t.constructor());
     return wt(r, ee, new t.constructor());
   }
   }
-  function Ze(t) {
+  function Ye(t) {
     return Mt ? Object(Mt.call(t)) : {};
     return Mt ? Object(Mt.call(t)) : {};
   }
   }
-  function Qe(t, e) {
+  function Ze(t, e) {
     var n = e ? tt(t.buffer) : t.buffer;
     var n = e ? tt(t.buffer) : t.buffer;
     return new t.constructor(n, t.byteOffset, t.length);
     return new t.constructor(n, t.byteOffset, t.length);
   }
   }
@@ -300,8 +300,8 @@ k.exports;
   function Pt(t, e, n, r) {
   function Pt(t, e, n, r) {
     n || (n = {});
     n || (n = {});
     for (var u = -1, f = e.length; ++u < f; ) {
     for (var u = -1, f = e.length; ++u < f; ) {
-      var w = e[u], l = void 0;
-      It(n, w, l === void 0 ? t[w] : l);
+      var m = e[u], l = void 0;
+      It(n, m, l === void 0 ? t[m] : l);
     }
     }
     return n;
     return n;
   }
   }
@@ -311,17 +311,17 @@ k.exports;
   function nn(t) {
   function nn(t) {
     return Fe(t, nt, $t);
     return Fe(t, nt, $t);
   }
   }
-  function H(t, e) {
+  function L(t, e) {
     var n = t.__data__;
     var n = t.__data__;
     return cn(e) ? n[typeof e == "string" ? "string" : "hash"] : n.map;
     return cn(e) ? n[typeof e == "string" ? "string" : "hash"] : n.map;
   }
   }
   function O(t, e) {
   function O(t, e) {
     var n = ae(t, e);
     var n = ae(t, e);
-    return Ve(n) ? n : void 0;
+    return ke(n) ? n : void 0;
   }
   }
-  var $t = jt ? q(jt, Object) : gn, A = ke;
-  (J && A(new J(new ArrayBuffer(1))) != B || E && A(new E()) != i || X && A(X.resolve()) != ot || Y && A(new Y()) != R || Z && A(new Z()) != W) && (A = function(t) {
-    var e = U.call(t), n = e == y ? t.constructor : void 0, r = n ? S(n) : void 0;
+  var $t = jt ? q(jt, Object) : gn, A = Ve;
+  (J && A(new J(new ArrayBuffer(1))) != B || E && A(new E()) != i || Q && A(Q.resolve()) != ot || X && A(new X()) != R || Y && A(new Y()) != W) && (A = function(t) {
+    var e = U.call(t), n = e == g ? t.constructor : void 0, r = n ? S(n) : void 0;
     if (r)
     if (r)
       switch (r) {
       switch (r) {
         case _e:
         case _e:
@@ -363,22 +363,22 @@ k.exports;
       case _t:
       case _t:
       case gt:
       case gt:
       case yt:
       case yt:
-        return Qe(t, r);
+        return Ze(t, r);
       case i:
       case i:
         return Je(t, r, n);
         return Je(t, r, n);
       case d:
       case d:
       case st:
       case st:
         return new u(t);
         return new u(t);
       case at:
       case at:
-        return Xe(t);
+        return Qe(t);
       case R:
       case R:
-        return Ye(t, r, n);
+        return Xe(t, r, n);
       case it:
       case it:
-        return Ze(t);
+        return Ye(t);
     }
     }
   }
   }
   function sn(t, e) {
   function sn(t, e) {
-    return e = e == null ? _ : e, !!e && (typeof t == "number" || Xt.test(t)) && t > -1 && t % 1 == 0 && t < e;
+    return e = e == null ? _ : e, !!e && (typeof t == "number" || Qt.test(t)) && t > -1 && t % 1 == 0 && t < e;
   }
   }
   function cn(t) {
   function cn(t) {
     var e = typeof t;
     var e = typeof t;
@@ -405,7 +405,7 @@ k.exports;
     return "";
     return "";
   }
   }
   function fn(t) {
   function fn(t) {
-    return Q(t, !0, !0);
+    return Z(t, !0, !0);
   }
   }
   function Bt(t, e) {
   function Bt(t, e) {
     return t === e || t !== t && e !== e;
     return t === e || t !== t && e !== e;
@@ -436,7 +436,7 @@ k.exports;
     return !!t && typeof t == "object";
     return !!t && typeof t == "object";
   }
   }
   function nt(t) {
   function nt(t) {
-    return Gt(t) ? He(t) : We(t);
+    return Gt(t) ? Le(t) : We(t);
   }
   }
   function gn() {
   function gn() {
     return [];
     return [];
@@ -445,8 +445,8 @@ k.exports;
     return !1;
     return !1;
   }
   }
   p.exports = fn;
   p.exports = fn;
-})(k, k.exports);
-var En = k.exports;
+})(V, V.exports);
+var En = V.exports;
 const Mn = /* @__PURE__ */ xn(En);
 const Mn = /* @__PURE__ */ xn(En);
 function In(p) {
 function In(p) {
   if (!p) return null;
   if (!p) return null;
@@ -454,7 +454,7 @@ function In(p) {
   let h = Array.isArray(p) ? p.concat() : [p];
   let h = Array.isArray(p) ? p.concat() : [p];
   for (; h.length; ) {
   for (; h.length; ) {
     const C = h.length;
     const C = h.length;
-    for (let g = 0; g < C; g++) {
+    for (let w = 0; w < C; w++) {
       const _ = h.shift();
       const _ = h.shift();
       !_.children || !_.children.length || (_.children.forEach((s) => {
       !_.children || !_.children.length || (_.children.forEach((s) => {
         s.path[0] !== "/" && !s.path.startsWith("http") && (s.path = _.path.replace(/(\w*)[/]*$/, `$1/${s.path}`));
         s.path[0] !== "/" && !s.path.startsWith("http") && (s.path = _.path.replace(/(\w*)[/]*$/, `$1/${s.path}`));
@@ -466,16 +466,16 @@ function In(p) {
 const Pn = { class: "s-menu-top-common" }, $n = { class: "menu-wrap" }, Rn = {
 const Pn = { class: "s-menu-top-common" }, $n = { class: "menu-wrap" }, Rn = {
   __name: "STopMenu",
   __name: "STopMenu",
   setup(p) {
   setup(p) {
-    const h = Cn(), C = Wt(), g = bn(""), _ = Ft(() => {
+    const h = Cn(), C = Wt(), w = bn(""), _ = Ft(() => {
       const o = window.$menuTheme;
       const o = window.$menuTheme;
-      return g.value !== "dark" || !o || !o.token ? {} : { components: { Menu: o.token } };
+      return !o || !o.token ? {} : { components: { Menu: o.token } };
     }), s = mn({
     }), s = mn({
       collapsed: !1,
       collapsed: !1,
       selectedKeys: [],
       selectedKeys: [],
       openKeys: [],
       openKeys: [],
       preOpenKeys: []
       preOpenKeys: []
     });
     });
-    kt(
+    Vt(
       () => s.openKeys,
       () => s.openKeys,
       (o, c) => {
       (o, c) => {
         s.preOpenKeys = c;
         s.preOpenKeys = c;
@@ -499,17 +499,17 @@ const Pn = { class: "s-menu-top-common" }, $n = { class: "menu-wrap" }, Rn = {
       }));
       }));
     }), $ = (o) => {
     }), $ = (o) => {
       h.push(o.key), s.selectedKeys = [o.key], window.$utils.ls.set("selectedKeys", s.selectedKeys);
       h.push(o.key), s.selectedKeys = [o.key], window.$utils.ls.set("selectedKeys", s.selectedKeys);
-    }, V = (o) => {
-      const c = o.filter((y) => !s.preOpenKeys.includes(y)), i = c[c.length - 1];
+    }, k = (o) => {
+      const c = o.filter((g) => !s.preOpenKeys.includes(g)), i = c[c.length - 1];
       s.openKeys = [i], Wt().setMenuOpenKeys(s.openKeys);
       s.openKeys = [i], Wt().setMenuOpenKeys(s.openKeys);
     };
     };
     return wn(() => {
     return wn(() => {
-      g.value = window.$utils.env.VITE_APP_MENU_THEME || "dark";
+      w.value = window.$utils.env.VITE_APP_MENU_THEME || "light";
       const o = location.pathname;
       const o = location.pathname;
       window.$utils.ls.set("selectedKeys", [o]), s.selectedKeys = window.$utils.ls.get("selectedKeys") || [];
       window.$utils.ls.set("selectedKeys", [o]), s.selectedKeys = window.$utils.ls.get("selectedKeys") || [];
       const c = C.openKeys || [];
       const c = C.openKeys || [];
       s.openKeys = c;
       s.openKeys = c;
-    }), kt(
+    }), Vt(
       () => {
       () => {
         var o;
         var o;
         return (o = h.currentRoute.value) == null ? void 0 : o.path;
         return (o = h.currentRoute.value) == null ? void 0 : o.path;
@@ -521,18 +521,18 @@ const Pn = { class: "s-menu-top-common" }, $n = { class: "menu-wrap" }, Rn = {
       const i = jn, d = On;
       const i = jn, d = On;
       return vn(), Tn("div", Pn, [
       return vn(), Tn("div", Pn, [
         An("div", $n, [
         An("div", $n, [
-          Vt(d, { theme: _.value }, {
+          kt(d, { theme: _.value }, {
             default: Sn(() => [
             default: Sn(() => [
-              Vt(i, {
+              kt(i, {
                 openKeys: s.openKeys,
                 openKeys: s.openKeys,
-                "onUpdate:openKeys": c[0] || (c[0] = (y) => s.openKeys = y),
+                "onUpdate:openKeys": c[0] || (c[0] = (g) => s.openKeys = g),
                 selectedKeys: s.selectedKeys,
                 selectedKeys: s.selectedKeys,
-                "onUpdate:selectedKeys": c[1] || (c[1] = (y) => s.selectedKeys = y),
+                "onUpdate:selectedKeys": c[1] || (c[1] = (g) => s.selectedKeys = g),
                 mode: "horizontal",
                 mode: "horizontal",
-                theme: g.value,
+                theme: w.value,
                 items: P.value,
                 items: P.value,
                 onSelect: $,
                 onSelect: $,
-                onOpenChange: V
+                onOpenChange: k
               }, null, 8, ["openKeys", "selectedKeys", "theme", "items"])
               }, null, 8, ["openKeys", "selectedKeys", "theme", "items"])
             ]),
             ]),
             _: 1
             _: 1
@@ -541,7 +541,7 @@ const Pn = { class: "s-menu-top-common" }, $n = { class: "menu-wrap" }, Rn = {
       ]);
       ]);
     };
     };
   }
   }
-}, Ln = /* @__PURE__ */ Kn(Rn, [["__scopeId", "data-v-bc74c88c"]]);
+}, Hn = /* @__PURE__ */ Kn(Rn, [["__scopeId", "data-v-4cab84cd"]]);
 export {
 export {
-  Ln as default
+  Hn as default
 };
 };

+ 11 - 11
lib/js/STree.js

@@ -14,12 +14,12 @@ var m = (d, v, o) => new Promise((r, t) => {
   }, c = (a) => a.done ? r(a.value) : Promise.resolve(a.value).then(i, s);
   }, c = (a) => a.done ? r(a.value) : Promise.resolve(a.value).then(i, s);
   c((o = o.apply(d, v)).next());
   c((o = o.apply(d, v)).next());
 });
 });
-import { ref as h, onMounted as b, openBlock as _, createElementBlock as k, createVNode as B, withCtx as y, createBlock as C, createElementVNode as x, toDisplayString as f, createTextVNode as D, normalizeClass as S } from "vue";
-import { n as V, x as I, y as E } from "./index2.js";
-const N = { class: "s-tree-common" }, O = { class: "node-title" }, T = {
+import { ref as h, onMounted as b, openBlock as _, createElementBlock as k, createVNode as B, withCtx as y, createBlock as C, createElementVNode as x, toDisplayString as f, createTextVNode as D, normalizeClass as V } from "vue";
+import { x as S, y as E } from "./index2.js";
+const I = { class: "s-tree-common" }, N = { class: "node-title" }, O = {
   key: 1,
   key: 1,
   class: "node-title"
   class: "node-title"
-}, F = {
+}, A = {
   __name: "STree",
   __name: "STree",
   props: {
   props: {
     // 是否展开所有节点
     // 是否展开所有节点
@@ -96,8 +96,8 @@ const N = { class: "s-tree-common" }, O = { class: "node-title" }, T = {
     return b(() => {
     return b(() => {
       K();
       K();
     }), (n, e) => {
     }), (n, e) => {
-      const p = E, w = I;
-      return _(), k("div", N, [
+      const p = E, w = S;
+      return _(), k("div", I, [
         B(w, {
         B(w, {
           selectedKeys: i.value,
           selectedKeys: i.value,
           "onUpdate:selectedKeys": e[0] || (e[0] = (l) => i.value = l),
           "onUpdate:selectedKeys": e[0] || (e[0] = (l) => i.value = l),
@@ -115,7 +115,7 @@ const N = { class: "s-tree-common" }, O = { class: "node-title" }, T = {
         }, {
         }, {
           icon: y((l) => [
           icon: y((l) => [
             x("div", {
             x("div", {
-              class: S(["node-icon", g(l.type)])
+              class: V(["node-icon", g(l.type)])
             }, f(g(l.type)), 3)
             }, f(g(l.type)), 3)
           ]),
           ]),
           title: y((l) => [
           title: y((l) => [
@@ -129,17 +129,17 @@ const N = { class: "s-tree-common" }, O = { class: "node-title" }, T = {
                 D(f(l.title), 1)
                 D(f(l.title), 1)
               ]),
               ]),
               default: y(() => [
               default: y(() => [
-                x("div", O, f((l.title || "").slice(0, 15)) + "...", 1)
+                x("div", N, f((l.title || "").slice(0, 15)) + "...", 1)
               ]),
               ]),
               _: 2
               _: 2
-            }, 1024)) : (_(), k("div", T, f(l.title), 1))
+            }, 1024)) : (_(), k("div", O, f(l.title), 1))
           ]),
           ]),
           _: 1
           _: 1
         }, 8, ["selectedKeys", "checkedKeys", "expandedKeys", "default-expand-all", "checkable", "tree-data", "showIcon", "height"])
         }, 8, ["selectedKeys", "checkedKeys", "expandedKeys", "default-expand-all", "checkable", "tree-data", "showIcon", "height"])
       ]);
       ]);
     };
     };
   }
   }
-}, U = /* @__PURE__ */ V(F, [["__scopeId", "data-v-63703ca2"]]);
+};
 export {
 export {
-  U as default
+  A as default
 };
 };

+ 1 - 1
lib/js/SUserSelect.js

@@ -15,7 +15,7 @@ var R = (S, F, w) => new Promise((I, m) => {
   g((w = w.apply(S, F)).next());
   g((w = w.apply(S, F)).next());
 });
 });
 import { ref as u, watch as Ce, onMounted as ke, resolveComponent as J, openBlock as d, createElementBlock as v, createVNode as f, withCtx as $, createElementVNode as s, toDisplayString as i, createTextVNode as b, createCommentVNode as te, Fragment as j, renderList as ae } from "vue";
 import { ref as u, watch as Ce, onMounted as ke, resolveComponent as J, openBlock as d, createElementBlock as v, createVNode as f, withCtx as $, createElementVNode as s, toDisplayString as i, createTextVNode as b, createCommentVNode as te, Fragment as j, renderList as ae } from "vue";
-import { aq as Se, B as we, da as se, d0 as $e, d1 as be, db as Ee } from "./index2.js";
+import { aq as Se, B as we, db as se, d1 as $e, d2 as be, dc as Ee } from "./index2.js";
 const Ae = { class: "s-office-select-common" }, Le = { class: "modal-container" }, Ne = { class: "side" }, Ie = { class: "main" }, Te = { class: "filter" }, Ue = { class: "list-wrap" }, Ve = { class: "item left-wrap" }, Oe = { class: "head" }, Be = { class: "sub-title" }, qe = {
 const Ae = { class: "s-office-select-common" }, Le = { class: "modal-container" }, Ne = { class: "side" }, Ie = { class: "main" }, Te = { class: "filter" }, Ue = { class: "list-wrap" }, Ve = { class: "item left-wrap" }, Oe = { class: "head" }, Be = { class: "sub-title" }, qe = {
   key: 0,
   key: 0,
   class: "right"
   class: "right"

+ 161 - 87
lib/js/SettingColumns.js

@@ -1,117 +1,191 @@
-import { ref as _, resolveComponent as m, openBlock as V, createBlock as B, withCtx as a, createElementVNode as o, toDisplayString as i, createVNode as d, unref as N, createTextVNode as c } from "vue";
-import { d as O } from "./vuedraggable.js";
-import { n as D, d7 as E, B as H } from "./index2.js";
-import { _ as T } from "./index7.js";
-import { _ as j } from "./index8.js";
-const q = { class: "drawer-wrap" }, z = { class: "content-wrap" }, K = { class: "table-wrap" }, R = { class: "title" }, W = { class: "columns-wrap" }, A = { class: "item" }, G = { class: "td-item flex-start" }, J = { class: "drag-icon" }, L = { class: "checkbox" }, M = { class: "checkbox" }, P = { class: "name" }, Q = { class: "td-item" }, X = { style: { "margin-right": "8px" } }, Y = { class: "drawer-footer" }, Z = /* @__PURE__ */ Object.assign({ name: "SettingColumns" }, {
+var K = Object.defineProperty, G = Object.defineProperties;
+var J = Object.getOwnPropertyDescriptors;
+var v = Object.getOwnPropertySymbols;
+var I = Object.prototype.hasOwnProperty, $ = Object.prototype.propertyIsEnumerable;
+var F = (n, t, s) => t in n ? K(n, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : n[t] = s, C = (n, t) => {
+  for (var s in t || (t = {}))
+    I.call(t, s) && F(n, s, t[s]);
+  if (v)
+    for (var s of v(t))
+      $.call(t, s) && F(n, s, t[s]);
+  return n;
+}, b = (n, t) => G(n, J(t));
+var N = (n, t) => {
+  var s = {};
+  for (var a in n)
+    I.call(n, a) && t.indexOf(a) < 0 && (s[a] = n[a]);
+  if (n != null && v)
+    for (var a of v(n))
+      t.indexOf(a) < 0 && $.call(n, a) && (s[a] = n[a]);
+  return s;
+};
+import { ref as B, watch as L, resolveComponent as D, openBlock as P, createBlock as Q, withCtx as f, createElementVNode as i, toDisplayString as u, createVNode as r, unref as X, createTextVNode as g } from "vue";
+import { d as Y } from "./vuedraggable.js";
+import { n as Z, d8 as ee, B as ne } from "./index2.js";
+import { _ as te } from "./index7.js";
+import { _ as se } from "./index8.js";
+const oe = { class: "drawer-wrap" }, ie = { class: "content-wrap" }, ae = { class: "table-wrap" }, de = { class: "title" }, le = { class: "columns-wrap" }, ce = { class: "item" }, re = { class: "td-item flex-start" }, ue = { class: "drag-icon" }, he = { class: "checkbox" }, fe = { class: "checkbox" }, _e = { class: "name" }, pe = { class: "td-item" }, me = { style: { "margin-right": "8px" } }, ve = { class: "drawer-footer" }, ge = /* @__PURE__ */ Object.assign({ name: "SettingColumns" }, {
   __name: "SettingColumns",
   __name: "SettingColumns",
   props: {
   props: {
     pageCode: {
     pageCode: {
       type: String,
       type: String,
       required: !0
       required: !0
+    },
+    // 源列配置(SSuperListLayout 的 renderColumns);抽屉内改的是副本,点「确定」才回写
+    columns: {
+      type: Array,
+      default: () => []
     }
     }
   },
   },
-  emits: ["reset"],
-  setup(ee, { expose: p, emit: f }) {
-    const v = f, l = _(!1), r = _([]);
-    function g(t) {
-      r.value = t.map((e) => (e.item = "item", e.width && !window.$utils.isNumber(e.width) && (e.width = parseInt(e.width)), e.fixed && (e.isFixed = !0), e.show === void 0 && (e.show = !0), e.dataIndex === "action" && (e.isFixed = !0, e.disabledFixed = !0), e)), l.value = !0;
+  emits: ["save", "reset"],
+  setup(n, { expose: t, emit: s }) {
+    const a = n, k = s, h = B(!1), p = B([]), w = /* @__PURE__ */ new Map();
+    function x(e) {
+      if (e == null || e === "") return;
+      if (typeof e == "string") {
+        const c = e.trim();
+        if (!c || c.includes("%")) return;
+        const d = parseInt(c, 10);
+        return Number.isNaN(d) ? void 0 : d;
+      }
+      const o = Number(e);
+      return Number.isFinite(o) ? Math.round(o) : void 0;
     }
     }
-    function w() {
-      v("reset", (t) => {
-        console.log(t);
+    function O(e) {
+      return e.fixed && !w.has(e.dataIndex) && w.set(e.dataIndex, e.fixed === "right" ? "right" : "left"), b(C({}, e), {
+        // 像素宽度:百分比列留空,等用户自己填
+        width: x(e.width),
+        // 原始列宽声明(例如 "20%"),用户没填像素值时原样恢复,避免把百分比列写坏
+        widthRaw: e.width,
+        // 是否显示:默认显示,只有显式 false 才隐藏
+        show: e.show !== !1,
+        // 是否冻结:fixed 有值即冻结;操作列强制冻结且不可取消
+        isFixed: !!e.fixed,
+        disabledFixed: e.dataIndex === "action" || !!e.disabledFixed
       });
       });
     }
     }
-    function C() {
+    function S() {
+      p.value = (a.columns || []).map(O);
     }
     }
-    function x(t) {
-      t.show = !t.show;
+    function R() {
+      return p.value.map((c) => {
+        var d = c, { widthRaw: e } = d, o = N(d, ["widthRaw"]);
+        const m = x(o.width);
+        return b(C({}, o), {
+          // 没填像素宽度就回到原始声明(百分比列保持原样)
+          width: m === void 0 ? e : m,
+          fixed: o.isFixed ? w.get(o.dataIndex) || "left" : !1
+        });
+      });
     }
     }
-    function b(t) {
-      t.fixed = !t.fixed;
+    function U() {
+      S(), h.value = !0;
     }
     }
-    function k({ target: { value: t } }, e) {
-      e.width = t + "px";
+    function E() {
+      k("reset");
     }
     }
-    function $() {
+    function V() {
+      k("save", R()), h.value = !1;
     }
     }
-    function S() {
+    function z() {
+      h.value = !1;
+    }
+    function H(e) {
+      e.show = !e.show;
+    }
+    function M(e) {
+      e.isFixed = !e.isFixed;
+    }
+    function T({ target: { value: e } }, o) {
+      var d;
+      const c = x(e);
+      o.width = c, c === void 0 && !String((d = o.widthRaw) != null ? d : "").includes("%") && (o.widthRaw = void 0);
+    }
+    function W() {
+    }
+    function j() {
     }
     }
-    return p({
-      show: g,
-      columns: r,
-      visible: l
-    }), (t, e) => {
-      const y = m("HolderOutlined"), u = E, U = j, F = m("UndoOutlined"), h = H, I = T;
-      return V(), B(I, {
+    return L(
+      () => a.columns,
+      () => {
+        h.value && S();
+      },
+      { deep: !0 }
+    ), t({
+      show: U,
+      columns: p,
+      visible: h
+    }), (e, o) => {
+      const c = D("HolderOutlined"), d = ee, m = se, q = D("UndoOutlined"), y = ne, A = te;
+      return P(), Q(A, {
         rootClassName: "filter-columns-wrap",
         rootClassName: "filter-columns-wrap",
-        title: `${t.$l("高级表格")}`,
+        title: `${e.$l("高级表格")}`,
         placement: "right",
         placement: "right",
         width: 700,
         width: 700,
-        visible: l.value,
-        onClose: e[1] || (e[1] = (s) => l.value = !1)
+        visible: h.value,
+        onClose: z
       }, {
       }, {
-        default: a(() => [
-          o("div", q, [
-            o("div", z, [
-              o("div", K, [
-                o("div", R, i(t.$l("勾选要显示的列,拖动排序")), 1),
-                o("div", W, [
-                  d(N(O), {
-                    list: r.value,
+        default: f(() => [
+          i("div", oe, [
+            i("div", ie, [
+              i("div", ae, [
+                i("div", de, u(e.$l("勾选要显示的列,拖动排序")), 1),
+                i("div", le, [
+                  r(X(Y), {
+                    list: p.value,
                     itemKey: "dataIndex",
                     itemKey: "dataIndex",
                     handle: ".mover",
                     handle: ".mover",
                     animation: "300",
                     animation: "300",
                     "ghost-class": "ghost",
                     "ghost-class": "ghost",
                     "chosen-class": "chosenClass",
                     "chosen-class": "chosenClass",
                     touchStartThreshold: 20,
                     touchStartThreshold: 20,
-                    onStart: $,
-                    onEnd: S
+                    onStart: W,
+                    onEnd: j
                   }, {
                   }, {
-                    item: a(({ element: s }) => [
-                      o("div", A, [
-                        o("div", G, [
-                          o("div", J, [
-                            d(y),
-                            e[2] || (e[2] = o("div", { class: "mask mover" }, null, -1))
+                    item: f(({ element: l }) => [
+                      i("div", ce, [
+                        i("div", re, [
+                          i("div", ue, [
+                            r(c),
+                            o[0] || (o[0] = i("div", { class: "mask mover" }, null, -1))
                           ]),
                           ]),
-                          o("div", L, [
-                            d(u, {
-                              checked: s.show,
-                              "onUpdate:checked": (n) => s.show = n,
-                              onChange: (n) => x(s)
+                          i("div", he, [
+                            r(d, {
+                              checked: l.show,
+                              onChange: (_) => H(l)
                             }, {
                             }, {
-                              default: a(() => [
-                                c(i(t.$l("显示")), 1)
+                              default: f(() => [
+                                g(u(e.$l("显示")), 1)
                               ]),
                               ]),
                               _: 1
                               _: 1
-                            }, 8, ["checked", "onUpdate:checked", "onChange"])
+                            }, 8, ["checked", "onChange"])
                           ]),
                           ]),
-                          o("div", M, [
-                            d(u, {
-                              checked: s.isFixed,
-                              "onUpdate:checked": (n) => s.isFixed = n,
-                              disabled: s.disabledFixed,
-                              onChange: (n) => b(s)
+                          i("div", fe, [
+                            r(d, {
+                              checked: l.isFixed,
+                              disabled: l.disabledFixed,
+                              onChange: (_) => M(l)
                             }, {
                             }, {
-                              default: a(() => [
-                                c(i(t.$l("冻结")), 1)
+                              default: f(() => [
+                                g(u(e.$l("冻结")), 1)
                               ]),
                               ]),
                               _: 1
                               _: 1
-                            }, 8, ["checked", "onUpdate:checked", "disabled", "onChange"])
+                            }, 8, ["checked", "disabled", "onChange"])
                           ]),
                           ]),
-                          o("div", P, i(s.title || s.name), 1)
+                          i("div", _e, u(l.title || l.name), 1)
                         ]),
                         ]),
-                        o("div", Q, [
-                          o("span", X, i(t.$l("宽度")), 1),
-                          d(U, {
+                        i("div", pe, [
+                          i("span", me, u(e.$l("宽度")), 1),
+                          r(m, {
                             style: { width: "80px" },
                             style: { width: "80px" },
                             size: "small",
                             size: "small",
-                            modelValue: s.width,
-                            "onUpdate:modelValue": (n) => s.width = n,
-                            onBlur: (n) => k(n, s)
-                          }, null, 8, ["modelValue", "onUpdate:modelValue", "onBlur"]),
-                          e[3] || (e[3] = o("span", { style: { "margin-left": "8px" } }, "px", -1))
+                            min: 1,
+                            precision: 0,
+                            value: l.width,
+                            "onUpdate:value": (_) => l.width = _,
+                            onBlur: (_) => T(_, l)
+                          }, null, 8, ["value", "onUpdate:value", "onBlur"]),
+                          o[1] || (o[1] = i("span", { style: { "margin-left": "8px" } }, "px", -1))
                         ])
                         ])
                       ])
                       ])
                     ]),
                     ]),
@@ -120,24 +194,24 @@ const q = { class: "drawer-wrap" }, z = { class: "content-wrap" }, K = { class:
                 ])
                 ])
               ])
               ])
             ]),
             ]),
-            o("div", Y, [
-              d(h, {
+            i("div", ve, [
+              r(y, {
                 class: "reset",
                 class: "reset",
-                onClick: e[0] || (e[0] = (s) => w())
+                onClick: E
               }, {
               }, {
-                default: a(() => [
-                  d(F),
-                  c(i(t.$l("重置")), 1)
+                default: f(() => [
+                  r(q),
+                  g(u(e.$l("重置")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               }),
               }),
-              d(h, {
+              r(y, {
                 class: "submit",
                 class: "submit",
                 type: "primary",
                 type: "primary",
-                onClick: C
+                onClick: V
               }, {
               }, {
-                default: a(() => [
-                  c(i(t.$l("确定")), 1)
+                default: f(() => [
+                  g(u(e.$l("确定")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               })
               })
@@ -148,7 +222,7 @@ const q = { class: "drawer-wrap" }, z = { class: "content-wrap" }, K = { class:
       }, 8, ["title", "visible"]);
       }, 8, ["title", "visible"]);
     };
     };
   }
   }
-}), ie = /* @__PURE__ */ D(Z, [["__scopeId", "data-v-11dd8264"]]);
+}), ye = /* @__PURE__ */ Z(ge, [["__scopeId", "data-v-ec2e4c99"]]);
 export {
 export {
-  ie as default
+  ye as default
 };
 };

+ 128 - 93
lib/js/SettingFilter.js

@@ -1,86 +1,116 @@
-import { ref as f, resolveComponent as q, openBlock as r, createBlock as F, withCtx as a, createElementVNode as _, createVNode as t, createTextVNode as s, toDisplayString as u, createElementBlock as v, Fragment as g, renderList as C } from "vue";
-import z from "./CustomInput.js";
-import { n as A, d8 as L, d9 as G, a6 as H, a7 as J, B as K } from "./index2.js";
-import { _ as Q } from "./index7.js";
-import { _ as W, a as X } from "./index9.js";
-const Y = { class: "drawer-wrap" }, Z = { class: "content-wrap" }, ee = { class: "remove-filter-wrap" }, le = { class: "drawer-footer" }, ne = /* @__PURE__ */ Object.assign({ name: "SFilter" }, {
+import { ref as w, resolveComponent as S, openBlock as f, createBlock as $, withCtx as a, createElementVNode as v, createVNode as o, createTextVNode as i, toDisplayString as r, createElementBlock as y, Fragment as g, renderList as q } from "vue";
+import Q from "./CustomInput.js";
+import { n as W, d9 as X, da as Y, a6 as Z, a7 as ee, B as le } from "./index2.js";
+import { _ as ne } from "./index7.js";
+import { _ as te, a as ae } from "./index9.js";
+const oe = { class: "drawer-wrap" }, ue = { class: "content-wrap" }, se = { class: "remove-filter-wrap" }, ie = { class: "drawer-footer" }, re = /* @__PURE__ */ Object.assign({ name: "SFilter" }, {
   __name: "SettingFilter",
   __name: "SettingFilter",
+  props: {
+    // 表格列配置(只有带 filterConfig 的列才能作为查询条件)
+    columns: {
+      type: Array,
+      default: () => []
+    }
+  },
   emits: ["reset", "submit"],
   emits: ["reset", "submit"],
-  setup(te, { expose: x, emit: O }) {
-    const V = O, S = [
+  setup(U, { expose: F, emit: N }) {
+    const x = U, T = N, I = [
       { id: "includes", name: window.$l("包含") },
       { id: "includes", name: window.$l("包含") },
       { id: "excludes", name: window.$l("不包含") },
       { id: "excludes", name: window.$l("不包含") },
       { id: "equal", name: window.$l("等于") },
       { id: "equal", name: window.$l("等于") },
       { id: "notequal", name: window.$l("不等于") },
       { id: "notequal", name: window.$l("不等于") },
       { id: "null", name: window.$l("为空") },
       { id: "null", name: window.$l("为空") },
       { id: "notnull", name: window.$l("不为空") }
       { id: "notnull", name: window.$l("不为空") }
-    ], d = f(!1), c = f({ filter: 1 }), i = f([]), w = f([]);
-    function U(o) {
-      w.value = o.filter((e) => e.show !== !1 && !!e.filterConfig), d.value = !0;
-    }
+    ], O = ["equal", "notequal", "null", "notnull"], P = I.map((l) => l.id), h = ["null", "notnull"], d = w(!1), _ = w({ filter: 1 }), u = w([]), C = w([]);
     function B() {
     function B() {
+      C.value = (x.columns || []).filter((e) => !!e.filterConfig);
+      const l = new Set((x.columns || []).map((e) => e.dataIndex));
+      u.value = u.value.filter((e) => l.has(e.dataIndex)), d.value = !0;
+    }
+    function A() {
       d.value = !1;
       d.value = !1;
     }
     }
-    function N() {
-      i.value.push({
+    function L(l) {
+      const e = l == null ? void 0 : l.filterType, c = !e || e === "INPUT" ? P : O;
+      return I.filter((p) => c.includes(p.id));
+    }
+    function k(l) {
+      return !l || l === "INPUT" ? "includes" : "equal";
+    }
+    function M() {
+      u.value.push({
         id: window.$utils.uuid(),
         id: window.$utils.uuid(),
+        dataIndex: void 0,
         name: "",
         name: "",
+        filterType: "",
         equals: "",
         equals: "",
         value: ""
         value: ""
       });
       });
     }
     }
-    function E() {
-      i.value = [], V("reset"), k();
+    function V(l, e) {
+      const s = C.value.find((p) => p.dataIndex === l);
+      if (e.dataIndex = l, !s) {
+        e.name = "", e.filterType = "", e.filterConfig = null, e.equals = "", e.value = "";
+        return;
+      }
+      const c = s.filterConfig || {};
+      e.name = s.name || s.title || "", e.filterType = c.filterType || "INPUT", e.filterConfig = c, e.equals = k(e.filterType), e.value = e.filterType === "MULTIPLE_SELECT" ? [] : "";
     }
     }
-    function k() {
-      V("submit", i.value, c.value.filter), d.value = !1;
+    function D() {
+      u.value = [], _.value = { filter: 1 }, d.value = !1, T("reset");
     }
     }
-    function I(o) {
-      i.value = i.value.filter((e) => e.id !== o.id) || [];
+    function R() {
+      const l = u.value.filter((e) => !!e.dataIndex).filter((e) => h.includes(e.equals) || !j(e.value)).map((e) => ({
+        dataIndex: e.dataIndex,
+        name: e.name,
+        filterType: e.filterType,
+        equals: e.equals || k(e.filterType),
+        value: h.includes(e.equals) ? "" : e.value
+      }));
+      d.value = !1, T("submit", l, _.value.filter);
     }
     }
-    function T(o, e) {
-      const p = w.value.find(($) => $.dataIndex === o);
-      Object.assign(e, p);
+    function j(l) {
+      return l == null || l === "" ? !0 : Array.isArray(l) ? l.length === 0 : !1;
     }
     }
-    function j(o, e) {
-      e.equals = o;
+    function z(l) {
+      u.value = u.value.filter((e) => e.id !== l.id) || [];
     }
     }
-    return x({
-      show: U,
+    return F({
+      show: B,
       visible: d,
       visible: d,
-      filters: i,
-      superFilter: c
-    }), (o, e) => {
-      const p = G, $ = L, y = X, b = J, h = H, D = q("MinusCircleOutlined"), M = W, P = q("PlusOutlined"), m = K, R = Q;
-      return r(), F(R, {
+      filters: u,
+      superFilter: _
+    }), (l, e) => {
+      const s = Y, c = X, p = ae, b = ee, E = Z, G = S("MinusCircleOutlined"), H = te, J = S("PlusOutlined"), m = le, K = ne;
+      return f(), $(K, {
         rootClassName: "filter-drawer-wrap",
         rootClassName: "filter-drawer-wrap",
-        title: `${o.$l("高级搜索")}`,
+        title: `${l.$l("高级搜索")}`,
         placement: "right",
         placement: "right",
         width: 500,
         width: 500,
         visible: d.value,
         visible: d.value,
-        onClose: B
+        onClose: A
       }, {
       }, {
         default: a(() => [
         default: a(() => [
-          _("div", Y, [
-            _("div", Z, [
-              t(M, null, {
+          v("div", oe, [
+            v("div", ue, [
+              o(H, null, {
                 default: a(() => [
                 default: a(() => [
-                  t(y, null, {
+                  o(p, null, {
                     default: a(() => [
                     default: a(() => [
-                      t($, {
-                        value: c.value.filter,
-                        "onUpdate:value": e[0] || (e[0] = (l) => c.value.filter = l)
+                      o(c, {
+                        value: _.value.filter,
+                        "onUpdate:value": e[0] || (e[0] = (n) => _.value.filter = n)
                       }, {
                       }, {
                         default: a(() => [
                         default: a(() => [
-                          t(p, { value: 1 }, {
+                          o(s, { value: 1 }, {
                             default: a(() => [
                             default: a(() => [
-                              s(u(o.$l("以下全部条件")), 1)
+                              i(r(l.$l("以下全部条件")), 1)
                             ]),
                             ]),
                             _: 1
                             _: 1
                           }),
                           }),
-                          t(p, { value: 2 }, {
+                          o(s, { value: 2 }, {
                             default: a(() => [
                             default: a(() => [
-                              s(u(o.$l("以下任意条件")), 1)
+                              i(r(l.$l("以下任意条件")), 1)
                             ]),
                             ]),
                             _: 1
                             _: 1
                           })
                           })
@@ -90,60 +120,65 @@ const Y = { class: "drawer-wrap" }, Z = { class: "content-wrap" }, ee = { class:
                     ]),
                     ]),
                     _: 1
                     _: 1
                   }),
                   }),
-                  t(y, null, {
+                  o(p, null, {
                     default: a(() => [
                     default: a(() => [
-                      (r(!0), v(g, null, C(i.value, (l) => (r(), v("div", {
+                      (f(!0), y(g, null, q(u.value, (n) => (f(), y("div", {
                         class: "filter-item",
                         class: "filter-item",
-                        key: l.id
+                        key: n.id
                       }, [
                       }, [
-                        t(h, {
+                        o(E, {
                           style: { width: "240px" },
                           style: { width: "240px" },
-                          modelValue: l.filterType,
-                          "onUpdate:modelValue": (n) => l.filterType = n,
-                          onChange: (n) => T(n, l)
+                          value: n.dataIndex,
+                          "onUpdate:value": (t) => n.dataIndex = t,
+                          placeholder: l.$l("请选择"),
+                          "show-search": "",
+                          "allow-clear": "",
+                          "option-filter-prop": "children",
+                          onChange: (t) => V(t, n)
                         }, {
                         }, {
                           default: a(() => [
                           default: a(() => [
-                            (r(!0), v(g, null, C(w.value, (n) => (r(), F(b, {
-                              key: n.dataIndex
+                            (f(!0), y(g, null, q(C.value, (t) => (f(), $(b, {
+                              key: t.dataIndex,
+                              value: t.dataIndex
                             }, {
                             }, {
                               default: a(() => [
                               default: a(() => [
-                                s(u(n.name || n.title), 1)
+                                i(r(t.name || t.title), 1)
                               ]),
                               ]),
                               _: 2
                               _: 2
-                            }, 1024))), 128))
+                            }, 1032, ["value"]))), 128))
                           ]),
                           ]),
                           _: 1
                           _: 1
-                        }, 8, ["modelValue", "onUpdate:modelValue", "onChange"]),
-                        e[5] || (e[5] = _("div", { class: "divider" }, null, -1)),
-                        t(h, {
+                        }, 8, ["value", "onUpdate:value", "placeholder", "onChange"]),
+                        e[5] || (e[5] = v("div", { class: "divider" }, null, -1)),
+                        o(E, {
                           style: { width: "240px" },
                           style: { width: "240px" },
-                          modelValue: l.equals,
-                          "onUpdate:modelValue": (n) => l.equals = n,
-                          onChange: (n) => j(n, l)
+                          value: n.equals,
+                          "onUpdate:value": (t) => n.equals = t,
+                          placeholder: l.$l("请选择"),
+                          disabled: !n.dataIndex
                         }, {
                         }, {
                           default: a(() => [
                           default: a(() => [
-                            (r(), v(g, null, C(S, (n) => t(b, {
-                              key: n.id
+                            (f(!0), y(g, null, q(L(n), (t) => (f(), $(b, {
+                              key: t.id,
+                              value: t.id
                             }, {
                             }, {
                               default: a(() => [
                               default: a(() => [
-                                s(u(n.name), 1)
+                                i(r(t.name), 1)
                               ]),
                               ]),
                               _: 2
                               _: 2
-                            }, 1024)), 64))
+                            }, 1032, ["value"]))), 128))
                           ]),
                           ]),
-                          _: 1
-                        }, 8, ["modelValue", "onUpdate:modelValue", "onChange"]),
-                        e[6] || (e[6] = _("div", { class: "divider" }, null, -1)),
-                        _("div", ee, [
-                          t(z, {
+                          _: 2
+                        }, 1032, ["value", "onUpdate:value", "placeholder", "disabled"]),
+                        e[6] || (e[6] = v("div", { class: "divider" }, null, -1)),
+                        v("div", se, [
+                          o(Q, {
                             style: { width: "240px" },
                             style: { width: "240px" },
-                            data: l,
-                            modelValue: l.value,
-                            "onUpdate:modelValue": (n) => l.value = n
-                          }, null, 8, ["data", "modelValue", "onUpdate:modelValue"]),
-                          t(D, {
+                            data: n
+                          }, null, 8, ["data"]),
+                          o(G, {
                             style: { "font-size": "16px", "margin-left": "6px", color: "red" },
                             style: { "font-size": "16px", "margin-left": "6px", color: "red" },
-                            onClick: (n) => I(l)
+                            onClick: (t) => z(n)
                           }, null, 8, ["onClick"])
                           }, null, 8, ["onClick"])
                         ])
                         ])
                       ]))), 128))
                       ]))), 128))
@@ -153,44 +188,44 @@ const Y = { class: "drawer-wrap" }, Z = { class: "content-wrap" }, ee = { class:
                 ]),
                 ]),
                 _: 1
                 _: 1
               }),
               }),
-              t(m, {
-                onClick: e[1] || (e[1] = (l) => N()),
+              o(m, {
+                onClick: e[1] || (e[1] = (n) => M()),
                 class: "add-filter",
                 class: "add-filter",
                 type: "link"
                 type: "link"
               }, {
               }, {
                 default: a(() => [
                 default: a(() => [
-                  t(P),
-                  s(" " + u(o.$l("添加筛选条件")), 1)
+                  o(J),
+                  i(" " + r(l.$l("添加筛选条件")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               })
               })
             ]),
             ]),
-            _("div", le, [
-              t(m, {
+            v("div", ie, [
+              o(m, {
                 class: "cancel",
                 class: "cancel",
-                onClick: e[2] || (e[2] = (l) => d.value = !1)
+                onClick: e[2] || (e[2] = (n) => d.value = !1)
               }, {
               }, {
                 default: a(() => [
                 default: a(() => [
-                  s(u(o.$l("取消")), 1)
+                  i(r(l.$l("取消")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               }),
               }),
-              t(m, {
+              o(m, {
                 class: "reset",
                 class: "reset",
-                onClick: e[3] || (e[3] = (l) => E())
+                onClick: e[3] || (e[3] = (n) => D())
               }, {
               }, {
                 default: a(() => [
                 default: a(() => [
-                  s(u(o.$l("重置")), 1)
+                  i(r(l.$l("重置")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               }),
               }),
-              t(m, {
+              o(m, {
                 class: "submit",
                 class: "submit",
                 type: "primary",
                 type: "primary",
-                onClick: e[4] || (e[4] = (l) => k())
+                onClick: e[4] || (e[4] = (n) => R())
               }, {
               }, {
                 default: a(() => [
                 default: a(() => [
-                  s(u(o.$l("确定")), 1)
+                  i(r(l.$l("确定")), 1)
                 ]),
                 ]),
                 _: 1
                 _: 1
               })
               })
@@ -201,7 +236,7 @@ const Y = { class: "drawer-wrap" }, Z = { class: "content-wrap" }, ee = { class:
       }, 8, ["title", "visible"]);
       }, 8, ["title", "visible"]);
     };
     };
   }
   }
-}), de = /* @__PURE__ */ A(ne, [["__scopeId", "data-v-85c923c8"]]);
+}), _e = /* @__PURE__ */ W(re, [["__scopeId", "data-v-3e78fab8"]]);
 export {
 export {
-  de as default
+  _e as default
 };
 };

Разница между файлами не показана из-за своего большого размера
+ 19 - 8
lib/js/components-doc.js


+ 1 - 1
lib/js/dayjs.js

@@ -1,4 +1,4 @@
-import { cf as ut, cg as ct, ai as pe, ch as Po, d as M, _ as x, c as re, K as le, w as Qe, ci as Do, F as Mo, D as Ee, L as Ae, cj as Ro, bS as No, ck as Io, cl as To, H as ea, g as Yo, m as dn, c3 as Eo, T as Vo, aJ as Ot, r as ta, cm as Oo, cn as Ho, co as Ao, cp as Bo, t as Wo, cq as _o, c4 as Fo, c9 as fn, ca as Lo, cr as na, cs as aa, B as jo, av as X, ay as pt, ax as Ue, e as vn, aw as st, l as nt, U as fa, V as va, h as gt, u as pa, X as ga, aL as ha, ct as ma, cu as ba, cv as wa, a5 as Ca, W as $a, br as ka, o as zo, cw as Uo } from "./index2.js";
+import { cg as ut, ch as ct, ai as pe, ci as Po, d as M, _ as x, c as re, K as le, w as Qe, cj as Do, F as Mo, D as Ee, L as Ae, ck as Ro, bT as No, cl as Io, cm as To, H as ea, g as Yo, m as dn, c4 as Eo, T as Vo, aJ as Ot, r as ta, cn as Oo, co as Ho, cp as Ao, cq as Bo, t as Wo, cr as _o, c5 as Fo, ca as fn, cb as Lo, cs as na, ct as aa, B as jo, av as X, ay as pt, ax as Ue, e as vn, aw as st, l as nt, U as fa, V as va, h as gt, u as pa, X as ga, aL as ha, cu as ma, cv as ba, cw as wa, a5 as Ca, W as $a, bs as ka, o as zo, cx as Uo } from "./index2.js";
 import { useAttrs as Ko, provide as ya, inject as xa, createVNode as g, createTextVNode as Sa, defineComponent as Ge, shallowRef as He, ref as O, watch as ge, onBeforeUnmount as kn, nextTick as Pa, computed as E, onBeforeUpdate as qo, watchEffect as Wt, toRef as se, onMounted as Da, getCurrentScope as Qo, onScopeDispose as Go, unref as Xo, getCurrentInstance as Zo, Fragment as Ht } from "vue";
 import { useAttrs as Ko, provide as ya, inject as xa, createVNode as g, createTextVNode as Sa, defineComponent as Ge, shallowRef as He, ref as O, watch as ge, onBeforeUnmount as kn, nextTick as Pa, computed as E, onBeforeUpdate as qo, watchEffect as Wt, toRef as se, onMounted as Da, getCurrentScope as Qo, onScopeDispose as Go, unref as Xo, getCurrentInstance as Zo, Fragment as Ht } from "vue";
 import { T as Jo } from "./index13.js";
 import { T as Jo } from "./index13.js";
 var Ma = { exports: {} };
 var Ma = { exports: {} };

Разница между файлами не показана из-за своего большого размера
+ 6 - 6
lib/js/docs.js


+ 5 - 5
lib/js/hasIn.js

@@ -1,4 +1,4 @@
-import { at as o, bF as l, ba as f, bG as h, bH as O, b0 as T, bI as y, bJ as b, b6 as x, bK as C, bL as I } from "./index2.js";
+import { at as o, bG as l, bb as f, bH as h, bI as O, b1 as T, bJ as y, bK as b, b7 as x, bL as C, bM as I } from "./index2.js";
 function v(n, r) {
 function v(n, r) {
   for (var e = -1, i = n == null ? 0 : n.length, t = Array(i); ++e < i; )
   for (var e = -1, i = n == null ? 0 : n.length, t = Array(i); ++e < i; )
     t[e] = r(n[e], e, n);
     t[e] = r(n[e], e, n);
@@ -49,14 +49,14 @@ function z(n) {
     return n;
     return n;
   };
   };
 }
 }
-var F = h ? function(n, r) {
+var H = h ? function(n, r) {
   return h(n, "toString", {
   return h(n, "toString", {
     configurable: !0,
     configurable: !0,
     enumerable: !1,
     enumerable: !1,
     value: z(r),
     value: z(r),
     writable: !0
     writable: !0
   });
   });
-} : E, H = R(F), $ = Object.prototype, K = $.hasOwnProperty;
+} : E, $ = R(H), F = Object.prototype, K = F.hasOwnProperty;
 function en(n, r, e) {
 function en(n, r, e) {
   var i = n[r];
   var i = n[r];
   (!(K.call(n, r) && O(i, e)) || e === void 0 && !(r in n)) && T(n, r, e);
   (!(K.call(n, r) && O(i, e)) || e === void 0 && !(r in n)) && T(n, r, e);
@@ -141,7 +141,7 @@ function k(n) {
   return r ? Y(n) : [];
   return r ? Y(n) : [];
 }
 }
 function an(n) {
 function an(n) {
-  return H(V(n, void 0, k), n + "");
+  return $(V(n, void 0, k), n + "");
 }
 }
 function j(n, r) {
 function j(n, r) {
   return n != null && r in Object(n);
   return n != null && r in Object(n);
@@ -169,6 +169,6 @@ export {
   un as h,
   un as h,
   E as i,
   E as i,
   V as o,
   V as o,
-  H as s,
+  $ as s,
   P as t
   P as t
 };
 };

+ 1 - 1
lib/js/index10.js

@@ -1,4 +1,4 @@
-import { ay as T, aw as q, e as he, f as J, ax as Z, av as z, h as M, cD as Q, d as f, _ as P, i as j, y as oe, g as re, m as se, r as le, aI as Se, u as ae, br as ve, c1 as ce, bt as be, cE as de, b as Ce, c as B, o as pe, P as x, cF as ye, aG as Ie, F as xe, t as we, cG as Pe, cH as De, l as Te } from "./index2.js";
+import { ay as T, aw as q, e as he, f as J, ax as Z, av as z, h as M, cE as Q, d as f, _ as P, i as j, y as oe, g as re, m as se, r as le, aI as Se, u as ae, bs as ve, c2 as ce, bu as be, cF as de, b as Ce, c as B, o as pe, P as x, cG as ye, aG as Ie, F as xe, t as we, cH as Pe, cI as De, l as Te } from "./index2.js";
 import { defineComponent as O, computed as v, createVNode as p, Fragment as ue, ref as ge, onUpdated as We } from "vue";
 import { defineComponent as O, computed as v, createVNode as p, Fragment as ue, ref as ge, onUpdated as We } from "vue";
 import { u as ze } from "./useRefs.js";
 import { u as ze } from "./useRefs.js";
 const Oe = ["normal", "exception", "active", "success"], F = () => ({
 const Oe = ["normal", "exception", "active", "success"], F = () => ({

+ 44 - 44
lib/js/index11.js

@@ -1,4 +1,4 @@
-import { a$ as Xe, bL as ft, w as ge, c as le, K as J, d as T, P as we, H as D, cI as ht, cJ as gt, cK as mt, cL as $t, cM as yt, av as j, cN as he, R as Fe, _ as te, e as me, F as xt, cr as je, g as _t, m as St, r as tt, t as Ct, cO as at, aN as Tt, o as wt, i as nt, E as Pt, bU as Rt, h as De, u as It, c2 as Et, L as Ve, ak as Bt, c1 as Lt, l as At, ay as xe, ax as Dt, aw as kt } from "./index2.js";
+import { b0 as Xe, bM as ft, w as ge, c as le, K as J, d as T, P as we, H as D, cJ as ht, cK as gt, cL as mt, cM as $t, cN as yt, av as j, cO as he, R as Fe, _ as te, e as me, F as xt, cs as je, g as _t, m as St, r as tt, t as Ct, cP as at, aN as Tt, o as wt, i as nt, E as Pt, bV as Rt, h as De, u as Et, c3 as It, L as Ve, ak as Bt, c2 as Lt, l as At, ay as xe, ax as Dt, aw as kt } from "./index2.js";
 import { shallowRef as W, onBeforeUnmount as Me, defineComponent as ae, ref as q, computed as H, createVNode as g, watchEffect as Ce, onMounted as Te, watch as ie, provide as Mt, inject as Nt, toRefs as Ot } from "vue";
 import { shallowRef as W, onBeforeUnmount as Me, defineComponent as ae, ref as q, computed as H, createVNode as g, watchEffect as Ce, onMounted as Te, watch as ie, provide as Mt, inject as Nt, toRefs as Ot } from "vue";
 import { u as Wt } from "./useRefs.js";
 import { u as Wt } from "./useRefs.js";
 import { e as ot, t as Ht, a as zt, b as Kt, h as Gt, f as Xt } from "./hasIn.js";
 import { e as ot, t as Ht, a as zt, b as Kt, h as Gt, f as Xt } from "./hasIn.js";
@@ -362,7 +362,7 @@ const lt = ae({
         tabBarGutter: m,
         tabBarGutter: m,
         rtl: u,
         rtl: u,
         onTabClick: $,
         onTabClick: $,
-        popupClassName: E
+        popupClassName: I
       } = e;
       } = e;
       if (!w.length) return null;
       if (!w.length) return null;
       const R = `${y}-dropdown`, G = C == null ? void 0 : C.dropdownAriaLabel, re = {
       const R = `${y}-dropdown`, G = C == null ? void 0 : C.dropdownAriaLabel, re = {
@@ -371,7 +371,7 @@ const lt = ae({
       w.length || (re.visibility = "hidden", re.order = 1);
       w.length || (re.visibility = "hidden", re.order = 1);
       const se = le({
       const se = le({
         [`${R}-rtl`]: u,
         [`${R}-rtl`]: u,
-        [`${E}`]: !0
+        [`${I}`]: !0
       }), ce = k ? null : g(mt, {
       }), ce = k ? null : g(mt, {
         prefixCls: R,
         prefixCls: R,
         trigger: ["hover"],
         trigger: ["hover"],
@@ -384,11 +384,11 @@ const lt = ae({
         getPopupContainer: e.getPopupContainer
         getPopupContainer: e.getPopupContainer
       }, {
       }, {
         overlay: () => g($t, {
         overlay: () => g($t, {
-          onClick: (I) => {
+          onClick: (E) => {
             let {
             let {
               key: Q,
               key: Q,
               domEvent: N
               domEvent: N
-            } = I;
+            } = E;
             $(Q, N), l(!1);
             $(Q, N), l(!1);
           },
           },
           id: p.value,
           id: p.value,
@@ -398,25 +398,25 @@ const lt = ae({
           selectedKeys: [n.value],
           selectedKeys: [n.value],
           "aria-label": G !== void 0 ? G : "expanded dropdown"
           "aria-label": G !== void 0 ? G : "expanded dropdown"
         }, {
         }, {
-          default: () => [w.map((I) => {
+          default: () => [w.map((E) => {
             var Q, N;
             var Q, N;
-            const V = r && I.closable !== !1 && !I.disabled;
+            const V = r && E.closable !== !1 && !E.disabled;
             return g(yt, {
             return g(yt, {
-              key: I.key,
-              id: `${p.value}-${I.key}`,
+              key: E.key,
+              id: `${p.value}-${E.key}`,
               role: "option",
               role: "option",
-              "aria-controls": x && `${x}-panel-${I.key}`,
-              disabled: I.disabled
+              "aria-controls": x && `${x}-panel-${E.key}`,
+              disabled: E.disabled
             }, {
             }, {
-              default: () => [g("span", null, [typeof I.tab == "function" ? I.tab() : I.tab]), V && g("button", {
+              default: () => [g("span", null, [typeof E.tab == "function" ? E.tab() : E.tab]), V && g("button", {
                 type: "button",
                 type: "button",
                 "aria-label": e.removeAriaLabel || "remove",
                 "aria-label": e.removeAriaLabel || "remove",
                 tabindex: 0,
                 tabindex: 0,
                 class: `${R}-menu-item-remove`,
                 class: `${R}-menu-item-remove`,
                 onClick: (Y) => {
                 onClick: (Y) => {
-                  Y.stopPropagation(), h(Y, I.key);
+                  Y.stopPropagation(), h(Y, E.key);
                 }
                 }
-              }, [((Q = I.closeIcon) === null || Q === void 0 ? void 0 : Q.call(I)) || ((N = r.removeIcon) === null || N === void 0 ? void 0 : N.call(r)) || "×"])]
+              }, [((Q = E.closeIcon) === null || Q === void 0 ? void 0 : Q.call(E)) || ((N = r.removeIcon) === null || N === void 0 ? void 0 : N.call(r)) || "×"])]
             });
             });
           })]
           })]
         }),
         }),
@@ -494,23 +494,23 @@ function ta(e, t) {
     const {
     const {
       screenX: m,
       screenX: m,
       screenY: u
       screenY: u
-    } = r.touches[0], $ = m - a.value.x, E = u - a.value.y;
-    t($, E), i({
+    } = r.touches[0], $ = m - a.value.x, I = u - a.value.y;
+    t($, I), i({
       x: m,
       x: m,
       y: u
       y: u
     });
     });
     const R = Date.now();
     const R = Date.now();
     s(R - o.value), l(R), d({
     s(R - o.value), l(R), d({
       x: $,
       x: $,
-      y: E
+      y: I
     });
     });
   }
   }
   function c() {
   function c() {
     if (!a.value) return;
     if (!a.value) return;
     const r = v.value;
     const r = v.value;
     if (i(null), d(null), r) {
     if (i(null), d(null), r) {
-      const m = r.x / n.value, u = r.y / n.value, $ = Math.abs(m), E = Math.abs(u);
-      if (Math.max($, E) < ea) return;
+      const m = r.x / n.value, u = r.y / n.value, $ = Math.abs(m), I = Math.abs(u);
+      if (Math.max($, I) < ea) return;
       let R = m, G = u;
       let R = m, G = u;
       p.value = setInterval(() => {
       p.value = setInterval(() => {
         if (Math.abs(R) < Ue && Math.abs(G) < Ue) {
         if (Math.abs(R) < Ue && Math.abs(G) < Ue) {
@@ -528,8 +528,8 @@ function ta(e, t) {
       deltaY: u
       deltaY: u
     } = r;
     } = r;
     let $ = 0;
     let $ = 0;
-    const E = Math.abs(m), R = Math.abs(u);
-    E === R ? $ = y.value === "x" ? m : u : E > R ? ($ = m, y.value = "x") : ($ = u, y.value = "y"), t(-$, -$) && r.preventDefault();
+    const I = Math.abs(m), R = Math.abs(u);
+    I === R ? $ = y.value === "x" ? m : u : I > R ? ($ = m, y.value = "x") : ($ = u, y.value = "y"), t(-$, -$) && r.preventDefault();
   }
   }
   const w = q({
   const w = q({
     onTouchStart: S,
     onTouchStart: S,
@@ -653,7 +653,7 @@ const qe = {
       !h.value && e.onTabScroll && e.onTabScroll({
       !h.value && e.onTabScroll && e.onTabScroll({
         direction: f > b ? "top" : "bottom"
         direction: f > b ? "top" : "bottom"
       });
       });
-    }), [C, k] = D(0), [K, M] = D(0), [r, m] = D(null), [u, $] = D(null), [E, R] = D(0), [G, re] = D(0), [se, ce] = Ut(/* @__PURE__ */ new Map()), I = Jt(o, se), Q = H(() => `${l.value}-nav-operations-hidden`), N = W(0), V = W(0);
+    }), [C, k] = D(0), [K, M] = D(0), [r, m] = D(null), [u, $] = D(null), [I, R] = D(0), [G, re] = D(0), [se, ce] = Ut(/* @__PURE__ */ new Map()), E = Jt(o, se), Q = H(() => `${l.value}-nav-operations-hidden`), N = W(0), V = W(0);
     Ce(() => {
     Ce(() => {
       h.value ? e.rtl ? (N.value = 0, V.value = Math.max(0, C.value - r.value)) : (N.value = Math.min(0, r.value - C.value), V.value = 0) : (N.value = Math.min(0, u.value - K.value), V.value = 0);
       h.value ? e.rtl ? (N.value = 0, V.value = Math.max(0, C.value - r.value)) : (N.value = Math.min(0, r.value - C.value), V.value = 0) : (N.value = Math.min(0, u.value - K.value), V.value = 0);
     });
     });
@@ -682,7 +682,7 @@ const qe = {
     });
     });
     const de = function() {
     const de = function() {
       let f = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : e.activeKey;
       let f = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : e.activeKey;
-      const b = I.value.get(f) || {
+      const b = E.value.get(f) || {
         width: 0,
         width: 0,
         height: 0,
         height: 0,
         left: 0,
         left: 0,
@@ -699,8 +699,8 @@ const qe = {
     }, Pe = W(0), Re = W(0);
     }, Pe = W(0), Re = W(0);
     Ce(() => {
     Ce(() => {
       let f, b, _, P, L, B;
       let f, b, _, P, L, B;
-      const U = I.value;
-      ["top", "bottom"].includes(e.tabPosition) ? (f = "width", P = r.value, L = C.value, B = E.value, b = e.rtl ? "right" : "left", _ = Math.abs(c.value)) : (f = "height", P = u.value, L = C.value, B = G.value, b = "top", _ = -x.value);
+      const U = E.value;
+      ["top", "bottom"].includes(e.tabPosition) ? (f = "width", P = r.value, L = C.value, B = I.value, b = e.rtl ? "right" : "left", _ = Math.abs(c.value)) : (f = "height", P = u.value, L = C.value, B = G.value, b = "top", _ = -x.value);
       let O = P;
       let O = P;
       L + B > P && L < P && (O = P - B);
       L + B > P && L < P && (O = P - B);
       const F = o.value;
       const F = o.value;
@@ -749,13 +749,13 @@ const qe = {
     }, {
     }, {
       flush: "post"
       flush: "post"
     });
     });
-    const Ie = () => {
+    const Ee = () => {
       var f, b, _, P, L;
       var f, b, _, P, L;
       const B = ((f = n.value) === null || f === void 0 ? void 0 : f.offsetWidth) || 0, U = ((b = n.value) === null || b === void 0 ? void 0 : b.offsetHeight) || 0, O = ((_ = d.value) === null || _ === void 0 ? void 0 : _.$el) || {}, F = O.offsetWidth || 0, Z = O.offsetHeight || 0;
       const B = ((f = n.value) === null || f === void 0 ? void 0 : f.offsetWidth) || 0, U = ((b = n.value) === null || b === void 0 ? void 0 : b.offsetHeight) || 0, O = ((_ = d.value) === null || _ === void 0 ? void 0 : _.$el) || {}, F = O.offsetWidth || 0, Z = O.offsetHeight || 0;
       m(B), $(U), R(F), re(Z);
       m(B), $(U), R(F), re(Z);
       const oe = (((P = s.value) === null || P === void 0 ? void 0 : P.offsetWidth) || 0) - F, A = (((L = s.value) === null || L === void 0 ? void 0 : L.offsetHeight) || 0) - Z;
       const oe = (((P = s.value) === null || P === void 0 ? void 0 : P.offsetWidth) || 0) - F, A = (((L = s.value) === null || L === void 0 ? void 0 : L.offsetHeight) || 0) - Z;
       k(oe), M(A), Ne();
       k(oe), M(A), Ne();
-    }, Oe = H(() => [...o.value.slice(0, Pe.value), ...o.value.slice(Re.value + 1)]), [ut, vt] = D(), ne = H(() => I.value.get(e.activeKey)), We = W(), He = () => {
+    }, Oe = H(() => [...o.value.slice(0, Pe.value), ...o.value.slice(Re.value + 1)]), [ut, vt] = D(), ne = H(() => E.value.get(e.activeKey)), We = W(), He = () => {
       ge.cancel(We.value);
       ge.cancel(We.value);
     };
     };
     ie([ne, h, () => e.rtl], () => {
     ie([ne, h, () => e.rtl], () => {
@@ -763,16 +763,16 @@ const qe = {
       ne.value && (h.value ? (e.rtl ? f.right = he(ne.value.right) : f.left = he(ne.value.left), f.width = he(ne.value.width)) : (f.top = he(ne.value.top), f.height = he(ne.value.height))), He(), We.value = ge(() => {
       ne.value && (h.value ? (e.rtl ? f.right = he(ne.value.right) : f.left = he(ne.value.left), f.width = he(ne.value.width)) : (f.top = he(ne.value.top), f.height = he(ne.value.height))), He(), We.value = ge(() => {
         vt(f);
         vt(f);
       });
       });
-    }), ie([() => e.activeKey, ne, I, h], () => {
+    }), ie([() => e.activeKey, ne, E, h], () => {
       de();
       de();
     }, {
     }, {
       flush: "post"
       flush: "post"
     }), ie([() => e.rtl, () => e.tabBarGutter, () => e.activeKey, () => o.value], () => {
     }), ie([() => e.rtl, () => e.tabBarGutter, () => e.activeKey, () => o.value], () => {
-      Ie();
+      Ee();
     }, {
     }, {
       flush: "post"
       flush: "post"
     });
     });
-    const Ee = (f) => {
+    const Ie = (f) => {
       let {
       let {
         position: b,
         position: b,
         prefixCls: _,
         prefixCls: _,
@@ -837,12 +837,12 @@ const qe = {
         onKeydown: () => {
         onKeydown: () => {
           be();
           be();
         }
         }
-      }, [g(Ee, {
+      }, [g(Ie, {
         position: "left",
         position: "left",
         prefixCls: A,
         prefixCls: A,
         extra: i.leftExtra
         extra: i.leftExtra
       }, null), g(Fe, {
       }, null), g(Fe, {
-        onResize: Ie
+        onResize: Ee
       }, {
       }, {
         default: () => [g("div", {
         default: () => [g("div", {
           class: le(ee, {
           class: le(ee, {
@@ -853,7 +853,7 @@ const qe = {
           }),
           }),
           ref: n
           ref: n
         }, [g(Fe, {
         }, [g(Fe, {
-          onResize: Ie
+          onResize: Ee
         }, {
         }, {
           default: () => [g("div", {
           default: () => [g("div", {
             ref: s,
             ref: s,
@@ -883,11 +883,11 @@ const qe = {
         prefixCls: A,
         prefixCls: A,
         tabs: Oe.value,
         tabs: Oe.value,
         class: !X && Q.value
         class: !X && Q.value
-      }), it(i, ["moreIcon"])), g(Ee, {
+      }), it(i, ["moreIcon"])), g(Ie, {
         position: "right",
         position: "right",
         prefixCls: A,
         prefixCls: A,
         extra: i.rightExtra
         extra: i.rightExtra
-      }, null), g(Ee, {
+      }, null), g(Ie, {
         position: "right",
         position: "right",
         prefixCls: A,
         prefixCls: A,
         extra: i.tabBarExtraContent
         extra: i.tabBarExtraContent
@@ -1863,7 +1863,7 @@ const fa = ae({
       size: n,
       size: n,
       rootPrefixCls: s,
       rootPrefixCls: s,
       getPopupContainer: v
       getPopupContainer: v
-    } = It("tabs", e), [d, p] = ba(o), S = H(() => l.value === "rtl"), h = H(() => {
+    } = Et("tabs", e), [d, p] = ba(o), S = H(() => l.value === "rtl"), h = H(() => {
       const {
       const {
         animated: u,
         animated: u,
         tabPosition: $
         tabPosition: $
@@ -1880,7 +1880,7 @@ const fa = ae({
       }, typeof u == "object" ? u : {});
       }, typeof u == "object" ? u : {});
     }), [c, y] = D(!1);
     }), [c, y] = D(!1);
     Te(() => {
     Te(() => {
-      y(Et());
+      y(It());
     });
     });
     const [x, w] = Ve(() => {
     const [x, w] = Ve(() => {
       var u;
       var u;
@@ -1891,7 +1891,7 @@ const fa = ae({
     }), [C, k] = D(() => e.tabs.findIndex((u) => u.key === x.value));
     }), [C, k] = D(() => e.tabs.findIndex((u) => u.key === x.value));
     Ce(() => {
     Ce(() => {
       var u;
       var u;
-      let $ = e.tabs.findIndex((E) => E.key === x.value);
+      let $ = e.tabs.findIndex((I) => I.key === x.value);
       $ === -1 && ($ = Math.max(0, Math.min(C.value, e.tabs.length - 1)), w((u = e.tabs[$]) === null || u === void 0 ? void 0 : u.key)), k($);
       $ === -1 && ($ = Math.max(0, Math.min(C.value, e.tabs.length - 1)), w((u = e.tabs[$]) === null || u === void 0 ? void 0 : u.key)), k($);
     });
     });
     const [K, M] = Ve(null, {
     const [K, M] = Ve(null, {
@@ -1901,8 +1901,8 @@ const fa = ae({
       e.id || (M(`rc-tabs-${process.env.NODE_ENV === "test" ? "test" : et}`), et += 1);
       e.id || (M(`rc-tabs-${process.env.NODE_ENV === "test" ? "test" : et}`), et += 1);
     });
     });
     const m = (u, $) => {
     const m = (u, $) => {
-      var E, R;
-      (E = e.onTabClick) === null || E === void 0 || E.call(e, u, $);
+      var I, R;
+      (I = e.onTabClick) === null || I === void 0 || I.call(e, u, $);
       const G = u !== x.value;
       const G = u !== x.value;
       w(u), G && ((R = e.onChange) === null || R === void 0 || R.call(e, u));
       w(u), G && ((R = e.onChange) === null || R === void 0 || R.call(e, u));
     };
     };
@@ -1913,13 +1913,13 @@ const fa = ae({
       const {
       const {
         id: u,
         id: u,
         type: $,
         type: $,
-        tabBarGutter: E,
+        tabBarGutter: I,
         tabBarStyle: R,
         tabBarStyle: R,
         locale: G,
         locale: G,
         destroyInactiveTabPane: re,
         destroyInactiveTabPane: re,
         renderTabBar: se = i.renderTabBar,
         renderTabBar: se = i.renderTabBar,
         onTabScroll: ce,
         onTabScroll: ce,
-        hideAdd: I,
+        hideAdd: E,
         centered: Q
         centered: Q
       } = e, N = {
       } = e, N = {
         id: K.value,
         id: K.value,
@@ -1941,14 +1941,14 @@ const fa = ae({
         },
         },
         removeIcon: () => g(Lt, null, null),
         removeIcon: () => g(Lt, null, null),
         addIcon: i.addIcon ? i.addIcon : () => g(Bt, null, null),
         addIcon: i.addIcon ? i.addIcon : () => g(Bt, null, null),
-        showAdd: I !== !0
+        showAdd: E !== !0
       });
       });
       let Y;
       let Y;
       const ue = T(T({}, N), {
       const ue = T(T({}, N), {
         moreTransitionName: `${s.value}-slide-up`,
         moreTransitionName: `${s.value}-slide-up`,
         editable: V,
         editable: V,
         locale: G,
         locale: G,
-        tabBarGutter: E,
+        tabBarGutter: I,
         onTabClick: m,
         onTabClick: m,
         onTabScroll: ce,
         onTabScroll: ce,
         style: R,
         style: R,

+ 9 - 9
lib/js/index12.js

@@ -1,6 +1,6 @@
-import { aP as A, aQ as R, aR as g, aS as w, _ as v, d as p, aT as m, aU as j, aV as U, aW as M, aX as G, aY as P, aZ as V } from "./index2.js";
-import { defineComponent as t, createVNode as _ } from "vue";
-const D = t({
+import { aQ as A, aR as R, aS as g, aT as w, _ as v, d as _, aU as m, aV as j, aW as U, aX as M, aY as G, aZ as V, a_ as D } from "./index2.js";
+import { defineComponent as t, createVNode as p } from "vue";
+const F = t({
   compatConfig: {
   compatConfig: {
     MODE: 3
     MODE: 3
   },
   },
@@ -11,10 +11,10 @@ const D = t({
     } = l;
     } = l;
     return () => {
     return () => {
       var e;
       var e;
-      return _("tr", null, [(e = o.default) === null || e === void 0 ? void 0 : e.call(o)]);
+      return p("tr", null, [(e = o.default) === null || e === void 0 ? void 0 : e.call(o)]);
     };
     };
   }
   }
-}), F = t({
+}), P = t({
   name: "ATableSummaryCell",
   name: "ATableSummaryCell",
   props: ["index", "colSpan", "rowSpan", "align"],
   props: ["index", "colSpan", "rowSpan", "align"],
   setup(n, l) {
   setup(n, l) {
@@ -37,7 +37,7 @@ const D = t({
         stickyOffsets: O,
         stickyOffsets: O,
         flattenColumns: y
         flattenColumns: y
       } = x, S = a + s - 1 + 1 === N ? s + 1 : s, L = g(a, a + S - 1, y, O, I);
       } = x, S = a + s - 1 + 1 === N ? s + 1 : s, L = g(a, a + S - 1, y, O, I);
-      return _(w, v({
+      return p(w, v({
         class: o.class,
         class: o.class,
         index: a,
         index: a,
         component: "td",
         component: "td",
@@ -67,12 +67,12 @@ const D = t({
   render() {
   render() {
     return null;
     return null;
   }
   }
-}), C = D, i = F, d = p(V, {
+}), C = F, i = P, d = _(D, {
   Cell: i,
   Cell: i,
   Row: C,
   Row: C,
   name: "ATableSummary"
   name: "ATableSummary"
-}), Q = p(m, {
-  SELECTION_ALL: P,
+}), Q = _(m, {
+  SELECTION_ALL: V,
   SELECTION_INVERT: G,
   SELECTION_INVERT: G,
   SELECTION_NONE: M,
   SELECTION_NONE: M,
   SELECTION_COLUMN: U,
   SELECTION_COLUMN: U,

+ 8 - 8
lib/js/index13.js

@@ -1,5 +1,5 @@
-import { g as L, m as O, d as B, r as R, cx as j, cy as X, u as z, c as F, _ as b, bA as U, cz as V, cA as q, cB as G, c1 as J, P, cC as K } from "./index2.js";
-import { defineComponent as D, computed as m, createVNode as d, shallowRef as Q, watchEffect as Y, Fragment as Z } from "vue";
+import { g as L, m as O, d as x, r as R, cy as j, cz as X, u as z, c as D, _ as b, bB as U, cA as V, cB as q, cC as G, c2 as J, P, cD as K } from "./index2.js";
+import { defineComponent as F, computed as m, createVNode as d, shallowRef as Q, watchEffect as Y, Fragment as Z } from "vue";
 const h = (e, c, l) => {
 const h = (e, c, l) => {
   const r = X(l);
   const r = X(l);
   return {
   return {
@@ -44,7 +44,7 @@ const h = (e, c, l) => {
   } = e, o = r - l, t = c - l;
   } = e, o = r - l, t = c - l;
   return {
   return {
     // Result
     // Result
-    [n]: B(B({}, R(e)), {
+    [n]: x(x({}, R(e)), {
       display: "inline-block",
       display: "inline-block",
       height: "auto",
       height: "auto",
       marginInlineEnd: e.marginXS,
       marginInlineEnd: e.marginXS,
@@ -144,7 +144,7 @@ const h = (e, c, l) => {
     type: Function
     type: Function
   },
   },
   "onUpdate:checked": Function
   "onUpdate:checked": Function
-}), S = D({
+}), S = F({
   compatConfig: {
   compatConfig: {
     MODE: 3
     MODE: 3
   },
   },
@@ -165,7 +165,7 @@ const h = (e, c, l) => {
         checked: u
         checked: u
       } = e;
       } = e;
       r("update:checked", !u), r("change", !u), r("click", a);
       r("update:checked", !u), r("change", !u), r("click", a);
-    }, s = m(() => F(o.value, g.value, {
+    }, s = m(() => D(o.value, g.value, {
       [`${o.value}-checkable`]: !0,
       [`${o.value}-checkable`]: !0,
       [`${o.value}-checkable-checked`]: e.checked
       [`${o.value}-checkable-checked`]: e.checked
     }));
     }));
@@ -202,7 +202,7 @@ const h = (e, c, l) => {
     type: Boolean,
     type: Boolean,
     default: !0
     default: !0
   }
   }
-}), v = D({
+}), v = F({
   compatConfig: {
   compatConfig: {
     MODE: 3
     MODE: 3
   },
   },
@@ -226,7 +226,7 @@ const h = (e, c, l) => {
     });
     });
     const a = (i) => {
     const a = (i) => {
       i.stopPropagation(), r("update:visible", !1), r("close", i), !i.defaultPrevented && e.visible === void 0 && (s.value = !1);
       i.stopPropagation(), r("update:visible", !1), r("close", i), !i.defaultPrevented && e.visible === void 0 && (s.value = !1);
-    }, u = m(() => V(e.color) || q(e.color)), w = m(() => F(o.value, C.value, {
+    }, u = m(() => V(e.color) || q(e.color)), w = m(() => D(o.value, C.value, {
       [`${o.value}-${e.color}`]: u.value,
       [`${o.value}-${e.color}`]: u.value,
       [`${o.value}-has-color`]: e.color && !u.value,
       [`${o.value}-has-color`]: e.color && !u.value,
       [`${o.value}-hidden`]: !s.value,
       [`${o.value}-hidden`]: !s.value,
@@ -250,7 +250,7 @@ const h = (e, c, l) => {
         onClick: a
         onClick: a
       }, null) : null, E = {
       }, null) : null, E = {
         backgroundColor: $ && !u.value ? $ : void 0
         backgroundColor: $ && !u.value ? $ : void 0
-      }, T = M || null, x = (p = l.default) === null || p === void 0 ? void 0 : p.call(l), k = T ? d(Z, null, [T, d("span", null, [x])]) : x, W = e.onClick !== void 0, I = d("span", b(b({}, n), {}, {
+      }, T = M || null, B = (p = l.default) === null || p === void 0 ? void 0 : p.call(l), k = T ? d(Z, null, [T, d("span", null, [B])]) : B, W = e.onClick !== void 0, I = d("span", b(b({}, n), {}, {
         onClick: A,
         onClick: A,
         class: [w.value, n.class],
         class: [w.value, n.class],
         style: [E, n.style]
         style: [E, n.style]

Разница между файлами не показана из-за своего большого размера
+ 335 - 452
lib/js/index2.js


+ 50 - 50
lib/js/index4.js

@@ -1,5 +1,5 @@
-import { a_ as bn, a$ as Pe, b0 as wn, b1 as Tt, as as Ye, b2 as xn, ar as qe, b3 as $n, b4 as It, b5 as Fn, b6 as An, b7 as _t, b8 as On, b9 as lt, ba as st, bb as Je, bc as Ze, bd as jt, be as Ce, bf as Cn, bg as Mt, at as Lt, bh as Sn, bi as Rt, bj as En, bk as Pn, bl as ut, bm as qn, bn as Tn, d as P, D as Ne, E as In, aL as _n, c as pe, y as jn, bo as Mn, aM as Ln, _ as W, g as Rn, m as Nn, bp as Nt, aK as Vn, r as Vt, aB as Dn, aC as Bn, az as Gn, aG as Dt, u as Bt, bq as Wn, V as zn, a1 as Un, br as Hn, bs as Kn, bt as Xn, P as de, bu as Qe, bv as Yn, bw as Gt, bx as Jn, by as Zn, bz as Qn, i as kn, av as ue, ax as me, ay as ft, aw as ct, f as er, e as $e, bA as je, U as tr, bB as Ve } from "./index2.js";
-import { cloneVNode as nr, inject as Wt, computed as F, provide as zt, createVNode as _, Fragment as Se, defineComponent as Te, ref as ke, watch as se, Transition as rr, withDirectives as ir, TransitionGroup as ar, vShow as or, shallowRef as ee, watchEffect as De, onBeforeUnmount as lr, reactive as Ut, onMounted as sr, toRaw as Be, nextTick as Ht, unref as ae } from "vue";
+import { a$ as bn, b0 as Pe, b1 as wn, b2 as Tt, as as Ye, b3 as xn, ar as qe, b4 as $n, b5 as It, b6 as Fn, b7 as An, b8 as jt, b9 as On, ba as lt, bb as st, bc as Je, bd as Ze, be as _t, bf as Ce, bg as Cn, bh as Mt, at as Lt, bi as Sn, bj as Rt, bk as En, bl as Pn, bm as ut, bn as qn, bo as Tn, d as P, D as Ne, E as In, aL as jn, c as pe, y as _n, bp as Mn, aM as Ln, _ as W, g as Rn, m as Nn, bq as Nt, aK as Vn, r as Vt, aB as Dn, aC as Bn, az as Gn, aG as Dt, u as Bt, br as Wn, V as zn, a1 as Un, bs as Hn, bt as Kn, bu as Xn, P as de, bv as Qe, bw as Yn, bx as Gt, by as Jn, bz as Zn, bA as Qn, i as kn, av as ue, ax as me, ay as ft, aw as ct, f as er, e as $e, bB as _e, U as tr, bC as Ve } from "./index2.js";
+import { cloneVNode as nr, inject as Wt, computed as F, provide as zt, createVNode as j, Fragment as Se, defineComponent as Te, ref as ke, watch as se, Transition as rr, withDirectives as ir, TransitionGroup as ar, vShow as or, shallowRef as ee, watchEffect as De, onBeforeUnmount as lr, reactive as Ut, onMounted as sr, toRaw as Be, nextTick as Ht, unref as ae } from "vue";
 import { a as Kt, s as ur, o as fr, i as Xt, b as et, c as Yt, t as Ee, h as cr, d as Jt, e as Zt, f as dr } from "./hasIn.js";
 import { a as Kt, s as ur, o as fr, i as Xt, b as et, c as Yt, t as Ee, h as cr, d as Jt, e as Zt, f as dr } from "./hasIn.js";
 import { C as Qt, A as mr } from "./Col.js";
 import { C as Qt, A as mr } from "./Col.js";
 import { s as gr } from "./index3.js";
 import { s as gr } from "./index3.js";
@@ -99,12 +99,12 @@ function Tr(e, t) {
 function Ir(e, t) {
 function Ir(e, t) {
   return be(e, It(e), t);
   return be(e, It(e), t);
 }
 }
-var _r = Object.getOwnPropertySymbols, en = _r ? function(e) {
+var jr = Object.getOwnPropertySymbols, en = jr ? function(e) {
   for (var t = []; e; )
   for (var t = []; e; )
-    An(t, It(e)), e = _t(e);
+    An(t, It(e)), e = jt(e);
   return t;
   return t;
 } : Fn;
 } : Fn;
-function jr(e, t) {
+function _r(e, t) {
   return be(e, en(e), t);
   return be(e, en(e), t);
 }
 }
 function tn(e) {
 function tn(e) {
@@ -171,19 +171,19 @@ function si(e, t, n) {
   }
   }
 }
 }
 function ui(e) {
 function ui(e) {
-  return typeof e.constructor == "function" && !Tt(e) ? yr(_t(e)) : {};
+  return typeof e.constructor == "function" && !Tt(e) ? yr(jt(e)) : {};
 }
 }
 var fi = "[object Map]";
 var fi = "[object Map]";
 function ci(e) {
 function ci(e) {
   return Je(e) && Ze(e) == fi;
   return Je(e) && Ze(e) == fi;
 }
 }
-var bt = Ce && Ce.isMap, di = bt ? jt(bt) : ci, mi = "[object Set]";
+var bt = Ce && Ce.isMap, di = bt ? _t(bt) : ci, mi = "[object Set]";
 function gi(e) {
 function gi(e) {
   return Je(e) && Ze(e) == mi;
   return Je(e) && Ze(e) == mi;
 }
 }
-var wt = Ce && Ce.isSet, vi = wt ? jt(wt) : gi, hi = 1, pi = 2, yi = 4, nn = "[object Arguments]", bi = "[object Array]", wi = "[object Boolean]", xi = "[object Date]", $i = "[object Error]", rn = "[object Function]", Fi = "[object GeneratorFunction]", Ai = "[object Map]", Oi = "[object Number]", an = "[object Object]", Ci = "[object RegExp]", Si = "[object Set]", Ei = "[object String]", Pi = "[object Symbol]", qi = "[object WeakMap]", Ti = "[object ArrayBuffer]", Ii = "[object DataView]", _i = "[object Float32Array]", ji = "[object Float64Array]", Mi = "[object Int8Array]", Li = "[object Int16Array]", Ri = "[object Int32Array]", Ni = "[object Uint8Array]", Vi = "[object Uint8ClampedArray]", Di = "[object Uint16Array]", Bi = "[object Uint32Array]", j = {};
-j[nn] = j[bi] = j[Ti] = j[Ii] = j[wi] = j[xi] = j[_i] = j[ji] = j[Mi] = j[Li] = j[Ri] = j[Ai] = j[Oi] = j[an] = j[Ci] = j[Si] = j[Ei] = j[Pi] = j[Ni] = j[Vi] = j[Di] = j[Bi] = !0;
-j[$i] = j[rn] = j[qi] = !1;
+var wt = Ce && Ce.isSet, vi = wt ? _t(wt) : gi, hi = 1, pi = 2, yi = 4, nn = "[object Arguments]", bi = "[object Array]", wi = "[object Boolean]", xi = "[object Date]", $i = "[object Error]", rn = "[object Function]", Fi = "[object GeneratorFunction]", Ai = "[object Map]", Oi = "[object Number]", an = "[object Object]", Ci = "[object RegExp]", Si = "[object Set]", Ei = "[object String]", Pi = "[object Symbol]", qi = "[object WeakMap]", Ti = "[object ArrayBuffer]", Ii = "[object DataView]", ji = "[object Float32Array]", _i = "[object Float64Array]", Mi = "[object Int8Array]", Li = "[object Int16Array]", Ri = "[object Int32Array]", Ni = "[object Uint8Array]", Vi = "[object Uint8ClampedArray]", Di = "[object Uint16Array]", Bi = "[object Uint32Array]", _ = {};
+_[nn] = _[bi] = _[Ti] = _[Ii] = _[wi] = _[xi] = _[ji] = _[_i] = _[Mi] = _[Li] = _[Ri] = _[Ai] = _[Oi] = _[an] = _[Ci] = _[Si] = _[Ei] = _[Pi] = _[Ni] = _[Vi] = _[Di] = _[Bi] = !0;
+_[$i] = _[rn] = _[qi] = !1;
 function ve(e, t, n, r, i, o) {
 function ve(e, t, n, r, i, o) {
   var a, l = t & hi, s = t & pi, v = t & yi;
   var a, l = t & hi, s = t & pi, v = t & yi;
   if (n && (a = i ? n(e, r, i, o) : n(e)), a !== void 0)
   if (n && (a = i ? n(e, r, i, o) : n(e)), a !== void 0)
@@ -200,9 +200,9 @@ function ve(e, t, n, r, i, o) {
       return Tr(e, l);
       return Tr(e, l);
     if (g == an || g == nn || h && !i) {
     if (g == an || g == nn || h && !i) {
       if (a = s || h ? {} : ui(e), !l)
       if (a = s || h ? {} : ui(e), !l)
-        return s ? jr(e, Pr(a, e)) : Ir(e, Er(a, e));
+        return s ? _r(e, Pr(a, e)) : Ir(e, Er(a, e));
     } else {
     } else {
-      if (!j[g])
+      if (!_[g])
         return i ? e : {};
         return i ? e : {};
       a = si(e, g, l);
       a = si(e, g, l);
     }
     }
@@ -679,12 +679,12 @@ var fn = function(t, n, r, i, o, a) {
   }
   }
   var a = ["integer", "float", "array", "regexp", "object", "method", "email", "number", "date", "url", "hex"], l = t.type;
   var a = ["integer", "float", "array", "regexp", "object", "method", "email", "number", "date", "url", "hex"], l = t.type;
   a.indexOf(l) > -1 ? ge[l](n) || i.push(J(o.messages.types[l], t.fullField, t.type)) : l && typeof n !== t.type && i.push(J(o.messages.types[l], t.fullField, t.type));
   a.indexOf(l) > -1 ? ge[l](n) || i.push(J(o.messages.types[l], t.fullField, t.type)) : l && typeof n !== t.type && i.push(J(o.messages.types[l], t.fullField, t.type));
-}, _a = function(t, n, r, i, o) {
+}, ja = function(t, n, r, i, o) {
   var a = typeof t.len == "number", l = typeof t.min == "number", s = typeof t.max == "number", v = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g, f = n, g = null, h = typeof n == "number", w = typeof n == "string", $ = Array.isArray(n);
   var a = typeof t.len == "number", l = typeof t.min == "number", s = typeof t.max == "number", v = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g, f = n, g = null, h = typeof n == "number", w = typeof n == "string", $ = Array.isArray(n);
   if (h ? g = "number" : w ? g = "string" : $ && (g = "array"), !g)
   if (h ? g = "number" : w ? g = "string" : $ && (g = "array"), !g)
     return !1;
     return !1;
   $ && (f = n.length), w && (f = n.replace(v, "_").length), a ? f !== t.len && i.push(J(o.messages[g].len, t.fullField, t.len)) : l && !s && f < t.min ? i.push(J(o.messages[g].min, t.fullField, t.min)) : s && !l && f > t.max ? i.push(J(o.messages[g].max, t.fullField, t.max)) : l && s && (f < t.min || f > t.max) && i.push(J(o.messages[g].range, t.fullField, t.min, t.max));
   $ && (f = n.length), w && (f = n.replace(v, "_").length), a ? f !== t.len && i.push(J(o.messages[g].len, t.fullField, t.len)) : l && !s && f < t.min ? i.push(J(o.messages[g].min, t.fullField, t.min)) : s && !l && f > t.max ? i.push(J(o.messages[g].max, t.fullField, t.max)) : l && s && (f < t.min || f > t.max) && i.push(J(o.messages[g].range, t.fullField, t.min, t.max));
-}, fe = "enum", ja = function(t, n, r, i, o) {
+}, fe = "enum", _a = function(t, n, r, i, o) {
   t[fe] = Array.isArray(t[fe]) ? t[fe] : [], t[fe].indexOf(n) === -1 && i.push(J(o.messages[fe], t.fullField, t[fe].join(", ")));
   t[fe] = Array.isArray(t[fe]) ? t[fe] : [], t[fe].indexOf(n) === -1 && i.push(J(o.messages[fe], t.fullField, t[fe].join(", ")));
 }, Ma = function(t, n, r, i, o) {
 }, Ma = function(t, n, r, i, o) {
   if (t.pattern) {
   if (t.pattern) {
@@ -699,8 +699,8 @@ var fn = function(t, n, r, i, o, a) {
   required: fn,
   required: fn,
   whitespace: qa,
   whitespace: qa,
   type: Ia,
   type: Ia,
-  range: _a,
-  enum: ja,
+  range: ja,
+  enum: _a,
   pattern: Ma
   pattern: Ma
 }, La = function(t, n, r, i, o) {
 }, La = function(t, n, r, i, o) {
   var a = [], l = t.required || !t.required && i.hasOwnProperty(t.field);
   var a = [], l = t.required || !t.required && i.hasOwnProperty(t.field);
@@ -1135,7 +1135,7 @@ const Y = "'${name}' is not a valid ${type}", Ie = {
     mismatch: "'${name}' does not match pattern ${pattern}"
     mismatch: "'${name}' does not match pattern ${pattern}"
   }
   }
 };
 };
-var _e = function(e, t, n, r) {
+var je = function(e, t, n, r) {
   function i(o) {
   function i(o) {
     return o instanceof n ? o : new n(function(a) {
     return o instanceof n ? o : new n(function(a) {
       a(o);
       a(o);
@@ -1170,7 +1170,7 @@ function io(e, t) {
   });
   });
 }
 }
 function Xe(e, t, n, r, i) {
 function Xe(e, t, n, r, i) {
-  return _e(this, void 0, void 0, function* () {
+  return je(this, void 0, void 0, function* () {
     const o = P({}, n);
     const o = P({}, n);
     delete o.ruleIndex, delete o.trigger;
     delete o.ruleIndex, delete o.trigger;
     let a = null;
     let a = null;
@@ -1238,7 +1238,7 @@ function gn(e, t, n, r, i, o) {
   });
   });
   let s;
   let s;
   if (i === !0)
   if (i === !0)
-    s = new Promise((v, f) => _e(this, void 0, void 0, function* () {
+    s = new Promise((v, f) => je(this, void 0, void 0, function* () {
       for (let g = 0; g < l.length; g += 1) {
       for (let g = 0; g < l.length; g += 1) {
         const h = l[g], w = yield Xe(a, t, h, r, o);
         const h = l[g], w = yield Xe(a, t, h, r, o);
         if (w.length) {
         if (w.length) {
@@ -1261,12 +1261,12 @@ function gn(e, t, n, r, i, o) {
   return s.catch((v) => v), s;
   return s.catch((v) => v), s;
 }
 }
 function ao(e) {
 function ao(e) {
-  return _e(this, void 0, void 0, function* () {
+  return je(this, void 0, void 0, function* () {
     return Promise.all(e).then((t) => [].concat(...t));
     return Promise.all(e).then((t) => [].concat(...t));
   });
   });
 }
 }
 function oo(e) {
 function oo(e) {
-  return _e(this, void 0, void 0, function* () {
+  return je(this, void 0, void 0, function* () {
     let t = 0;
     let t = 0;
     return new Promise((n) => {
     return new Promise((n) => {
       e.forEach((r) => {
       e.forEach((r) => {
@@ -1325,7 +1325,7 @@ const vn = Symbol("formContextKey"), hn = (e) => {
     colon: $,
     colon: $,
     required: d,
     required: d,
     requiredMark: y
     requiredMark: y
-  } = P(P({}, e), i), [m] = _n("Form"), q = (o = e.label) !== null && o !== void 0 ? o : (a = n.label) === null || a === void 0 ? void 0 : a.call(n);
+  } = P(P({}, e), i), [m] = jn("Form"), q = (o = e.label) !== null && o !== void 0 ? o : (a = n.label) === null || a === void 0 ? void 0 : a.call(n);
   if (!q) return null;
   if (!q) return null;
   const {
   const {
     vertical: u,
     vertical: u,
@@ -1339,18 +1339,18 @@ const vn = Symbol("formContextKey"), hn = (e) => {
   let T = q;
   let T = q;
   const N = $ === !0 || (A == null ? void 0 : A.value) !== !1 && $ !== !1;
   const N = $ === !0 || (A == null ? void 0 : A.value) !== !1 && $ !== !1;
   if (N && !u.value && typeof q == "string" && q.trim() !== "" && (T = q.replace(/[:|:]\s*$/, "")), e.tooltip || n.tooltip) {
   if (N && !u.value && typeof q == "string" && q.trim() !== "" && (T = q.replace(/[:|:]\s*$/, "")), e.tooltip || n.tooltip) {
-    const K = _("span", {
+    const K = j("span", {
       class: `${f}-item-tooltip`
       class: `${f}-item-tooltip`
-    }, [_(jn, {
+    }, [j(_n, {
       title: e.tooltip
       title: e.tooltip
     }, {
     }, {
-      default: () => [_(Mn, null, null)]
+      default: () => [j(Mn, null, null)]
     })]);
     })]);
-    T = _(Se, null, [T, n.tooltip ? (l = n.tooltip) === null || l === void 0 ? void 0 : l.call(n, {
+    T = j(Se, null, [T, n.tooltip ? (l = n.tooltip) === null || l === void 0 ? void 0 : l.call(n, {
       class: `${f}-item-tooltip`
       class: `${f}-item-tooltip`
     }) : K]);
     }) : K]);
   }
   }
-  y === "optional" && !d && (T = _(Se, null, [T, _("span", {
+  y === "optional" && !d && (T = j(Se, null, [T, j("span", {
     class: `${f}-item-optional`
     class: `${f}-item-optional`
   }, [((s = m.value) === null || s === void 0 ? void 0 : s.optional) || ((v = Ln.Form) === null || v === void 0 ? void 0 : v.optional)])]));
   }, [((s = m.value) === null || s === void 0 ? void 0 : s.optional) || ((v = Ln.Form) === null || v === void 0 ? void 0 : v.optional)])]));
   const Q = pe({
   const Q = pe({
@@ -1358,10 +1358,10 @@ const vn = Symbol("formContextKey"), hn = (e) => {
     [`${f}-item-required-mark-optional`]: y === "optional",
     [`${f}-item-required-mark-optional`]: y === "optional",
     [`${f}-item-no-colon`]: !N
     [`${f}-item-no-colon`]: !N
   });
   });
-  return _(Qt, W(W({}, O), {}, {
+  return j(Qt, W(W({}, O), {}, {
     class: L
     class: L
   }), {
   }), {
-    default: () => [_("label", {
+    default: () => [j("label", {
       for: g,
       for: g,
       class: Q,
       class: Q,
       title: typeof q == "string" ? q : "",
       title: typeof q == "string" ? q : "",
@@ -1826,14 +1826,14 @@ const uo = (e) => {
     }), () => {
     }), () => {
       var v, f;
       var v, f;
       const g = Dn(`${r.value}-show-help-item`), h = Bn(`${r.value}-show-help-item`, g);
       const g = Dn(`${r.value}-show-help-item`), h = Bn(`${r.value}-show-help-item`, g);
-      return h.role = "alert", h.class = [s.value, o.value, n.class, `${r.value}-show-help`], _(rr, W(W({}, Gn(`${r.value}-show-help`)), {}, {
+      return h.role = "alert", h.class = [s.value, o.value, n.class, `${r.value}-show-help`], j(rr, W(W({}, Gn(`${r.value}-show-help`)), {}, {
         onAfterEnter: () => e.onErrorVisibleChanged(!0),
         onAfterEnter: () => e.onErrorVisibleChanged(!0),
         onAfterLeave: () => e.onErrorVisibleChanged(!1)
         onAfterLeave: () => e.onErrorVisibleChanged(!1)
       }), {
       }), {
-        default: () => [ir(_(ar, W(W({}, h), {}, {
+        default: () => [ir(j(ar, W(W({}, h), {}, {
           tag: "div"
           tag: "div"
         }), {
         }), {
-          default: () => [(f = e.errors) === null || f === void 0 ? void 0 : f.map((w, $) => _("div", {
+          default: () => [(f = e.errors) === null || f === void 0 ? void 0 : f.map((w, $) => j("div", {
             key: $,
             key: $,
             class: l.value ? `${o.value}-${l.value}` : ""
             class: l.value ? `${o.value}-${l.value}` : ""
           }, [w]))]
           }, [w]))]
@@ -1871,31 +1871,31 @@ const uo = (e) => {
         // status,
         // status,
         extra: d = (s = n.extra) === null || s === void 0 ? void 0 : s.call(n)
         extra: d = (s = n.extra) === null || s === void 0 ? void 0 : s.call(n)
       } = e, y = `${v}-item`, m = f || (i == null ? void 0 : i.value) || {}, q = pe(`${y}-control`, m.class);
       } = e, y = `${v}-item`, m = f || (i == null ? void 0 : i.value) || {}, q = pe(`${y}-control`, m.class);
-      return _(Qt, W(W({}, m), {}, {
+      return j(Qt, W(W({}, m), {}, {
         class: q
         class: q
       }), {
       }), {
         default: () => {
         default: () => {
           var u;
           var u;
-          return _(Se, null, [_("div", {
+          return j(Se, null, [j("div", {
             class: `${y}-control-input`
             class: `${y}-control-input`
-          }, [_("div", {
+          }, [j("div", {
             class: `${y}-control-input-content`
             class: `${y}-control-input-content`
-          }, [(u = n.default) === null || u === void 0 ? void 0 : u.call(n)])]), g !== null || $.length ? _("div", {
+          }, [(u = n.default) === null || u === void 0 ? void 0 : u.call(n)])]), g !== null || $.length ? j("div", {
             style: {
             style: {
               display: "flex",
               display: "flex",
               flexWrap: "nowrap"
               flexWrap: "nowrap"
             }
             }
-          }, [_(yo, {
+          }, [j(yo, {
             errors: $,
             errors: $,
             help: w,
             help: w,
             class: `${y}-explain-connected`,
             class: `${y}-explain-connected`,
             onErrorVisibleChanged: h
             onErrorVisibleChanged: h
-          }, null), !!g && _("div", {
+          }, null), !!g && j("div", {
             style: {
             style: {
               width: 0,
               width: 0,
               height: `${g}px`
               height: `${g}px`
             }
             }
-          }, null)]) : null, d ? _("div", {
+          }, null)]) : null, d ? j("div", {
             class: `${y}-extra`
             class: `${y}-extra`
           }, [d]) : null]);
           }, [d]) : null]);
         }
         }
@@ -2152,9 +2152,9 @@ const Ao = "form_item", Oo = Te({
       let p;
       let p;
       if (e.hasFeedback) {
       if (e.hasFeedback) {
         const I = C.value && xo[C.value];
         const I = C.value && xo[C.value];
-        p = I ? _("span", {
+        p = I ? j("span", {
           class: pe(`${a.value}-item-feedback-icon`, `${a.value}-item-feedback-icon-${C.value}`)
           class: pe(`${a.value}-item-feedback-icon`, `${a.value}-item-feedback-icon-${C.value}`)
-        }, [_(I, null, null)]) : null;
+        }, [j(I, null, null)]) : null;
       }
       }
       P(H, {
       P(H, {
         status: C.value,
         status: C.value,
@@ -2184,16 +2184,16 @@ const Ao = "form_item", Oo = Te({
       var p, I;
       var p, I;
       if (e.noStyle) return (p = n.default) === null || p === void 0 ? void 0 : p.call(n);
       if (e.noStyle) return (p = n.default) === null || p === void 0 ? void 0 : p.call(n);
       const D = (I = e.help) !== null && I !== void 0 ? I : n.help ? Dt(n.help()) : null, G = !!(D != null && Array.isArray(D) && D.length || x.value.length);
       const D = (I = e.help) !== null && I !== void 0 ? I : n.help ? Dt(n.help()) : null, G = !!(D != null && Array.isArray(D) && D.length || x.value.length);
-      return te.value = G, l(_("div", {
+      return te.value = G, l(j("div", {
         class: [R.value, G ? `${a.value}-item-with-help` : "", r.class],
         class: [R.value, G ? `${a.value}-item-with-help` : "", r.class],
         ref: v
         ref: v
-      }, [_(mr, W(W({}, r), {}, {
+      }, [j(mr, W(W({}, r), {}, {
         class: `${a.value}-item-row`,
         class: `${a.value}-item-row`,
         key: "row"
         key: "row"
       }), {
       }), {
         default: () => {
         default: () => {
           var z, U;
           var z, U;
-          return _(Se, null, [_(it, W(W({}, e), {}, {
+          return j(Se, null, [j(it, W(W({}, e), {}, {
             htmlFor: Z.value,
             htmlFor: Z.value,
             required: S.value,
             required: S.value,
             requiredMark: f.requiredMark.value,
             requiredMark: f.requiredMark.value,
@@ -2203,7 +2203,7 @@ const Ao = "form_item", Oo = Te({
           }), {
           }), {
             label: n.label,
             label: n.label,
             tooltip: n.tooltip
             tooltip: n.tooltip
-          }), _(bo, W(W({}, e), {}, {
+          }), j(bo, W(W({}, e), {}, {
             errors: D != null ? ne(D) : x.value,
             errors: D != null ? ne(D) : x.value,
             marginBottom: X.value,
             marginBottom: X.value,
             prefixCls: a.value,
             prefixCls: a.value,
@@ -2216,7 +2216,7 @@ const Ao = "form_item", Oo = Te({
             default: n.default
             default: n.default
           })]);
           })]);
         }
         }
-      }), !!X.value && _("div", {
+      }), !!X.value && j("div", {
         class: `${a.value}-margin-offset`,
         class: `${a.value}-margin-offset`,
         style: {
         style: {
           marginBottom: `-${X.value}px`
           marginBottom: `-${X.value}px`
@@ -2490,7 +2490,7 @@ const oe = Te({
       return C ? Object.values(c).filter((H) => R.findIndex((X) => Eo(X, H.fieldName.value)) > -1) : Object.values(c);
       return C ? Object.values(c).filter((H) => R.findIndex((X) => Eo(X, H.fieldName.value)) > -1) : Object.values(c);
     }, O = (x) => {
     }, O = (x) => {
       if (!e.model) {
       if (!e.model) {
-        je(!1, "Form", "model is required for resetFields to work.");
+        _e(!1, "Form", "model is required for resetFields to work.");
         return;
         return;
       }
       }
       A(x).forEach((C) => {
       A(x).forEach((C) => {
@@ -2533,8 +2533,8 @@ const oe = Te({
       } else
       } else
         return St(e.model, x);
         return St(e.model, x);
     }, Z = (x, C) => {
     }, Z = (x, C) => {
-      if (je(!(x instanceof Function), "Form", "validateFields/validateField/validate not support callback, please use promise instead"), !e.model)
-        return je(!1, "Form", "model is required for validateFields to work."), Promise.reject("Form `model` is required for validateFields to work.");
+      if (_e(!(x instanceof Function), "Form", "validateFields/validateField/validate not support callback, please use promise instead"), !e.model)
+        return _e(!1, "Form", "model is required for validateFields to work."), Promise.reject("Form `model` is required for validateFields to work.");
       const R = !!x, H = R ? ne(x).map(Ke) : [], X = [];
       const R = !!x, H = R ? ne(x).map(Ke) : [], X = [];
       Object.values(c).forEach((k) => {
       Object.values(c).forEach((k) => {
         var p;
         var p;
@@ -2620,7 +2620,7 @@ const oe = Te({
       e.validateOnRuleChange && Z();
       e.validateOnRuleChange && Z();
     }), () => {
     }), () => {
       var x;
       var x;
-      return y(_("form", W(W({}, o), {}, {
+      return y(j("form", W(W({}, o), {}, {
         onSubmit: K,
         onSubmit: K,
         class: [q.value, o.class]
         class: [q.value, o.class]
       }), [(x = r.default) === null || x === void 0 ? void 0 : x.call(r)]));
       }), [(x = r.default) === null || x === void 0 ? void 0 : x.call(r)]));

+ 6 - 6
lib/js/index5.js

@@ -1,5 +1,5 @@
-import { g as P, m as S, bM as _, d, r as w, bN as B, bO as k, b as T, bA as N, u as A, c as z, y as D, _ as h, a3 as I, o as W, i as E, bP as H, aG as C, bQ as M, f as $ } from "./index2.js";
-import { defineComponent as j, ref as R, computed as O, createVNode as b, Fragment as G } from "vue";
+import { g as P, m as S, bN as _, d, r as w, bO as B, bP as k, b as T, bB as N, u as z, c as A, y as D, _ as h, a3 as I, o as W, i as E, bQ as H, aG as C, bR as R, f as $ } from "./index2.js";
+import { defineComponent as j, ref as M, computed as O, createVNode as b, Fragment as G } from "vue";
 const L = (e) => {
 const L = (e) => {
   const {
   const {
     componentCls: o,
     componentCls: o,
@@ -141,7 +141,7 @@ const L = (e) => {
     zIndexPopup: o + 30,
     zIndexPopup: o + 30,
     width: 177
     width: 177
   };
   };
-}), X = () => d(d({}, M()), {
+}), X = () => d(d({}, R()), {
   content: $(),
   content: $(),
   title: $()
   title: $()
 }), Z = j({
 }), Z = j({
@@ -162,7 +162,7 @@ const L = (e) => {
       slots: t,
       slots: t,
       attrs: a
       attrs: a
     } = o;
     } = o;
-    const s = R();
+    const s = M();
     N(e.visible === void 0, "popover", "`visible` will be removed in next major version, please use `open` instead."), r({
     N(e.visible === void 0, "popover", "`visible` will be removed in next major version, please use `open` instead."), r({
       getPopupDomNode: () => {
       getPopupDomNode: () => {
         var n, i;
         var n, i;
@@ -172,7 +172,7 @@ const L = (e) => {
     const {
     const {
       prefixCls: l,
       prefixCls: l,
       configProvider: c
       configProvider: c
-    } = A("popover", e), [u, g] = V(l), p = O(() => c.getPrefixCls()), v = () => {
+    } = z("popover", e), [u, g] = V(l), p = O(() => c.getPrefixCls()), v = () => {
       var n, i;
       var n, i;
       const {
       const {
         title: m = C((n = t.title) === null || n === void 0 ? void 0 : n.call(t)),
         title: m = C((n = t.title) === null || n === void 0 ? void 0 : n.call(t)),
@@ -185,7 +185,7 @@ const L = (e) => {
       }, [f])]);
       }, [f])]);
     };
     };
     return () => {
     return () => {
-      const n = z(e.overlayClassName, g.value);
+      const n = A(e.overlayClassName, g.value);
       return u(b(D, h(h(h({}, W(e, ["title", "content"])), a), {}, {
       return u(b(D, h(h(h({}, W(e, ["title", "content"])), a), {}, {
         prefixCls: l.value,
         prefixCls: l.value,
         ref: s,
         ref: s,

+ 66 - 66
lib/js/index6.js

@@ -1,5 +1,5 @@
-import { G as ot, bR as rt, bS as st, K as ue, bT as ct, _ as z, d as p, aG as it, D as H, bU as ut, A as dt, N as Re, J as vt, L as Xe, M as ft, bV as ht, bW as Ye, o as Ce, O as pt, i as qe, Q as mt, P as de, g as gt, m as et, bX as yt, S as bt, h as Oe, U as St, V as Ct, W as wt, u as xt, X as It, Y as Vt, a4 as kt, Z as Tt, c as Ge, a2 as Nt, a5 as Et, aN as Lt, bY as Pt, av as Fe, ay as He, e as Dt, aw as _t, ax as Kt } from "./index2.js";
-import { inject as At, provide as Ot, defineComponent as We, ref as ye, computed as y, watch as be, nextTick as Ft, shallowRef as $, toRaw as le, createVNode as X, watchEffect as Se, toRef as oe, toRefs as Ht } from "vue";
+import { G as ot, bS as rt, bT as st, K as ue, bU as ct, _ as z, d as p, aG as it, D as H, bV as ut, A as dt, N as $e, J as vt, L as Xe, M as ft, bW as ht, bX as Ye, o as Ce, O as pt, i as qe, Q as mt, P as de, g as gt, m as et, bY as yt, S as bt, h as Oe, U as St, V as Ct, W as wt, u as xt, X as It, Y as Vt, a4 as kt, Z as Tt, c as Ge, a2 as Nt, a5 as Et, aN as Lt, bZ as Pt, av as Fe, ay as He, e as Dt, aw as _t, ax as Kt } from "./index2.js";
+import { inject as At, provide as Ot, defineComponent as We, ref as ye, computed as y, watch as be, nextTick as Ft, shallowRef as R, toRaw as le, createVNode as X, watchEffect as Se, toRef as oe, toRefs as Ht } from "vue";
 function tt(e) {
 function tt(e) {
   return Array.isArray(e) ? e : e !== void 0 ? [e] : [];
   return Array.isArray(e) ? e : e !== void 0 ? [e] : [];
 }
 }
@@ -16,10 +16,10 @@ function Mt(e) {
     children: t || "children"
     children: t || "children"
   };
   };
 }
 }
-function $e(e) {
+function Re(e) {
   return e.disabled || e.disableCheckbox || e.checkable === !1;
   return e.disabled || e.disableCheckbox || e.checkable === !1;
 }
 }
-function Rt(e, c) {
+function $t(e, c) {
   const a = [];
   const a = [];
   function t(l) {
   function t(l) {
     l.forEach((n) => {
     l.forEach((n) => {
@@ -34,7 +34,7 @@ function je(e) {
   return e == null;
   return e == null;
 }
 }
 const lt = Symbol("TreeSelectContextPropsKey");
 const lt = Symbol("TreeSelectContextPropsKey");
-function $t(e) {
+function Rt(e) {
   return Ot(lt, e);
   return Ot(lt, e);
 }
 }
 function jt() {
 function jt() {
@@ -82,9 +82,9 @@ const Bt = {
       immediate: !0,
       immediate: !0,
       flush: "post"
       flush: "post"
     });
     });
-    const u = y(() => String(l.searchValue).toLowerCase()), g = (v) => u.value ? String(v[n.treeNodeFilterProp]).toLowerCase().includes(u.value) : !1, V = $(n.treeDefaultExpandedKeys), C = $(null);
+    const u = y(() => String(l.searchValue).toLowerCase()), g = (v) => u.value ? String(v[n.treeNodeFilterProp]).toLowerCase().includes(u.value) : !1, V = R(n.treeDefaultExpandedKeys), C = R(null);
     be(() => l.searchValue, () => {
     be(() => l.searchValue, () => {
-      l.searchValue && (C.value = Rt(le(r.treeData), le(r.fieldNames)));
+      l.searchValue && (C.value = $t(le(r.treeData), le(r.fieldNames)));
     }, {
     }, {
       immediate: !0
       immediate: !0
     });
     });
@@ -102,7 +102,7 @@ const Bt = {
         checkable: U,
         checkable: U,
         checkedKeys: Y
         checkedKeys: Y
       } = n;
       } = n;
-      U && $e(L) || ((_ = r.onSelect) === null || _ === void 0 || _.call(r, L.key, {
+      U && Re(L) || ((_ = r.onSelect) === null || _ === void 0 || _.call(r, L.key, {
         selected: !Y.includes(L.key)
         selected: !Y.includes(L.key)
       }), l.multiple || (N = l.toggleOpen) === null || N === void 0 || N.call(l, !1));
       }), l.multiple || (N = l.toggleOpen) === null || N === void 0 || N.call(l, !1));
     }, K = ye(null), A = y(() => n.keyEntities[K.value]), F = (v) => {
     }, K = ye(null), A = y(() => n.keyEntities[K.value]), F = (v) => {
@@ -165,7 +165,7 @@ const Bt = {
         checkable: se,
         checkable: se,
         treeDefaultExpandAll: ce,
         treeDefaultExpandAll: ce,
         treeIcon: ae,
         treeIcon: ae,
-        showTreeIcon: J,
+        showTreeIcon: Z,
         switcherIcon: fe,
         switcherIcon: fe,
         treeLine: he,
         treeLine: he,
         loadData: pe,
         loadData: pe,
@@ -180,10 +180,10 @@ const Bt = {
           class: `${b}-empty`,
           class: `${b}-empty`,
           onMousedown: k
           onMousedown: k
         }, [U]);
         }, [U]);
-      const Q = {
+      const J = {
         fieldNames: r.fieldNames
         fieldNames: r.fieldNames
       };
       };
-      return ie && (Q.loadedKeys = ie), I.value && (Q.expandedKeys = I.value), X("div", {
+      return ie && (J.loadedKeys = ie), I.value && (J.expandedKeys = I.value), X("div", {
         onMousedown: k
         onMousedown: k
       }, [A.value && N && X("span", {
       }, [A.value && N && X("span", {
         style: Bt,
         style: Bt,
@@ -198,7 +198,7 @@ const Bt = {
         virtual: ne !== !1 && G !== !1,
         virtual: ne !== !1 && G !== !1,
         multiple: L,
         multiple: L,
         icon: ae,
         icon: ae,
-        showIcon: J,
+        showIcon: Z,
         switcherIcon: fe,
         switcherIcon: fe,
         showLine: he,
         showLine: he,
         loadData: _ ? null : pe,
         loadData: _ ? null : pe,
@@ -209,7 +209,7 @@ const Bt = {
         checkedKeys: o.value,
         checkedKeys: o.value,
         selectedKeys: se ? [] : M,
         selectedKeys: se ? [] : M,
         defaultExpandAll: ce
         defaultExpandAll: ce
-      }, Q), {}, {
+      }, J), {}, {
         onActiveChange: F,
         onActiveChange: F,
         onSelect: O,
         onSelect: O,
         onCheck: O,
         onCheck: O,
@@ -223,7 +223,7 @@ const Bt = {
     };
     };
   }
   }
 }), Ut = "SHOW_ALL", nt = "SHOW_PARENT", Ue = "SHOW_CHILD";
 }), Ut = "SHOW_ALL", nt = "SHOW_PARENT", Ue = "SHOW_CHILD";
-function Je(e, c, a, t) {
+function Ze(e, c, a, t) {
   const l = new Set(e);
   const l = new Set(e);
   return c === Ue ? e.filter((n) => {
   return c === Ue ? e.filter((n) => {
     const r = a[n];
     const r = a[n];
@@ -236,11 +236,11 @@ function Je(e, c, a, t) {
       let {
       let {
         node: d
         node: d
       } = s;
       } = s;
-      return $e(d) || l.has(d[t.value]);
+      return Re(d) || l.has(d[t.value]);
     }));
     }));
   }) : c === nt ? e.filter((n) => {
   }) : c === nt ? e.filter((n) => {
     const r = a[n], s = r ? r.parent : null;
     const r = a[n], s = r ? r.parent : null;
-    return !(s && !$e(s.node) && l.has(s.key));
+    return !(s && !Re(s.node) && l.has(s.key));
   }) : e;
   }) : e;
 }
 }
 const ve = () => null;
 const ve = () => null;
@@ -356,7 +356,7 @@ function Gt(e, c, a, t, l, n) {
     }
     }
   });
   });
 }
 }
-function Jt(e, c) {
+function Zt(e, c) {
   let {
   let {
     id: a,
     id: a,
     pId: t,
     pId: t,
@@ -371,11 +371,11 @@ function Jt(e, c) {
     u && (u.children = u.children || [], u.children.push(d)), (o === l || !u && l === null) && r.push(d);
     u && (u.children = u.children || [], u.children.push(d)), (o === l || !u && l === null) && r.push(d);
   }), r;
   }), r;
 }
 }
-function Qt(e, c, a) {
-  const t = $();
+function Jt(e, c, a) {
+  const t = R();
   return be([a, e, c], () => {
   return be([a, e, c], () => {
     const l = a.value;
     const l = a.value;
-    e.value ? t.value = a.value ? Jt(le(e.value), p({
+    e.value ? t.value = a.value ? Zt(le(e.value), p({
       id: "id",
       id: "id",
       pId: "pId",
       pId: "pId",
       rootPId: null
       rootPId: null
@@ -385,10 +385,10 @@ function Qt(e, c, a) {
     deep: !0
     deep: !0
   }), t;
   }), t;
 }
 }
-const Zt = (e) => {
-  const c = $({
+const Qt = (e) => {
+  const c = R({
     valueLabels: /* @__PURE__ */ new Map()
     valueLabels: /* @__PURE__ */ new Map()
-  }), a = $();
+  }), a = R();
   return be(e, () => {
   return be(e, () => {
     a.value = le(e.value);
     a.value = le(e.value);
   }, {
   }, {
@@ -408,7 +408,7 @@ const Zt = (e) => {
     return c.value.valueLabels = n, r;
     return c.value.valueLabels = n, r;
   })];
   })];
 }, qt = (e, c) => {
 }, qt = (e, c) => {
-  const a = $(/* @__PURE__ */ new Map()), t = $({});
+  const a = R(/* @__PURE__ */ new Map()), t = R({});
   return Se(() => {
   return Se(() => {
     const l = c.value, n = dt(e.value, {
     const l = c.value, n = dt(e.value, {
       fieldNames: l,
       fieldNames: l,
@@ -430,7 +430,7 @@ const Zt = (e) => {
     keyEntities: t
     keyEntities: t
   };
   };
 }, el = (e, c, a, t, l, n) => {
 }, el = (e, c, a, t, l, n) => {
-  const r = $([]), s = $([]);
+  const r = R([]), s = R([]);
   return Se(() => {
   return Se(() => {
     let d = e.value.map((g) => {
     let d = e.value.map((g) => {
       let {
       let {
@@ -447,7 +447,7 @@ const Zt = (e) => {
     a.value && ({
     a.value && ({
       checkedKeys: d,
       checkedKeys: d,
       halfCheckedKeys: o
       halfCheckedKeys: o
-    } = Re(d, !0, t.value, l.value, n.value)), r.value = Array.from(/* @__PURE__ */ new Set([...u, ...d])), s.value = o;
+    } = $e(d, !0, t.value, l.value, n.value)), r.value = Array.from(/* @__PURE__ */ new Set([...u, ...d])), s.value = o;
   }), [r, s];
   }), [r, s];
 }, tl = (e, c, a) => {
 }, tl = (e, c, a) => {
   let {
   let {
@@ -667,7 +667,7 @@ const al = We({
     }), C = (i) => {
     }), C = (i) => {
       var f;
       var f;
       V(i), (f = e.onSearch) === null || f === void 0 || f.call(e, i);
       V(i), (f = e.onSearch) === null || f === void 0 || f.call(e, i);
-    }, I = Qt(oe(e, "treeData"), oe(e, "children"), oe(e, "treeDataSimpleMode")), {
+    }, I = Jt(oe(e, "treeData"), oe(e, "children"), oe(e, "treeDataSimpleMode")), {
       keyEntities: w,
       keyEntities: w,
       valueEntities: k
       valueEntities: k
     } = qt(I, u), O = (i) => {
     } = qt(I, u), O = (i) => {
@@ -715,7 +715,7 @@ const al = We({
       };
       };
     }), [b, L] = Xe(e.defaultValue, {
     }), [b, L] = Xe(e.defaultValue, {
       value: oe(e, "value")
       value: oe(e, "value")
-    }), _ = y(() => F(b.value)), N = $([]), U = $([]);
+    }), _ = y(() => F(b.value)), N = R([]), U = R([]);
     Se(() => {
     Se(() => {
       const i = [], f = [];
       const i = [], f = [];
       _.value.forEach((h) => {
       _.value.forEach((h) => {
@@ -726,9 +726,9 @@ const al = We({
       maxLevel: j,
       maxLevel: j,
       levelEntities: ne
       levelEntities: ne
     } = ft(w), [G, re] = el(N, U, r, w, j, ne), se = y(() => {
     } = ft(w), [G, re] = el(N, U, r, w, j, ne), se = y(() => {
-      const h = Je(G.value, e.showCheckedStrategy, w.value, u.value).map((E) => {
-        var S, T, R;
-        return (R = (T = (S = w.value[E]) === null || S === void 0 ? void 0 : S.node) === null || T === void 0 ? void 0 : T[u.value.value]) !== null && R !== void 0 ? R : E;
+      const h = Ze(G.value, e.showCheckedStrategy, w.value, u.value).map((E) => {
+        var S, T, $;
+        return ($ = (T = (S = w.value[E]) === null || S === void 0 ? void 0 : S.node) === null || T === void 0 ? void 0 : T[u.value.value]) !== null && $ !== void 0 ? $ : E;
       }).map((E) => {
       }).map((E) => {
         const S = N.value.find((T) => T.value === E);
         const S = N.value.find((T) => T.value === E);
         return {
         return {
@@ -742,11 +742,11 @@ const al = We({
           label: (S = E.label) !== null && S !== void 0 ? S : E.value
           label: (S = E.label) !== null && S !== void 0 ? S : E.value
         });
         });
       });
       });
-    }), [ce] = Zt(se), ae = (i, f, h) => {
+    }), [ce] = Qt(se), ae = (i, f, h) => {
       const x = v(i);
       const x = v(i);
       if (L(x), e.autoClearSearchValue && V(""), e.onChange) {
       if (L(x), e.autoClearSearchValue && V(""), e.onChange) {
         let D = i;
         let D = i;
-        r.value && (D = Je(i, e.showCheckedStrategy, w.value, u.value).map((te) => {
+        r.value && (D = Ze(i, e.showCheckedStrategy, w.value, u.value).map((te) => {
           const ge = k.value.get(te);
           const ge = k.value.get(te);
           return ge ? ge.node[u.value.value] : te;
           return ge ? ge.node[u.value.value] : te;
         }));
         }));
@@ -762,23 +762,23 @@ const al = We({
           const W = U.value.filter((te) => !D.includes(te.value));
           const W = U.value.filter((te) => !D.includes(te.value));
           T = [...T, ...W];
           T = [...T, ...W];
         }
         }
-        const R = v(T), q = {
+        const $ = v(T), q = {
           // [Legacy] Always return as array contains label & value
           // [Legacy] Always return as array contains label & value
           preValue: N.value,
           preValue: N.value,
           triggerValue: E
           triggerValue: E
         };
         };
         let ee = !0;
         let ee = !0;
         (e.treeCheckStrictly || h === "selection" && !S) && (ee = !1), Gt(q, E, i, I.value, ee, u.value), s.value ? q.checked = S : q.selected = S;
         (e.treeCheckStrictly || h === "selection" && !S) && (ee = !1), Gt(q, E, i, I.value, ee, u.value), s.value ? q.checked = S : q.selected = S;
-        const B = d.value ? R : R.map((W) => W.value);
-        e.onChange(o.value ? B : B[0], d.value ? null : R.map((W) => W.label), q);
+        const B = d.value ? $ : $.map((W) => W.value);
+        e.onChange(o.value ? B : B[0], d.value ? null : $.map((W) => W.label), q);
       }
       }
-    }, J = (i, f) => {
+    }, Z = (i, f) => {
       let {
       let {
         selected: h,
         selected: h,
         source: x
         source: x
       } = f;
       } = f;
       var D, E, S;
       var D, E, S;
-      const T = le(w.value), R = le(k.value), q = T[i], ee = q == null ? void 0 : q.node, B = (D = ee == null ? void 0 : ee[u.value.value]) !== null && D !== void 0 ? D : i;
+      const T = le(w.value), $ = le(k.value), q = T[i], ee = q == null ? void 0 : q.node, B = (D = ee == null ? void 0 : ee[u.value.value]) !== null && D !== void 0 ? D : i;
       if (!o.value)
       if (!o.value)
         ae([B], {
         ae([B], {
           selected: !0,
           selected: !0,
@@ -790,13 +790,13 @@ const al = We({
           const {
           const {
             missingRawValues: te,
             missingRawValues: te,
             existRawValues: ge
             existRawValues: ge
-          } = O(W), ze = ge.map((Ae) => R.get(Ae).key);
+          } = O(W), ze = ge.map((Ae) => $.get(Ae).key);
           let Ke;
           let Ke;
           h ? {
           h ? {
             checkedKeys: Ke
             checkedKeys: Ke
-          } = Re(ze, !0, T, j.value, ne.value) : {
+          } = $e(ze, !0, T, j.value, ne.value) : {
             checkedKeys: Ke
             checkedKeys: Ke
-          } = Re(ze, {
+          } = $e(ze, {
             halfCheckedKeys: re.value
             halfCheckedKeys: re.value
           }, T, j.value, ne.value), W = [...te, ...Ke.map((Ae) => T[Ae].node[u.value.value])];
           }, T, j.value, ne.value), W = [...te, ...Ke.map((Ae) => T[Ae].node[u.value.value])];
         }
         }
@@ -821,7 +821,7 @@ const al = We({
         ae(h, {}, "selection");
         ae(h, {}, "selection");
         return;
         return;
       }
       }
-      f.values.length && J(f.values[0].value, {
+      f.values.length && Z(f.values[0].value, {
         selected: !1,
         selected: !1,
         source: "selection"
         source: "selection"
       });
       });
@@ -833,7 +833,7 @@ const al = We({
       onTreeLoad: P,
       onTreeLoad: P,
       // Expanded
       // Expanded
       treeDefaultExpandAll: M,
       treeDefaultExpandAll: M,
-      treeExpandedKeys: Q,
+      treeExpandedKeys: J,
       treeDefaultExpandedKeys: we,
       treeDefaultExpandedKeys: we,
       onTreeExpand: xe,
       onTreeExpand: xe,
       // Options
       // Options
@@ -858,7 +858,7 @@ const al = We({
       checkedKeys: G,
       checkedKeys: G,
       halfCheckedKeys: re,
       halfCheckedKeys: re,
       treeDefaultExpandAll: M,
       treeDefaultExpandAll: M,
-      treeExpandedKeys: Q,
+      treeExpandedKeys: J,
       treeDefaultExpandedKeys: we,
       treeDefaultExpandedKeys: we,
       onTreeExpand: xe,
       onTreeExpand: xe,
       treeIcon: me,
       treeIcon: me,
@@ -869,29 +869,29 @@ const al = We({
       treeNodeFilterProp: pe,
       treeNodeFilterProp: pe,
       keyEntities: w,
       keyEntities: w,
       customSlots: Pe
       customSlots: Pe
-    })), $t(Ye({
+    })), Rt(Ye({
       virtual: Ie,
       virtual: Ie,
       listHeight: Ve,
       listHeight: Ve,
       listItemHeight: ke,
       listItemHeight: ke,
       treeData: K,
       treeData: K,
       fieldNames: u,
       fieldNames: u,
-      onSelect: J,
+      onSelect: Z,
       dropdownMatchSelectWidth: De,
       dropdownMatchSelectWidth: De,
       treeExpandAction: _e
       treeExpandAction: _e
     }));
     }));
-    const Z = ye();
+    const Q = ye();
     return t({
     return t({
       focus() {
       focus() {
         var i;
         var i;
-        (i = Z.value) === null || i === void 0 || i.focus();
+        (i = Q.value) === null || i === void 0 || i.focus();
       },
       },
       blur() {
       blur() {
         var i;
         var i;
-        (i = Z.value) === null || i === void 0 || i.blur();
+        (i = Q.value) === null || i === void 0 || i.blur();
       },
       },
       scrollTo(i) {
       scrollTo(i) {
         var f;
         var f;
-        (f = Z.value) === null || f === void 0 || f.scrollTo(i);
+        (f = Q.value) === null || f === void 0 || f.scrollTo(i);
       }
       }
     }), () => {
     }), () => {
       var i;
       var i;
@@ -947,7 +947,7 @@ const al = We({
         "treeMotion"
         "treeMotion"
       ]);
       ]);
       return X(pt, z(z(z({
       return X(pt, z(z(z({
-        ref: Z
+        ref: Q
       }, a), f), {}, {
       }, a), f), {}, {
         id: n,
         id: n,
         prefixCls: e.prefixCls,
         prefixCls: e.prefixCls,
@@ -1021,7 +1021,7 @@ function rl(e, c) {
     return [ol(t)];
     return [ol(t)];
   })(e);
   })(e);
 }
 }
-const Qe = (e, c, a) => a !== void 0 ? a : `${e}-${c}`;
+const Je = (e, c, a) => a !== void 0 ? a : `${e}-${c}`;
 function sl() {
 function sl() {
   return p(p({}, Ce(at(), ["showTreeIcon", "treeMotion", "inputIcon", "getInputElement", "treeLine", "customSlots"])), {
   return p(p({}, Ce(at(), ["showTreeIcon", "treeMotion", "inputIcon", "getInputElement", "treeLine", "customSlots"])), {
     suffixIcon: de.any,
     suffixIcon: de.any,
@@ -1077,17 +1077,17 @@ const Me = We({
     } = It(o, g), F = y(() => K.value || I.value), v = Vt(), b = y(() => {
     } = It(o, g), F = y(() => K.value || I.value), v = Vt(), b = y(() => {
       var m;
       var m;
       return (m = O.value) !== null && m !== void 0 ? m : v.value;
       return (m = O.value) !== null && m !== void 0 ? m : v.value;
-    }), L = y(() => k()), _ = y(() => e.placement !== void 0 ? e.placement : g.value === "rtl" ? "bottomRight" : "bottomLeft"), N = y(() => Qe(L.value, kt(_.value), e.transitionName)), U = y(() => Qe(L.value, "", e.choiceTransitionName)), Y = y(() => k("select-tree", e.prefixCls)), j = y(() => k("tree-select", e.prefixCls)), [ne, G] = Tt(o), [re] = rl(j, Y), se = y(() => Ge(e.popupClassName || e.dropdownClassName, `${j.value}-dropdown`, {
+    }), L = y(() => k()), _ = y(() => e.placement !== void 0 ? e.placement : g.value === "rtl" ? "bottomRight" : "bottomLeft"), N = y(() => Je(L.value, kt(_.value), e.transitionName)), U = y(() => Je(L.value, "", e.choiceTransitionName)), Y = y(() => k("select-tree", e.prefixCls)), j = y(() => k("tree-select", e.prefixCls)), [ne, G] = Tt(o), [re] = rl(j, Y), se = y(() => Ge(e.popupClassName || e.dropdownClassName, `${j.value}-dropdown`, {
       [`${j.value}-dropdown-rtl`]: g.value === "rtl"
       [`${j.value}-dropdown-rtl`]: g.value === "rtl"
-    }, G.value)), ce = y(() => !!(e.treeCheckable || e.multiple)), ae = y(() => e.showArrow !== void 0 ? e.showArrow : e.loading || !ce.value), J = ye();
+    }, G.value)), ce = y(() => !!(e.treeCheckable || e.multiple)), ae = y(() => e.showArrow !== void 0 ? e.showArrow : e.loading || !ce.value), Z = ye();
     l({
     l({
       focus() {
       focus() {
         var m, P;
         var m, P;
-        (P = (m = J.value).focus) === null || P === void 0 || P.call(m);
+        (P = (m = Z.value).focus) === null || P === void 0 || P.call(m);
       },
       },
       blur() {
       blur() {
         var m, P;
         var m, P;
-        (P = (m = J.value).blur) === null || P === void 0 || P.call(m);
+        (P = (m = Z.value).blur) === null || P === void 0 || P.call(m);
       }
       }
     });
     });
     const fe = function() {
     const fe = function() {
@@ -1104,7 +1104,7 @@ const Me = We({
     return () => {
     return () => {
       var m, P, M;
       var m, P, M;
       const {
       const {
-        notFoundContent: Q = (m = t.notFoundContent) === null || m === void 0 ? void 0 : m.call(t),
+        notFoundContent: J = (m = t.notFoundContent) === null || m === void 0 ? void 0 : m.call(t),
         prefixCls: we,
         prefixCls: we,
         bordered: xe,
         bordered: xe,
         listHeight: Ie,
         listHeight: Ie,
@@ -1119,7 +1119,7 @@ const Me = We({
         placeholder: De = (M = t.placeholder) === null || M === void 0 ? void 0 : M.call(t)
         placeholder: De = (M = t.placeholder) === null || M === void 0 ? void 0 : M.call(t)
       } = e, {
       } = e, {
         isFormItemInput: _e,
         isFormItemInput: _e,
-        hasFeedback: Z,
+        hasFeedback: Q,
         feedbackIcon: i
         feedbackIcon: i
       } = s, {
       } = s, {
         suffixIcon: f,
         suffixIcon: f,
@@ -1128,26 +1128,26 @@ const Me = We({
       } = Nt(p(p({}, e), {
       } = Nt(p(p({}, e), {
         multiple: ce.value,
         multiple: ce.value,
         showArrow: ae.value,
         showArrow: ae.value,
-        hasFeedback: Z,
+        hasFeedback: Q,
         feedbackIcon: i,
         feedbackIcon: i,
         prefixCls: o.value
         prefixCls: o.value
       }), t);
       }), t);
       let D;
       let D;
-      Q !== void 0 ? D = Q : D = u("Select");
+      J !== void 0 ? D = J : D = u("Select");
       const E = Ce(e, ["suffixIcon", "itemIcon", "removeIcon", "clearIcon", "switcherIcon", "bordered", "status", "onUpdate:value", "onUpdate:treeExpandedKeys", "onUpdate:searchValue"]), S = Ge(!we && j.value, {
       const E = Ce(e, ["suffixIcon", "itemIcon", "removeIcon", "clearIcon", "switcherIcon", "bordered", "status", "onUpdate:value", "onUpdate:treeExpandedKeys", "onUpdate:searchValue"]), S = Ge(!we && j.value, {
         [`${o.value}-lg`]: F.value === "large",
         [`${o.value}-lg`]: F.value === "large",
         [`${o.value}-sm`]: F.value === "small",
         [`${o.value}-sm`]: F.value === "small",
         [`${o.value}-rtl`]: g.value === "rtl",
         [`${o.value}-rtl`]: g.value === "rtl",
         [`${o.value}-borderless`]: !xe,
         [`${o.value}-borderless`]: !xe,
         [`${o.value}-in-form-item`]: _e
         [`${o.value}-in-form-item`]: _e
-      }, Et(o.value, d.value, Z), A.value, a.class, G.value), T = {};
+      }, Et(o.value, d.value, Q), A.value, a.class, G.value), T = {};
       return e.treeData === void 0 && t.default && (T.children = Lt(t.default())), ne(re(X(al, z(z(z(z({}, a), E), {}, {
       return e.treeData === void 0 && t.default && (T.children = Lt(t.default())), ne(re(X(al, z(z(z(z({}, a), E), {}, {
         disabled: b.value,
         disabled: b.value,
         virtual: V.value,
         virtual: V.value,
         dropdownMatchSelectWidth: C.value,
         dropdownMatchSelectWidth: C.value,
         id: Pe,
         id: Pe,
         fieldNames: Le,
         fieldNames: Le,
-        ref: J,
+        ref: Z,
         prefixCls: o.value,
         prefixCls: o.value,
         class: S,
         class: S,
         listHeight: Ie,
         listHeight: Ie,
@@ -1157,7 +1157,7 @@ const Me = We({
         multiple: ke,
         multiple: ke,
         removeIcon: h,
         removeIcon: h,
         clearIcon: x,
         clearIcon: x,
-        switcherIcon: (R) => Pt(Y.value, Ee, R, t.leafIcon, me),
+        switcherIcon: ($) => Pt(Y.value, Ee, $, t.leafIcon, me),
         showTreeIcon: Te,
         showTreeIcon: Te,
         notFoundContent: D,
         notFoundContent: D,
         getPopupContainer: w == null ? void 0 : w.value,
         getPopupContainer: w == null ? void 0 : w.value,
@@ -1177,7 +1177,7 @@ const Me = We({
         }),
         }),
         maxTagPlaceholder: e.maxTagPlaceholder || t.maxTagPlaceholder,
         maxTagPlaceholder: e.maxTagPlaceholder || t.maxTagPlaceholder,
         placement: _.value,
         placement: _.value,
-        showArrow: Z || Ne,
+        showArrow: Q || Ne,
         placeholder: De
         placeholder: De
       }), p(p({}, t), {
       }), p(p({}, t), {
         treeCheckable: () => X("span", {
         treeCheckable: () => X("span", {
@@ -1186,12 +1186,12 @@ const Me = We({
       }))));
       }))));
     };
     };
   }
   }
-}), Ze = ve, ul = p(Me, {
+}), Qe = ve, ul = p(Me, {
   TreeNode: ve,
   TreeNode: ve,
   SHOW_ALL: Ut,
   SHOW_ALL: Ut,
   SHOW_PARENT: nt,
   SHOW_PARENT: nt,
   SHOW_CHILD: Ue,
   SHOW_CHILD: Ue,
-  install: (e) => (e.component(Me.name, Me), e.component(Ze.displayName, Ze), e)
+  install: (e) => (e.component(Me.name, Me), e.component(Qe.displayName, Qe), e)
 });
 });
 export {
 export {
   ul as _
   ul as _

+ 12 - 12
lib/js/index7.js

@@ -1,4 +1,4 @@
-import { d as B, P as c, e as j, av as Se, l as ke, c as G, _ as P, o as fe, K as $e, bZ as xe, i as pe, g as Oe, m as Pe, b as _e, u as De, h as ne, b_ as oe, az as ae, a3 as re, b$ as Ne, c0 as K, c1 as Ie } from "./index2.js";
+import { d as B, P as c, e as j, av as Se, l as ke, c as G, _ as P, o as fe, K as $e, b_ as xe, i as pe, g as Oe, m as Pe, b as _e, u as De, h as ne, b$ as oe, az as ae, a3 as re, c0 as Ne, c1 as K, c2 as Ie } from "./index2.js";
 import { defineComponent as q, shallowRef as O, onMounted as me, nextTick as L, watch as E, onUnmounted as ve, createVNode as u, Transition as le, withDirectives as ie, vShow as se, ref as Me, computed as I, inject as Te, provide as je } from "vue";
 import { defineComponent as q, shallowRef as O, onMounted as me, nextTick as L, watch as E, onUnmounted as ve, createVNode as u, Transition as le, withDirectives as ie, vShow as se, ref as Me, computed as I, inject as Te, provide as je } from "vue";
 const ye = () => ({
 const ye = () => ({
   prefixCls: String,
   prefixCls: String,
@@ -183,9 +183,9 @@ const de = q({
         placement: $,
         placement: $,
         level: A,
         level: A,
         levelMove: V,
         levelMove: V,
-        ease: Z,
-        duration: J,
-        getContainer: Q,
+        ease: J,
+        duration: Q,
+        getContainer: Z,
         onChange: ee,
         onChange: ee,
         afterVisibleChange: te,
         afterVisibleChange: te,
         showMask: z,
         showMask: z,
@@ -800,7 +800,7 @@ const Xe = ["top", "right", "bottom", "left"], ue = {
     }), V = I(() => {
     }), V = I(() => {
       var n;
       var n;
       return (n = e.height) !== null && n !== void 0 ? n : e.size === "large" ? 736 : 378;
       return (n = e.height) !== null && n !== void 0 ? n : e.size === "large" ? 736 : 378;
-    }), Z = I(() => {
+    }), J = I(() => {
       const {
       const {
         mask: n,
         mask: n,
         placement: r
         placement: r
@@ -809,16 +809,16 @@ const Xe = ["top", "right", "bottom", "left"], ue = {
         return {};
         return {};
       const s = {};
       const s = {};
       return r === "left" || r === "right" ? s.width = oe(A.value) ? `${A.value}px` : A.value : s.height = oe(V.value) ? `${V.value}px` : V.value, s;
       return r === "left" || r === "right" ? s.width = oe(A.value) ? `${A.value}px` : A.value : s.height = oe(V.value) ? `${V.value}px` : V.value, s;
-    }), J = I(() => {
+    }), Q = I(() => {
       const {
       const {
         zIndex: n,
         zIndex: n,
         contentWrapperStyle: r
         contentWrapperStyle: r
-      } = e, s = Z.value;
+      } = e, s = J.value;
       return [{
       return [{
         zIndex: n,
         zIndex: n,
         transform: S.value ? $.value : void 0
         transform: S.value ? $.value : void 0
       }, B({}, r), s];
       }, B({}, r), s];
-    }), Q = (n) => {
+    }), Z = (n) => {
       const {
       const {
         closable: r,
         closable: r,
         headerStyle: s
         headerStyle: s
@@ -857,7 +857,7 @@ const Xe = ["top", "right", "bottom", "left"], ue = {
       return u("div", {
       return u("div", {
         class: `${n}-wrapper-body`,
         class: `${n}-wrapper-body`,
         style: x
         style: x
-      }, [Q(n), u("div", {
+      }, [Z(n), u("div", {
         key: "body",
         key: "body",
         class: `${n}-body`,
         class: `${n}-body`,
         style: s
         style: s
@@ -902,7 +902,7 @@ const Xe = ["top", "right", "bottom", "left"], ue = {
           getContainer: a.value,
           getContainer: a.value,
           rootClassName: W.value,
           rootClassName: W.value,
           rootStyle: e.rootStyle,
           rootStyle: e.rootStyle,
-          contentWrapperStyle: J.value
+          contentWrapperStyle: Q.value
         }), {
         }), {
           handler: e.handle ? () => e.handle : t.handle,
           handler: e.handle ? () => e.handle : t.handle,
           default: () => te(g.value)
           default: () => te(g.value)
@@ -910,7 +910,7 @@ const Xe = ["top", "right", "bottom", "left"], ue = {
       }));
       }));
     };
     };
   }
   }
-}), Ze = _e(Ke);
+}), Je = _e(Ke);
 export {
 export {
-  Ze as _
+  Je as _
 };
 };

+ 1 - 1
lib/js/index8.js

@@ -1,4 +1,4 @@
-import { c2 as et, c as W, _ as V, av as A, D as tt, w as Ae, d as v, K as ie, ax as F, aw as Z, ay as we, g as nt, c3 as at, T as rt, r as Ve, c4 as We, c5 as je, c6 as lt, c7 as it, c8 as ot, c9 as st, ca as He, cb as ut, U as dt, V as ct, W as ft, u as pt, X as mt, Y as gt, a5 as Se, o as vt, cc as ht, cd as bt, b$ as Oe, ce as Te, F as St, P as $e } from "./index2.js";
+import { c3 as et, c as W, _ as V, av as A, D as tt, w as Ae, d as v, K as ie, ax as F, aw as Z, ay as we, g as nt, c4 as at, T as rt, r as Ve, c5 as We, c6 as je, c7 as lt, c8 as it, c9 as ot, ca as st, cb as He, cc as ut, U as dt, V as ct, W as ft, u as pt, X as mt, Y as gt, a5 as Se, o as vt, cd as ht, ce as bt, c0 as Oe, cf as Te, F as St, P as $e } from "./index2.js";
 import { defineComponent as Ee, ref as Ge, onBeforeUnmount as qe, createVNode as b, shallowRef as M, computed as j, watch as ee } from "vue";
 import { defineComponent as Ee, ref as Ge, onBeforeUnmount as qe, createVNode as b, shallowRef as M, computed as j, watch as ee } from "vue";
 function xe() {
 function xe() {
   return typeof BigInt == "function";
   return typeof BigInt == "function";

+ 1 - 1
lib/js/login.js

@@ -14,7 +14,7 @@ var oA = (A, e, w) => new Promise((B, g) => {
   }, P = (Y) => Y.done ? B(Y.value) : Promise.resolve(Y.value).then(r, x);
   }, P = (Y) => Y.done ? B(Y.value) : Promise.resolve(Y.value).then(r, x);
   P((w = w.apply(A, e)).next());
   P((w = w.apply(A, e)).next());
 });
 });
-import { g as Hw, m as Lw, d as MA, r as Ow, u as xw, _ as mA, i as VB, ax as Zw, dc as pA, f as bw, av as lw, aw as FB, o as Gw, cf as k, dd as dw, cg as aw, n as XA, de as oB, df as NB, dg as uw, dh as yw, ad as Xw, di as jw, dj as Vw, dk as Fw, I as ow, d7 as Nw, B as mw, a6 as Jw, a7 as kw, ao as Kw, dl as Ew, dm as Iw } from "./index2.js";
+import { g as Hw, m as Lw, d as MA, r as Ow, u as xw, _ as mA, i as VB, ax as Zw, dd as pA, f as bw, av as lw, aw as FB, o as Gw, cg as k, de as dw, ch as aw, n as XA, df as oB, dg as NB, dh as uw, di as yw, ad as Xw, dj as jw, dk as Vw, dl as Fw, I as ow, d8 as Nw, B as mw, a6 as Jw, a7 as kw, ao as Kw, dm as Ew, dn as Iw } from "./index2.js";
 import { createVNode as m, defineComponent as mB, ref as ig, onMounted as pw, onUpdated as Tw, onBeforeUnmount as Sw, openBlock as N, createElementBlock as I, normalizeStyle as sA, createElementVNode as F, withDirectives as ug, vShow as yg, Transition as Uw, withCtx as S, normalizeClass as yA, toDisplayString as R, createCommentVNode as _, Fragment as JB, renderList as kB, createTextVNode as WA, createBlock as CA, resolveDynamicComponent as KB, resolveComponent as Gg, withModifiers as dA } from "vue";
 import { createVNode as m, defineComponent as mB, ref as ig, onMounted as pw, onUpdated as Tw, onBeforeUnmount as Sw, openBlock as N, createElementBlock as I, normalizeStyle as sA, createElementVNode as F, withDirectives as ug, vShow as yg, Transition as Uw, withCtx as S, normalizeClass as yA, toDisplayString as R, createCommentVNode as _, Fragment as JB, renderList as kB, createTextVNode as WA, createBlock as CA, resolveDynamicComponent as KB, resolveComponent as Gg, withModifiers as dA } from "vue";
 import { F as iw, _ as qw } from "./index4.js";
 import { F as iw, _ as qw } from "./index4.js";
 import { T as hw, _ as Rw } from "./index11.js";
 import { T as hw, _ as Rw } from "./index11.js";

Разница между файлами не показана из-за своего большого размера
+ 115 - 115
lib/js/workplace.js


Некоторые файлы не были показаны из-за большого количества измененных файлов