提交 3e31c436 编写于 作者: ibizdev's avatar ibizdev

zhujiamin 发布系统代码 [TrainSys,网页端]

上级 6d19504c
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
"dependencies": { "dependencies": {
"@floating-ui/dom": "^1.0.11", "@floating-ui/dom": "^1.0.11",
"@ibiz-template/command": "^0.0.1-beta.50", "@ibiz-template/command": "^0.0.1-beta.50",
"@ibiz-template/controller": "^0.0.1-beta.80", "@ibiz-template/controller": "^0.0.1-beta.81",
"@ibiz-template/core": "^0.0.1-beta.80", "@ibiz-template/core": "^0.0.1-beta.81",
"@ibiz-template/model": "^0.0.1-beta.80", "@ibiz-template/model": "^0.0.1-beta.81",
"@ibiz-template/runtime": "^0.0.1-beta.80", "@ibiz-template/runtime": "^0.0.1-beta.81",
"@ibiz-template/service": "^0.0.1-beta.80", "@ibiz-template/service": "^0.0.1-beta.81",
"@ibiz-template/theme": "^0.0.1-beta.80", "@ibiz-template/theme": "^0.0.1-beta.81",
"@ibiz-template/vue-util": "^0.0.1-beta.80", "@ibiz-template/vue-util": "^0.0.1-beta.81",
"@ibiz/dynamic-model-api": "^2.1.17", "@ibiz/dynamic-model-api": "^2.1.17",
"@riophae/vue-treeselect": "^0.4.0", "@riophae/vue-treeselect": "^0.4.0",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
......
此差异已折叠。
...@@ -13,6 +13,7 @@ import { ...@@ -13,6 +13,7 @@ import {
} from 'vue'; } from 'vue';
import '@ibiz-template/theme/style/components/util/popover/popover.scss'; import '@ibiz-template/theme/style/components/util/popover/popover.scss';
import { OverlayPopoverContainer } from '../overlay-popover-container/overlay-popover-container'; import { OverlayPopoverContainer } from '../overlay-popover-container/overlay-popover-container';
import { useUIStore } from '@/store';
/** /**
* 计算飘窗显示 * 计算飘窗显示
...@@ -91,6 +92,9 @@ const AppPopoverComponent = defineComponent({ ...@@ -91,6 +92,9 @@ const AppPopoverComponent = defineComponent({
return props.opts.autoClose === true && isHover.value === false; return props.opts.autoClose === true && isHover.value === false;
}); });
const { zIndex } = useUIStore();
const popoverZIndex = zIndex.increment();
// 鼠标入飘窗内容区 // 鼠标入飘窗内容区
function onMouseenter(e: MouseEvent): void { function onMouseenter(e: MouseEvent): void {
e.stopPropagation(); e.stopPropagation();
...@@ -105,6 +109,7 @@ const AppPopoverComponent = defineComponent({ ...@@ -105,6 +109,7 @@ const AppPopoverComponent = defineComponent({
// 点击容器关闭飘窗 // 点击容器关闭飘窗
function dismiss(): void { function dismiss(): void {
zIndex.decrement();
ctx.emit('dismiss'); ctx.emit('dismiss');
} }
...@@ -157,6 +162,7 @@ const AppPopoverComponent = defineComponent({ ...@@ -157,6 +162,7 @@ const AppPopoverComponent = defineComponent({
dismiss, dismiss,
onMouseenter, onMouseenter,
onMouseleave, onMouseleave,
popoverZIndex,
}; };
}, },
render() { render() {
...@@ -170,6 +176,7 @@ const AppPopoverComponent = defineComponent({ ...@@ -170,6 +176,7 @@ const AppPopoverComponent = defineComponent({
ref='el' ref='el'
onMouseenter={this.onMouseenter} onMouseenter={this.onMouseenter}
onMouseleave={this.onMouseleave} onMouseleave={this.onMouseleave}
style={{ [this.ns.cssVarBlockName('z-index')]: this.popoverZIndex }}
> >
{!this.opts.noArrow && ( {!this.opts.noArrow && (
<div class={[this.ns.e('arrow')]} ref='arrEl'></div> <div class={[this.ns.e('arrow')]} ref='arrEl'></div>
......
...@@ -651,54 +651,54 @@ ...@@ -651,54 +651,54 @@
dependencies: dependencies:
qx-util "^0.4.8" qx-util "^0.4.8"
"@ibiz-template/controller@^0.0.1-beta.80": "@ibiz-template/controller@^0.0.1-beta.81":
version "0.0.1-beta.80" version "0.0.1-beta.81"
resolved "http://npm.zhr.icu:4873/@ibiz-template/controller/-/controller-0.0.1-beta.80.tgz#394c811230f795023b24979cdb0d9a77ae64d4c9" resolved "http://npm.zhr.icu:4873/@ibiz-template/controller/-/controller-0.0.1-beta.81.tgz#5fc9aa0d6f93395565c47dc916b3abcfa61b63b5"
integrity sha512-MzcF+Rvo8bsBdgqkKmScedagEgRUfrP1+ZlrTvVkYOUm/1I4A/BufcJDYwql6VajzhC3GRqh9KOORjbXrNBajw== integrity sha512-b8p9ud5F+aX0n/5gcHLROa+u9GgTmgqmJiIbV/1noRQrnlNWoPkWCC3ImxYPtNDT1dMxEsYoI4lymIbNi9yDEg==
dependencies: dependencies:
async-validator "^4.2.5" async-validator "^4.2.5"
dayjs "^1.11.5" dayjs "^1.11.5"
"@ibiz-template/core@^0.0.1-beta.80": "@ibiz-template/core@^0.0.1-beta.81":
version "0.0.1-beta.80" version "0.0.1-beta.81"
resolved "http://npm.zhr.icu:4873/@ibiz-template/core/-/core-0.0.1-beta.80.tgz#4fbe020fa438dd99222e8567e0dc8da46225ac79" resolved "http://npm.zhr.icu:4873/@ibiz-template/core/-/core-0.0.1-beta.81.tgz#729646bb0211520fc418c0c17435fce84268ac1e"
integrity sha512-PIHbvuznmb79lLyizBHkqDVOpDuWYkPdw16lrLEtRitbw4IULyZqHEYnDy6ixZgRaPdJXNDKAVsL/keGZuLVFQ== integrity sha512-P/vhtmEJd1vE92KJZeAHPPvaFoHI9Cl/hVatcQhU5o/mgXJHCjkB4wgMDqGPaJMyI7LQodw3MT6Fs3+9M3jz0w==
dependencies: dependencies:
axios "^1.2.1" axios "^1.2.1"
loglevel "^1.8.0" loglevel "^1.8.0"
pluralize "^8.0.0" pluralize "^8.0.0"
qs "^6.11.0" qs "^6.11.0"
"@ibiz-template/model@^0.0.1-beta.80": "@ibiz-template/model@^0.0.1-beta.81":
version "0.0.1-beta.80" version "0.0.1-beta.81"
resolved "http://npm.zhr.icu:4873/@ibiz-template/model/-/model-0.0.1-beta.80.tgz#cbd8a771d45ccabe8d22b8dceca023beb13eacb8" resolved "http://npm.zhr.icu:4873/@ibiz-template/model/-/model-0.0.1-beta.81.tgz#64d528dcf0f6fc220e647d3eae4e052b6179428c"
integrity sha512-4Bya8/0TkDU/I48IcMgMFPIuDTbvf7iil836zRsacyFaFvg9wh6AjD7gRP0FHWoprq+qbvhRpu+X3SpVF3tTZA== integrity sha512-Dj90m2Pn7FirAH8Na2/2Hd89hVl0qZw8id8I/qu7y7x1tQDeOLN6D80mbwrbCUsxgyg7niWyk3i/SP3EB0giiQ==
dependencies: dependencies:
"@ibiz/dynamic-model-api" "^2.1.17" "@ibiz/dynamic-model-api" "^2.1.17"
pluralize "^8.0.0" pluralize "^8.0.0"
"@ibiz-template/runtime@^0.0.1-beta.80": "@ibiz-template/runtime@^0.0.1-beta.81":
version "0.0.1-beta.80" version "0.0.1-beta.81"
resolved "http://npm.zhr.icu:4873/@ibiz-template/runtime/-/runtime-0.0.1-beta.80.tgz#1a365665667ac2cb2a9953cd3ba85c08cb1e5bfb" resolved "http://npm.zhr.icu:4873/@ibiz-template/runtime/-/runtime-0.0.1-beta.81.tgz#3d229d13187d613c9a43255e85b084543b4bc10a"
integrity sha512-6nC96LIH3AofX5FAooObLKbdAHST/b1J//HAlnGZqxQg7cbgFF7yT4i/isLV9OHEW9c7w4lNQu9adO8oK7XIyA== integrity sha512-sRIOZfPz54VgPT04tzQ08RNdkEGDegfzLiwJu4ig9JvZTKECKmZLACbPS8wtKA/0kau5vLA6cQWKZTvcufN9Eg==
dependencies: dependencies:
"@ibiz-template/command" "^0.0.1-beta.50" "@ibiz-template/command" "^0.0.1-beta.50"
qs "^6.11.0" qs "^6.11.0"
"@ibiz-template/service@^0.0.1-beta.80": "@ibiz-template/service@^0.0.1-beta.81":
version "0.0.1-beta.80" version "0.0.1-beta.81"
resolved "http://npm.zhr.icu:4873/@ibiz-template/service/-/service-0.0.1-beta.80.tgz#f3cd10dbe7a8444f8e5bc8429287a674cbe5af75" resolved "http://npm.zhr.icu:4873/@ibiz-template/service/-/service-0.0.1-beta.81.tgz#e5ab0c19976a24689385dbcb3d5d01f496069cd3"
integrity sha512-EcUy4PxUEuDpHxbhun5IQI6xDCtTQVvO26xbfjE1RfL6OwgJP0uWtTNr4GVpzaVg4r+yfTJwcmKtXXPFIyBwEw== integrity sha512-0BY0Jv99KsZV00PHcPSvMkMYn0fRCFLUKfLTq6bFvjwjXykJCft1KVHA4acXHVJCgRlv9c0az36AN14QwhE5iw==
"@ibiz-template/theme@^0.0.1-beta.80": "@ibiz-template/theme@^0.0.1-beta.81":
version "0.0.1-beta.80" version "0.0.1-beta.81"
resolved "http://npm.zhr.icu:4873/@ibiz-template/theme/-/theme-0.0.1-beta.80.tgz#903bc9ac9100c6fb8e0ec6b271d1ed5ecfbd9699" resolved "http://npm.zhr.icu:4873/@ibiz-template/theme/-/theme-0.0.1-beta.81.tgz#1b79592c345956c37a5fd5ca85ba0e80832c3400"
integrity sha512-A9ifhY5vEpFin4kaVfsdfjQIuvpDhUI3pMooRIafYCwjrInrhLHMcdujm1RGTe7lWh4q56aGaqDj92AjoGxWyQ== integrity sha512-ulgZQ0VoUCZmLvbd+ihxg9GgdKEjQT321jOxrQDyX5cCen4VQfFkSlvitj3az7IOYDVgEp0+zXuTQfo0z9CQHw==
"@ibiz-template/vue-util@^0.0.1-beta.80": "@ibiz-template/vue-util@^0.0.1-beta.81":
version "0.0.1-beta.80" version "0.0.1-beta.81"
resolved "http://npm.zhr.icu:4873/@ibiz-template/vue-util/-/vue-util-0.0.1-beta.80.tgz#21f8664d7f98f3b31bf329cac91b6eed26eb3ee3" resolved "http://npm.zhr.icu:4873/@ibiz-template/vue-util/-/vue-util-0.0.1-beta.81.tgz#bd0faed3bc60a7c616e52ced40d38a5649472aca"
integrity sha512-N7f3KG/MsZFhaEZNnEX8NZcXHMJi1Af10lIGiz8KpGqm2h5sJAEy+e1FaSr1vmMyOjYN9d3No99LrAqYQGqDvQ== integrity sha512-IAfDtDbLIvIxSJ35wb5xEX3cM4BaPYy3ScRikGqEs+4SwJJ/l2pTQJxPXS5v6Nvez4+D/RnaMfzvnmICStG7Wg==
"@ibiz/dynamic-model-api@^2.1.17": "@ibiz/dynamic-model-api@^2.1.17":
version "2.1.17" version "2.1.17"
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册