centaline-data-driven-v3 0.0.95 → 0.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.95",
+  "version": "0.0.97",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/app/Progress.vue

@@ -2,7 +2,7 @@
     <div class="ct-progress">
         <div style="padding: 5px;">
             <div class="circleBox">
-                <van-circle v-if="progressFlag" v-model:current-rate="percentage" :rate="100" :speed="100" />
+                <van-circle v-if="progressFlag" v-model:current-rate="percentage" :rate="percentage" :speed="100" />
                 <div class="circleCenter" v-if="progressFlag">
                     <div style="font-size: 16px;color: #666;"> {{ percentage.toFixed(2) }}%</div>
                 </div>

package/src/components/app/SearchList/SearchStats.vue

@@ -30,10 +30,10 @@ const model = ref(null)
 const selectStats = ref("")
 const fieldName1 = ref("")
 const tableStatistics = ref()
-function searchStatsComplate() {
+function searchStatsComplate(defaultSearchData) {
     nextTick(function () {
         if (typeof props.api !== "undefined") {
-            SearchStats.loadSearchStatsApi(props.api, load, props.searchModel, null);
+            SearchStats.loadSearchStatsApi(props.api, load, props.searchModel, defaultSearchData);
         }
         if (typeof props.source !== "undefined") {
             load(SearchStats.loadSearchStatsModel(props.source));
@@ -48,7 +48,7 @@ function load(data) {
     data.source.content.forEach((item) => {
         fieldName1.value = item.fieldName1;
     });
-    if (selectStats.value == '') {
+     if (selectStats.value == ''&&!(model.value.defaultSearchData&&model.value.defaultSearchData.searchData)) {
         var i = data.source.content.findIndex((v) => {
             return v.code1 == props.apiParam[fieldName1.value];
         });

package/src/components/app/SearchList/SearchTable.vue

@@ -233,7 +233,7 @@ function onRefresh() {
 }
 function loadStats() {
     if (props.searchStatsApi) {
-        refTableStats.value.searchStatsComplate();
+        refTableStats.value.searchStatsComplate(model.value.searchStats);
     }
 }
 //更新行数据

package/src/components/web/CheckBoxList.vue

@@ -35,7 +35,7 @@ const props = defineProps({
 })
 const model = initData(props, CheckBoxList)
 
-function change() {
+function change() { 
     model.value.setcode()
     changeHandler(model.value, emit);
     if (model.value.autoSearch) emit('search');

package/src/components/web/PhotoSelect.vue

@@ -84,7 +84,8 @@ const dragOptions = {
     chosenClass: "chosen",
     forceFallback: true,
 }
-
+const currentWidth = ref(0); // 当前显示的宽度
+    const  currentHeight= ref(0); // 当前显示的高度
 const qrtimer=ref(null)
 onBeforeUnmount(()=>{
   if (qrtimer.value) {
@@ -128,6 +129,7 @@ function handleOpen() {
         });
         return;
     }
+    updateCurrentSize();
     var params = {
         paramName: model.value.paramName1,
         parentValue: model.value.getFormParentFieldPara(),
@@ -141,8 +143,8 @@ function handleOpen() {
         pane: common.getParentPane(),
         content: [{
             component: "ct-photoselectlist",
-            width: "772px",
-            height: "550px",
+            width: currentWidth.value+"px",
+            height: currentHeight.value+"px",
 
             attrs: {
                 api: model.value.action, //  self.api,//source.xx
@@ -151,8 +153,8 @@ function handleOpen() {
                 mediaViewPageType: (model.value.mediaViewPageType || 0),
                 // width: self.model.router.pageWidth + 'px',
                 // height: self.model.router.pageHeight+'px',
-                width: "772px",
-                height: "550px",
+               width: currentWidth.value+"px",
+            height: currentHeight.value+"px",
                 para: params,
                 onHandlePhoto: (List) => {
                     nextTick(function () {
@@ -184,6 +186,14 @@ function handleOpen() {
 
 
 }
+
+function updateCurrentSize() {
+    let width = window.innerWidth;
+    let height = window.innerHeight;
+      // 根据条件更新当前宽度和高度
+      currentWidth.value = width  < 772 ? width : 772;
+      currentHeight.value =height  < 550 ? height-45 :550;
+    }
 function onEnd(a, b) {
 
     nextTick(function () {

package/src/components/web/SearchList/SearchStats.vue

@@ -113,10 +113,10 @@ const tableStatistics = ref()
 onMounted(() => {
     showWidth.value = tableStatistics.value && tableStatistics.value.offsetWidth || document.body.clientWidth;
 })
-function searchStatsComplate() {
+function searchStatsComplate(defaultSearchData) {
     nextTick(function () {
         if (typeof props.api !== "undefined") {
-            SearchStats.loadSearchStatsApi(props.api, load, props.searchModel, null);
+            SearchStats.loadSearchStatsApi(props.api, load, props.searchModel, defaultSearchData);
         }
         if (typeof props.source !== "undefined") {
             load(SearchStats.loadSearchStatsModel(props.source));
@@ -158,7 +158,7 @@ function load(data) {
                 return -1; // 顺序不变
             }
         });
-        if (selectStats.value == '') {
+        if (selectStats.value == ''&&!(model.value.defaultSearchData&&model.value.defaultSearchData.searchData)) {
             var m = data.source.content.find((v) => {
                 return v.code1 == props.apiParam[fieldName1.value];
             });

package/src/loader/src/CheckBoxList.js

@@ -28,7 +28,7 @@ const CheckBoxList = function (source) {
         },
         //修改code1值
         setcode() {
-            let currentOptions = source.selectItems1.filter((v) => {
+            let currentOptions = this.selectItems1.filter((v) => {
                 return this.value.indexOf(v['code']) >= 0;
             });
             currentOptions.forEach((v) => {

package/src/loader/src/SearchStats.js

@@ -17,7 +17,7 @@ function loadSearchStatsApi(action, callBack, searchModel, defaultSearchData) {
         }).then(
             function (response) {
                 if (response.rtnCode === Enum.ReturnCode.Successful) {
-                    var rtn = loadSearchStatsModel(response, defaultSearchData);
+                    var rtn = loadSearchStatsModel(response,searchModel, defaultSearchData);
                     if (callBack) {
                         callBack(rtn);
                     }

package/src/main.js

@@ -30,7 +30,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: false,//是否app端
+    flagApp: true,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: false,
@@ -68,7 +68,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
-                authObject: '{EmpID:"Token_cf665522-aa5a-478c-b33a-0eac9ea30cee",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_cf665522-aa5a-478c-b33a-0eac9ea30cee",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_4abee9c9-2616-4cb5-beda-1f94dc7d8a96",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4abee9c9-2616-4cb5-beda-1f94dc7d8a96",Platform:"IOS"}',
             };
         },
         getToken() {

package/src/views/SearchList.vue

@@ -17,6 +17,6 @@
   
 <script lang="ts" setup>
 import { ref, nextTick } from 'vue'
-const apiParam = {}
+const apiParam = {PublishStatusID:30}
 
 </script>