centaline-data-driven-v3 0.0.70 → 0.0.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/centaline-data-driven-v3.umd.js +5 -5
- package/package.json +1 -1
- package/src/components/web/Tree.vue +3 -1
- package/src/components/web/dialog.vue +3 -0
- package/src/loader/src/SearchScreen.js +2 -0
- package/src/main.js +1 -1
- package/src/utils/mixins.js +3 -3
- package/src/views/SearchList.vue +3 -2
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
<ct-searchscreen ref="reftreescreen" :from="'tree'" :api="searchConditionApi" :screenPara="screenPara"
|
|
5
5
|
@search="search" @loaded="screenload" ></ct-searchscreen>
|
|
6
6
|
</div>
|
|
7
|
-
<tree ref="reftree" :api="searchDataApi" @loaded="loaded" :treeHeight="treeHeight">
|
|
7
|
+
<tree v-if="loadTree" ref="reftree" :api="searchDataApi" @loaded="loaded" :treeHeight="treeHeight">
|
|
8
8
|
</tree>
|
|
9
9
|
|
|
10
10
|
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
import { ref, nextTick, watch, onMounted } from 'vue'
|
|
15
15
|
import Tree from './Tree/Tree.vue';
|
|
16
16
|
const emit = defineEmits(['loaded'])
|
|
17
|
+
const loadTree=ref(false)
|
|
17
18
|
|
|
18
19
|
const props = defineProps({
|
|
19
20
|
searchConditionApi: String,
|
|
@@ -54,6 +55,7 @@ function loaded(data) {
|
|
|
54
55
|
} catch (e) { }
|
|
55
56
|
}
|
|
56
57
|
function screenload(data) {
|
|
58
|
+
loadTree.value=true
|
|
57
59
|
setTreeHeight();
|
|
58
60
|
}
|
|
59
61
|
onMounted(() => {
|
|
@@ -19,6 +19,9 @@ onActivated(() => {
|
|
|
19
19
|
})
|
|
20
20
|
function close() {
|
|
21
21
|
emit('close', props);
|
|
22
|
+
if (props.vmodel.content[0].attrs && typeof props.vmodel.content[0].attrs["onCloseDialog"] === "function") {
|
|
23
|
+
props.vmodel.content[0].attrs["onCloseDialog"]();
|
|
24
|
+
}
|
|
22
25
|
}
|
|
23
26
|
function scrollHandle(ev) {
|
|
24
27
|
contentTop.value = content.value.scrollTop;
|
|
@@ -320,6 +320,8 @@ function isHandle(type) {
|
|
|
320
320
|
let result = false;
|
|
321
321
|
switch (type) {
|
|
322
322
|
case Enum.ControlType.CheckBoxList://复选列表
|
|
323
|
+
case Enum.ControlType.MultiSelectNoSearch:
|
|
324
|
+
case Enum.ControlType.MultiSelectWithSearch:
|
|
323
325
|
result = true;
|
|
324
326
|
break;
|
|
325
327
|
default:
|
package/src/main.js
CHANGED
|
@@ -64,7 +64,7 @@ app.use(centaline, {
|
|
|
64
64
|
//authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
|
|
65
65
|
//oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
|
|
66
66
|
//authObject: '{token:"1-a7289bb2-9f1e-4a04-9016-1e555bf39188"}',
|
|
67
|
-
authObject: '{EmpID:"
|
|
67
|
+
authObject: '{EmpID:"Token_2e493771-28ae-485d-afea-0e6dcef23f64",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_2e493771-28ae-485d-afea-0e6dcef23f64",Platform:"WEB"}',
|
|
68
68
|
};
|
|
69
69
|
},
|
|
70
70
|
// 请求完成事件,可判断是否登录过期执行响应操作
|
package/src/utils/mixins.js
CHANGED
|
@@ -1659,10 +1659,10 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
|
|
|
1659
1659
|
fun(submitData, title, model);
|
|
1660
1660
|
}
|
|
1661
1661
|
}
|
|
1662
|
+
if (typeof field.onChanged !== 'undefined') {
|
|
1663
|
+
common.excute.call(model.scripts, field.onChanged)
|
|
1664
|
+
}
|
|
1662
1665
|
if (field.isSubmit && field.flagVerifyData) {
|
|
1663
|
-
if (typeof field.onChanged !== 'undefined') {
|
|
1664
|
-
common.excute.call(model.scripts, field.onChanged)
|
|
1665
|
-
}
|
|
1666
1666
|
if (source == 'form' && !model.$vue.validExcute()) {
|
|
1667
1667
|
return;
|
|
1668
1668
|
}
|
package/src/views/SearchList.vue
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="app-search" style="width:100%;height:100%;position: fixed;">
|
|
3
|
-
<ct-searchlist :apiParam="apiParam" :searchConditionApi="'/
|
|
4
|
-
:searchDataApi="'/
|
|
3
|
+
<ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
|
|
4
|
+
:searchDataApi="'/propertyPublishList/getListOfSearchModel'"
|
|
5
|
+
:searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
|
|
5
6
|
<ct-dialoglist ref="dialogList"></ct-dialoglist>
|
|
6
7
|
|
|
7
8
|
</div>
|