提交 6ec1239f 编写于 作者: Shine-zwj's avatar Shine-zwj

update

上级 daf43337
...@@ -88,7 +88,7 @@ import ActionTimeline from './components/action-timeline/action-timeline.vue' ...@@ -88,7 +88,7 @@ import ActionTimeline from './components/action-timeline/action-timeline.vue'
import CronEditor from './components/cron-editor/cron-editor.vue' import CronEditor from './components/cron-editor/cron-editor.vue'
import AppMessagePopover from './components/app-message-popover/app-message-popover.vue' import AppMessagePopover from './components/app-message-popover/app-message-popover.vue'
import AppPanelField from './components/app-panel-field/app-panel-field.vue' import AppPanelField from './components/app-panel-field/app-panel-field.vue'
import AppPanelItem from './components/app-panel-item/app-panel-item.vue' import AppPanelButton from './components/app-panel-button/app-panel-button.vue'
import AppDepartmentPersonnel from './components/app-department-personnel/app-department-personnel.vue' import AppDepartmentPersonnel from './components/app-department-personnel/app-department-personnel.vue'
import DiskFileUpload from './components/disk-file-upload/disk-file-upload.vue' import DiskFileUpload from './components/disk-file-upload/disk-file-upload.vue'
import AvueCustomForm from './components/avue-custom-form/avue-custom-form.vue' import AvueCustomForm from './components/avue-custom-form/avue-custom-form.vue'
...@@ -125,7 +125,7 @@ export const AppComponents = { ...@@ -125,7 +125,7 @@ export const AppComponents = {
v.prototype.$viewTool = ViewTool; v.prototype.$viewTool = ViewTool;
v.prototype.$uiActionTool = UIActionTool; v.prototype.$uiActionTool = UIActionTool;
v.component('app-department-personnel',AppDepartmentPersonnel); v.component('app-department-personnel',AppDepartmentPersonnel);
v.component('app-panel-item',AppPanelItem); v.component('app-panel-button',AppPanelButton);
v.component('app-panel-field',AppPanelField); v.component('app-panel-field',AppPanelField);
v.component('app-full-scren',AppFullScren); v.component('app-full-scren',AppFullScren);
v.component('app-lock-scren',AppLockScren); v.component('app-lock-scren',AppLockScren);
......
<template> <template>
<div class="app-panel-item"> <div class="app-panel-button">
<div v-if="Object.is(itemType,'BUTTON')" >
<Button type="primary" long @click="onClick"> <Button type="primary" long @click="onClick">
<i v-if="icon" :class="icon"></i> <i v-if="icon" :class="icon"></i>
<span v-if="showCaption" :class="lableStyle">{{caption ? caption : ''}}</span> <span v-if="showCaption" :class="lableStyle">{{caption ? caption : ''}}</span>
</Button> </Button>
</div>
<div v-if="Object.is(itemType,'RAWITEM')">
<i v-if="icon" :class="icon"></i>
<span v-if="caption" class="app-panel-item-rawitem">{{caption}}</span>
<div :class="contentStyle">
<slot></slot>
</div>
</div>
</div> </div>
</template> </template>
...@@ -20,15 +11,7 @@ ...@@ -20,15 +11,7 @@
import { Vue, Component, Prop, Watch } from "vue-property-decorator"; import { Vue, Component, Prop, Watch } from "vue-property-decorator";
@Component({}) @Component({})
export default class AppPanelItem extends Vue { export default class AppPanelButton extends Vue {
/**
* 面板成员类型
*
* @type {string}
* @memberof AppPanelItem
*/
@Prop() public itemType!: string;
/** /**
* 图标 * 图标
...@@ -62,22 +45,6 @@ export default class AppPanelItem extends Vue { ...@@ -62,22 +45,6 @@ export default class AppPanelItem extends Vue {
*/ */
@Prop() public lableStyle?: string; @Prop() public lableStyle?: string;
/**
* 内容样式
*
* @type {boolean}
* @memberof AppPanelItem
*/
@Prop() public contentStyle?: string;
/**
* 部件样式
*
* @type {boolean}
* @memberof AppPanelItem
*/
@Prop() public partsStyle?: string;
/** /**
* 点击按钮 * 点击按钮
* *
......
.app-panel-item{
.app-panel-item-rawitem{
padding-right: 10px;
}
}
\ No newline at end of file
<template> <template>
<div> <div>
<span v-if="caption">{{caption}}</span> <span v-if="caption">{{caption}}</span>
<div :class="classStyle" :style="sizeStyle"> <div :class="contentStyle" :style="sizeStyle">
<template v-if="Object.is(contentType,'RAW')"> <template v-if="Object.is(contentType,'RAW')">
{{rawContent ? rawContent : ''}} {{rawContent ? rawContent : ''}}
</template> </template>
...@@ -67,7 +67,7 @@ export default class AppRawItem extends Vue { ...@@ -67,7 +67,7 @@ export default class AppRawItem extends Vue {
* @type {strin} * @type {strin}
* @memberof AppRawItem * @memberof AppRawItem
*/ */
@Prop() public classStyle!: string; @Prop() public contentStyle!: string;
/** /**
* 内容宽高 * 内容宽高
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册