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

ibiz4j 发布系统代码

上级 6372da78
...@@ -113,10 +113,6 @@ export default { ...@@ -113,10 +113,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -149,6 +145,10 @@ export default { ...@@ -149,6 +145,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -112,10 +112,6 @@ export default { ...@@ -112,10 +112,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -148,6 +144,10 @@ export default { ...@@ -148,6 +144,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -121,10 +121,6 @@ export default { ...@@ -121,10 +121,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -157,6 +153,10 @@ export default { ...@@ -157,6 +153,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -120,10 +120,6 @@ export default { ...@@ -120,10 +120,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -156,6 +152,10 @@ export default { ...@@ -156,6 +152,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -130,10 +130,6 @@ export default { ...@@ -130,10 +130,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -166,6 +162,10 @@ export default { ...@@ -166,6 +162,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -129,10 +129,6 @@ export default { ...@@ -129,10 +129,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -165,6 +161,10 @@ export default { ...@@ -165,6 +161,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -56,10 +56,6 @@ export default { ...@@ -56,10 +56,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -92,6 +88,10 @@ export default { ...@@ -92,6 +88,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -55,10 +55,6 @@ export default { ...@@ -55,10 +55,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -91,6 +87,10 @@ export default { ...@@ -91,6 +87,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -65,10 +65,6 @@ export default { ...@@ -65,10 +65,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -101,6 +97,10 @@ export default { ...@@ -101,6 +97,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -64,10 +64,6 @@ export default { ...@@ -64,10 +64,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -100,6 +96,10 @@ export default { ...@@ -100,6 +96,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -119,10 +119,6 @@ export default { ...@@ -119,10 +119,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -155,6 +151,10 @@ export default { ...@@ -155,6 +151,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -118,10 +118,6 @@ export default { ...@@ -118,10 +118,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -154,6 +150,10 @@ export default { ...@@ -154,6 +150,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -60,10 +60,6 @@ export default { ...@@ -60,10 +60,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -96,6 +92,10 @@ export default { ...@@ -96,6 +92,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -59,10 +59,6 @@ export default { ...@@ -59,10 +59,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -95,6 +91,10 @@ export default { ...@@ -95,6 +91,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -62,10 +62,6 @@ export default { ...@@ -62,10 +62,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -98,6 +94,10 @@ export default { ...@@ -98,6 +94,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -61,10 +61,6 @@ export default { ...@@ -61,10 +61,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -97,6 +93,10 @@ export default { ...@@ -97,6 +93,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -123,10 +123,6 @@ export default { ...@@ -123,10 +123,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -159,6 +155,10 @@ export default { ...@@ -159,6 +155,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -122,10 +122,6 @@ export default { ...@@ -122,10 +122,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -158,6 +154,10 @@ export default { ...@@ -158,6 +154,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -140,10 +140,6 @@ export default { ...@@ -140,10 +140,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -176,6 +172,10 @@ export default { ...@@ -176,6 +172,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -139,10 +139,6 @@ export default { ...@@ -139,10 +139,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -175,6 +171,10 @@ export default { ...@@ -175,6 +171,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -91,10 +91,6 @@ export default { ...@@ -91,10 +91,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -127,6 +123,10 @@ export default { ...@@ -127,6 +123,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -90,10 +90,6 @@ export default { ...@@ -90,10 +90,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -126,6 +122,10 @@ export default { ...@@ -126,6 +122,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -216,10 +216,6 @@ export default { ...@@ -216,10 +216,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -252,6 +248,10 @@ export default { ...@@ -252,6 +248,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -215,10 +215,6 @@ export default { ...@@ -215,10 +215,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -251,6 +247,10 @@ export default { ...@@ -251,6 +247,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -52,10 +52,6 @@ export default { ...@@ -52,10 +52,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -88,6 +84,10 @@ export default { ...@@ -88,6 +84,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -51,10 +51,6 @@ export default { ...@@ -51,10 +51,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -87,6 +83,10 @@ export default { ...@@ -87,6 +83,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -60,10 +60,6 @@ export default { ...@@ -60,10 +60,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -96,6 +92,10 @@ export default { ...@@ -96,6 +92,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -59,10 +59,6 @@ export default { ...@@ -59,10 +59,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -95,6 +91,10 @@ export default { ...@@ -95,6 +91,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -160,10 +160,6 @@ export default { ...@@ -160,10 +160,6 @@ export default {
caption: "Save", caption: "Save",
tip: "Save", tip: "Save",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -196,6 +192,10 @@ export default { ...@@ -196,6 +192,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: { tbitem4: {
caption: "Save And New", caption: "Save And New",
tip: "Save And New", tip: "Save And New",
......
...@@ -159,10 +159,6 @@ export default { ...@@ -159,10 +159,6 @@ export default {
caption: "保存", caption: "保存",
tip: "保存", tip: "保存",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: { tbitem6: {
caption: "-", caption: "-",
tip: "", tip: "",
...@@ -195,6 +191,10 @@ export default { ...@@ -195,6 +191,10 @@ export default {
caption: "其它", caption: "其它",
tip: "其它", tip: "其它",
}, },
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: { tbitem4: {
caption: "保存并新建", caption: "保存并新建",
tip: "保存并新建", tip: "保存并新建",
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.dstapi.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class DstAPIEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class DstAPIEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class DstAPIEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class DstAPIEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class DstAPIEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class DstAPIEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class DstAPIEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstAPI"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstAPI");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class DstAPIEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class DstAPIEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstAPI"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstAPI");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class DstAPIEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class DstAPIEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstAPI"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstAPI");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class DstAPIEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class DstAPIEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstAPI"); this.New(datas, contextJO,paramJO, $event, xData,this,"DstAPI");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class DstAPIEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class DstAPIEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"DstAPI"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstAPI");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class DstAPIEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class DstAPIEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstAPI"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstAPI");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class DstAPIEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstAPIEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class DstAPIEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class DstAPIEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstAPIEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.dstapp.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class DstAppEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class DstAppEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class DstAppEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class DstAppEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class DstAppEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class DstAppEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class DstAppEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class DstAppEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class DstAppEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class DstAppEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class DstAppEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class DstAppEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstApp"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstApp");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class DstAppEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class DstAppEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstApp"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstApp");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class DstAppEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class DstAppEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstApp"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstApp");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class DstAppEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class DstAppEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstApp"); this.New(datas, contextJO,paramJO, $event, xData,this,"DstApp");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class DstAppEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class DstAppEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"DstApp"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstApp");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class DstAppEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class DstAppEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class DstAppEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstApp"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstApp");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class DstAppEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class DstAppEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstAppEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class DstAppEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class DstAppEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstAppEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.dstcomponent.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class DstComponentEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class DstComponentEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class DstComponentEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class DstComponentEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class DstComponentEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class DstComponentEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class DstComponentEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstComponent"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstComponent");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class DstComponentEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class DstComponentEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstComponent"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstComponent");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class DstComponentEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class DstComponentEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstComponent"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstComponent");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class DstComponentEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class DstComponentEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstComponent"); this.New(datas, contextJO,paramJO, $event, xData,this,"DstComponent");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class DstComponentEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class DstComponentEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"DstComponent"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstComponent");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class DstComponentEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class DstComponentEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstComponent"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstComponent");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class DstComponentEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstComponentEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class DstComponentEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class DstComponentEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstComponentEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.dstconfig.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class DstConfigEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class DstConfigEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class DstConfigEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class DstConfigEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class DstConfigEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class DstConfigEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class DstConfigEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstConfig"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstConfig");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class DstConfigEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class DstConfigEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstConfig"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstConfig");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class DstConfigEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class DstConfigEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstConfig"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstConfig");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class DstConfigEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class DstConfigEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstConfig"); this.New(datas, contextJO,paramJO, $event, xData,this,"DstConfig");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class DstConfigEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class DstConfigEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"DstConfig"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstConfig");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class DstConfigEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class DstConfigEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstConfig"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstConfig");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class DstConfigEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstConfigEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class DstConfigEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class DstConfigEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstConfigEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class DstDataSourceEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class DstDataSourceEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class DstDataSourceEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class DstDataSourceEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class DstDataSourceEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class DstDataSourceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class DstDataSourceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstDataSource"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstDataSource");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class DstDataSourceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class DstDataSourceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstDataSource"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstDataSource");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class DstDataSourceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class DstDataSourceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstDataSource"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstDataSource");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class DstDataSourceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class DstDataSourceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstDataSource"); this.New(datas, contextJO,paramJO, $event, xData,this,"DstDataSource");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class DstDataSourceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class DstDataSourceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"DstDataSource"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstDataSource");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class DstDataSourceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class DstDataSourceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstDataSource"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstDataSource");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class DstDataSourceEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstDataSourceEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class DstDataSourceEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class DstDataSourceEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstDataSourceEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.dstmicroservice.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class DstMicroserviceEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class DstMicroserviceEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class DstMicroserviceEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class DstMicroserviceEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class DstMicroserviceEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice"); this.New(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class DstMicroserviceEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstMicroservice");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class DstMicroserviceEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstMicroserviceEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class DstMicroserviceEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class DstMicroserviceEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstMicroserviceEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.dstrouter.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class DstRouterEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class DstRouterEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class DstRouterEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class DstRouterEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class DstRouterEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class DstRouterEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class DstRouterEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstRouter"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstRouter");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class DstRouterEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class DstRouterEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstRouter"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstRouter");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class DstRouterEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class DstRouterEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstRouter"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstRouter");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class DstRouterEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class DstRouterEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstRouter"); this.New(datas, contextJO,paramJO, $event, xData,this,"DstRouter");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class DstRouterEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class DstRouterEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"DstRouter"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstRouter");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class DstRouterEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class DstRouterEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstRouter"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstRouter");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class DstRouterEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstRouterEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class DstRouterEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class DstRouterEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstRouterEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class DstSystemEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class DstSystemEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class DstSystemEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class DstSystemEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class DstSystemEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class DstSystemEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class DstSystemEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstSystem"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstSystem");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class DstSystemEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class DstSystemEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstSystem"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstSystem");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class DstSystemEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class DstSystemEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstSystem"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstSystem");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class DstSystemEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class DstSystemEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstSystem"); this.New(datas, contextJO,paramJO, $event, xData,this,"DstSystem");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class DstSystemEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class DstSystemEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"DstSystem"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstSystem");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class DstSystemEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class DstSystemEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstSystem"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstSystem");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class DstSystemEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstSystemEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class DstSystemEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class DstSystemEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstSystemEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.dstview.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class DstViewEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class DstViewEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class DstViewEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class DstViewEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class DstViewEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class DstViewEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class DstViewEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class DstViewEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class DstViewEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class DstViewEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class DstViewEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class DstViewEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstView"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstView");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class DstViewEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class DstViewEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstView"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstView");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class DstViewEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class DstViewEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"DstView"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstView");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class DstViewEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class DstViewEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"DstView"); this.New(datas, contextJO,paramJO, $event, xData,this,"DstView");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class DstViewEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class DstViewEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"DstView"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstView");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class DstViewEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class DstViewEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class DstViewEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"DstView"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"DstView");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class DstViewEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class DstViewEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstViewEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class DstViewEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class DstViewEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof DstViewEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class MetaDataSetEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class MetaDataSetEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class MetaDataSetEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class MetaDataSetEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class MetaDataSetEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class MetaDataSetEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class MetaDataSetEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class MetaDataSetEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class MetaDataSetEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class MetaDataSetEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class MetaDataSetEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class MetaDataSetEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class MetaDataSetEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet"); this.New(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class MetaDataSetEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class MetaDataSetEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class MetaDataSetEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class MetaDataSetEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaDataSet");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class MetaDataSetEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaDataSetEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class MetaDataSetEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class MetaDataSetEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaDataSetEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class MetaEntityEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class MetaEntityEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class MetaEntityEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class MetaEntityEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class MetaEntityEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class MetaEntityEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class MetaEntityEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaEntity"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaEntity");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class MetaEntityEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class MetaEntityEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaEntity"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaEntity");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class MetaEntityEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class MetaEntityEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaEntity"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaEntity");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class MetaEntityEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class MetaEntityEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaEntity"); this.New(datas, contextJO,paramJO, $event, xData,this,"MetaEntity");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class MetaEntityEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class MetaEntityEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"MetaEntity"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaEntity");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class MetaEntityEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class MetaEntityEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaEntity"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaEntity");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class MetaEntityEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaEntityEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class MetaEntityEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class MetaEntityEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaEntityEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class MetaFieldEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class MetaFieldEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class MetaFieldEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class MetaFieldEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class MetaFieldEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class MetaFieldEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class MetaFieldEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaField"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaField");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class MetaFieldEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class MetaFieldEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaField"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaField");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class MetaFieldEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class MetaFieldEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaField"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaField");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class MetaFieldEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class MetaFieldEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaField"); this.New(datas, contextJO,paramJO, $event, xData,this,"MetaField");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class MetaFieldEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class MetaFieldEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"MetaField"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaField");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class MetaFieldEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class MetaFieldEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaField"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaField");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class MetaFieldEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaFieldEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class MetaFieldEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class MetaFieldEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaFieldEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -1301,7 +1301,7 @@ export default class MetaFieldGridViewBase extends Vue { ...@@ -1301,7 +1301,7 @@ export default class MetaFieldGridViewBase extends Vue {
const view: any = { const view: any = {
viewname: 'meta-field-edit-view', viewname: 'meta-field-edit-view',
height: 0, height: 0,
width: 550, width: 850,
title: this.$t('entities.metafield.views.editview.title'), title: this.$t('entities.metafield.views.editview.title'),
placement: 'DRAWER_RIGHT', placement: 'DRAWER_RIGHT',
}; };
...@@ -1362,7 +1362,7 @@ export default class MetaFieldGridViewBase extends Vue { ...@@ -1362,7 +1362,7 @@ export default class MetaFieldGridViewBase extends Vue {
const view: any = { const view: any = {
viewname: 'meta-field-edit-view', viewname: 'meta-field-edit-view',
height: 0, height: 0,
width: 550, width: 850,
title: this.$t('entities.metafield.views.editview.title'), title: this.$t('entities.metafield.views.editview.title'),
placement: 'DRAWER_RIGHT', placement: 'DRAWER_RIGHT',
}; };
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class MetaModelEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class MetaModelEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class MetaModelEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class MetaModelEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class MetaModelEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class MetaModelEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class MetaModelEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaModel"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaModel");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class MetaModelEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class MetaModelEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaModel"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaModel");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class MetaModelEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class MetaModelEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaModel"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaModel");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class MetaModelEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class MetaModelEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaModel"); this.New(datas, contextJO,paramJO, $event, xData,this,"MetaModel");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class MetaModelEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class MetaModelEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"MetaModel"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaModel");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class MetaModelEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class MetaModelEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaModel"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaModel");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class MetaModelEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaModelEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class MetaModelEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class MetaModelEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaModelEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.metamodule.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class MetaModuleEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class MetaModuleEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class MetaModuleEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class MetaModuleEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class MetaModuleEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class MetaModuleEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class MetaModuleEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaModule"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaModule");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class MetaModuleEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class MetaModuleEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaModule"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaModule");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class MetaModuleEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class MetaModuleEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaModule"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaModule");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class MetaModuleEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class MetaModuleEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaModule"); this.New(datas, contextJO,paramJO, $event, xData,this,"MetaModule");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class MetaModuleEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class MetaModuleEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"MetaModule"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaModule");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class MetaModuleEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class MetaModuleEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaModule"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaModule");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class MetaModuleEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaModuleEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class MetaModuleEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class MetaModuleEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaModuleEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -13,13 +13,6 @@ ...@@ -13,13 +13,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem3.tip')}}</div> <div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)"> <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -51,6 +44,17 @@ ...@@ -51,6 +44,17 @@
<div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem18.tip')}}</div> <div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem18.tip')}}</div>
</tooltip> </tooltip>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
</dropdown-item>
<dropdown-item> <dropdown-item>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)"> <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
...@@ -106,15 +110,19 @@ ...@@ -106,15 +110,19 @@
</dropdown-item> </dropdown-item>
</dropdown-menu> <dropdown-item>
</dropdown> <tooltip :transfer="true" :max-width="600">
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)"> <i-button v-show="toolBarModels.tbitem22.visabled" :disabled="toolBarModels.tbitem22.disabled" class='' @click="toolbar_click({ tag: 'tbitem22' }, $event)">
<i class='fa fa-question'></i> <i class='fa fa-question'></i>
<span class='caption'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem22.caption')}}</span> <span class='caption'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem22.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem22.tip')}}</div> <div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem22.tip')}}</div>
</tooltip> </tooltip>
</dropdown-item>
</dropdown-menu>
</dropdown>
</div> </div>
</div> </div>
...@@ -352,8 +360,6 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -352,8 +360,6 @@ export default class MetaRelationshipEditViewBase extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } }, tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem6: { name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } }, tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
...@@ -365,6 +371,8 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -365,6 +371,8 @@ export default class MetaRelationshipEditViewBase extends Vue {
tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem16: { name: 'tbitem16', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } },
tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } }, tbitem4: { name: 'tbitem4', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } }, tbitem23: { name: 'tbitem23', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
...@@ -375,8 +383,8 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -375,8 +383,8 @@ export default class MetaRelationshipEditViewBase extends Vue {
tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } }, tbitem26: { name: 'tbitem26', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
tbitem22: { name: 'tbitem22', caption: '帮助', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '' } },
}; };
...@@ -684,9 +692,6 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -684,9 +692,6 @@ export default class MetaRelationshipEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) { if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click(null, '', $event2); this.toolbar_tbitem7_click(null, '', $event2);
} }
...@@ -702,6 +707,9 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -702,6 +707,9 @@ export default class MetaRelationshipEditViewBase extends Vue {
if (Object.is($event.tag, 'tbitem14')) { if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click(null, '', $event2); this.toolbar_tbitem14_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) { if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click(null, '', $event2); this.toolbar_tbitem15_click(null, '', $event2);
} }
...@@ -799,7 +807,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -799,7 +807,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -816,7 +824,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -816,7 +824,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship"); this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship");
} }
/** /**
...@@ -827,7 +835,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -827,7 +835,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -844,7 +852,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -844,7 +852,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship"); this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship");
} }
/** /**
...@@ -855,7 +863,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -855,7 +863,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -872,7 +880,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -872,7 +880,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship"); this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship");
} }
/** /**
...@@ -883,7 +891,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -883,7 +891,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -900,7 +908,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -900,7 +908,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship"); this.New(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship");
} }
/** /**
...@@ -911,7 +919,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -911,7 +919,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -928,7 +936,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -928,7 +936,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship"); this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship");
} }
/** /**
...@@ -939,7 +947,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -939,7 +947,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -956,7 +964,7 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -956,7 +964,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
datas = [params]; datas = [params];
} }
// 界面行为 // 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship"); this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"MetaRelationship");
} }
/** /**
...@@ -1181,39 +1189,6 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -1181,39 +1189,6 @@ export default class MetaRelationshipEditViewBase extends Vue {
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaRelationshipEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 删除并关闭 * 删除并关闭
* *
...@@ -1357,6 +1332,39 @@ export default class MetaRelationshipEditViewBase extends Vue { ...@@ -1357,6 +1332,39 @@ export default class MetaRelationshipEditViewBase extends Vue {
Object.assign(this.viewparams,{copymode:true}); Object.assign(this.viewparams,{copymode:true});
} }
} }
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof MetaRelationshipEditViewBase
*/
public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
} else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
_this.saveAndExit().then((response: any) => {
if (!response || response.status !== 200) {
return;
}
if(window.parent){
window.parent.postMessage([{ ...response.data }],'*');
}
});
}
}
/** /**
* 打印 * 打印
* *
......
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
git clone -b master $para2 ibzlite/ git clone -b master $para2 ibzlite/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibzlite/ cd ibzlite/
mvn clean package -Pweb
cd ibzlite-app/ibzlite-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzlite-app-web.yaml ibzlab-rt --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzlite-app-web.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzlite-app-web.jar
EXPOSE 30010 EXPOSE 8080
ADD ibzlite-app-web.jar /ibzlite-app-web.jar ADD ibzlite-app-web.jar /ibzlite-app-web.jar
...@@ -3,22 +3,9 @@ services: ...@@ -3,22 +3,9 @@ services:
ibzlite-app-web: ibzlite-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
ports: ports:
- "30010:30010" - "8080:8080"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30010
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.102.211:8848
deploy: deploy:
resources: resources:
limits: limits:
......
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<!--输出实体[META_FIELD]数据结构 --> <!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-135-9"> <changeSet author="a_A_5d9d78509" id="tab-meta_field-136-9">
<createTable tableName="IBZFIELD"> <createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)"> <column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/> <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册