centaline-data-driven-v3 0.0.96 → 0.0.97

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.
Files changed (9) hide show
  1. package/dist/centaline-data-driven-v3.umd.js +4 -4
  2. package/package.json +1 -1
  3. package/src/components/app/Progress.vue +1 -1
  4. package/src/components/app/SearchList/SearchStats.vue +3 -3
  5. package/src/components/app/SearchList/SearchTable.vue +1 -1
  6. package/src/components/web/SearchList/SearchStats.vue +3 -3
  7. package/src/loader/src/SearchStats.js +1 -1
  8. package/src/main.js +2 -2
  9. package/src/views/SearchList.vue +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven-v3",
3
- "version": "0.0.96",
3
+ "version": "0.0.97",
4
4
  "private": false,
5
5
  "description": "centaline-data-driven-v3",
6
6
  "main": "dist/centaline-data-driven-v3.umd.js",
package/src/components/app/Progress.vue CHANGED
@@ -2,7 +2,7 @@
2
2
  <div class="ct-progress">
3
3
  <div style="padding: 5px;">
4
4
  <div class="circleBox">
5
- <van-circle v-if="progressFlag" v-model:current-rate="percentage" :rate="100" :speed="100" />
5
+ <van-circle v-if="progressFlag" v-model:current-rate="percentage" :rate="percentage" :speed="100" />
6
6
  <div class="circleCenter" v-if="progressFlag">
7
7
  <div style="font-size: 16px;color: #666;"> {{ percentage.toFixed(2) }}%</div>
8
8
  </div>
package/src/components/app/SearchList/SearchStats.vue CHANGED
@@ -30,10 +30,10 @@ const model = ref(null)
30
30
  const selectStats = ref("")
31
31
  const fieldName1 = ref("")
32
32
  const tableStatistics = ref()
33
- function searchStatsComplate() {
33
+ function searchStatsComplate(defaultSearchData) {
34
34
  nextTick(function () {
35
35
  if (typeof props.api !== "undefined") {
36
- SearchStats.loadSearchStatsApi(props.api, load, props.searchModel, null);
36
+ SearchStats.loadSearchStatsApi(props.api, load, props.searchModel, defaultSearchData);
37
37
  }
38
38
  if (typeof props.source !== "undefined") {
39
39
  load(SearchStats.loadSearchStatsModel(props.source));
@@ -48,7 +48,7 @@ function load(data) {
48
48
  data.source.content.forEach((item) => {
49
49
  fieldName1.value = item.fieldName1;
50
50
  });
51
- if (selectStats.value == '') {
51
+ if (selectStats.value == ''&&!(model.value.defaultSearchData&&model.value.defaultSearchData.searchData)) {
52
52
  var i = data.source.content.findIndex((v) => {
53
53
  return v.code1 == props.apiParam[fieldName1.value];
54
54
  });
package/src/components/app/SearchList/SearchTable.vue CHANGED
@@ -233,7 +233,7 @@ function onRefresh() {
233
233
  }
234
234
  function loadStats() {
235
235
  if (props.searchStatsApi) {
236
- refTableStats.value.searchStatsComplate();
236
+ refTableStats.value.searchStatsComplate(model.value.searchStats);
237
237
  }
238
238
  }
239
239
  //更新行数据
package/src/components/web/SearchList/SearchStats.vue CHANGED
@@ -113,10 +113,10 @@ const tableStatistics = ref()
113
113
  onMounted(() => {
114
114
  showWidth.value = tableStatistics.value && tableStatistics.value.offsetWidth || document.body.clientWidth;
115
115
  })
116
- function searchStatsComplate() {
116
+ function searchStatsComplate(defaultSearchData) {
117
117
  nextTick(function () {
118
118
  if (typeof props.api !== "undefined") {
119
- SearchStats.loadSearchStatsApi(props.api, load, props.searchModel, null);
119
+ SearchStats.loadSearchStatsApi(props.api, load, props.searchModel, defaultSearchData);
120
120
  }
121
121
  if (typeof props.source !== "undefined") {
122
122
  load(SearchStats.loadSearchStatsModel(props.source));
@@ -158,7 +158,7 @@ function load(data) {
158
158
  return -1; // 顺序不变
159
159
  }
160
160
  });
161
- if (selectStats.value == '') {
161
+ if (selectStats.value == ''&&!(model.value.defaultSearchData&&model.value.defaultSearchData.searchData)) {
162
162
  var m = data.source.content.find((v) => {
163
163
  return v.code1 == props.apiParam[fieldName1.value];
164
164
  });
package/src/loader/src/SearchStats.js CHANGED
@@ -17,7 +17,7 @@ function loadSearchStatsApi(action, callBack, searchModel, defaultSearchData) {
17
17
  }).then(
18
18
  function (response) {
19
19
  if (response.rtnCode === Enum.ReturnCode.Successful) {
20
- var rtn = loadSearchStatsModel(response, defaultSearchData);
20
+ var rtn = loadSearchStatsModel(response,searchModel, defaultSearchData);
21
21
  if (callBack) {
22
22
  callBack(rtn);
23
23
  }
package/src/main.js CHANGED
@@ -30,7 +30,7 @@ app.use(centaline, {
30
30
  //baseUrl: "http://10.1.245.111:38028/",
31
31
 
32
32
  flagRouterSelf: true,
33
- flagApp: false,//是否app端
33
+ flagApp: true,//是否app端
34
34
  zindex: 999,
35
35
  showRequestSuccessMessage: true,
36
36
  showRequestErrorMessage: false,
@@ -68,7 +68,7 @@ app.use(centaline, {
68
68
  //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
69
69
  //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
70
70
  //authObject: '{token:"1-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
71
- authObject: '{EmpID:"Token_f0a59fe5-6641-4e7d-bd99-66e6da8e85e2",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_f0a59fe5-6641-4e7d-bd99-66e6da8e85e2",Platform:"WEB"}',
71
+ authObject: '{EmpID:"Token_4abee9c9-2616-4cb5-beda-1f94dc7d8a96",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4abee9c9-2616-4cb5-beda-1f94dc7d8a96",Platform:"IOS"}',
72
72
  };
73
73
  },
74
74
  getToken() {
package/src/views/SearchList.vue CHANGED
@@ -17,6 +17,6 @@
17
17
 
18
18
  <script lang="ts" setup>
19
19
  import { ref, nextTick } from 'vue'
20
- const apiParam = {}
20
+ const apiParam = {PublishStatusID:30}
21
21
 
22
22
  </script>