centaline-data-driven-v3 0.0.70 → 0.0.72

package/package.json

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

package/src/components/web/Button.vue

@@ -16,7 +16,8 @@
         :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
         @click="clickHandle">{{ model.controlLabel }}</el-link>
     <el-upload v-else-if="model.isImport" :action="model.action" :data="uploadData" :headers="headers" :multiple="false"
-        :show-file-list="false" :on-success="handleAvatarSuccess" :on-error="handleAvatarError" :before-upload="handleAvatarBeforeUpload">
+        :show-file-list="false" :on-success="handleAvatarSuccess" :on-error="handleAvatarError"
+        :before-upload="handleAvatarBeforeUpload">
         <el-button type="primary" v-bind="model.attrs"
             :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
             :disabled="model.disabled || model.locked">
@@ -37,7 +38,7 @@
         <div>{{ model.controlLabel }}</div>
         <div class="subText">{{ model.subText }}</div>
     </el-button>
-    <el-button v-else type="primary" v-bind="model.attrs" @click="clickHandle"
+    <el-button v-else type="primary" :loading="model.loading" v-bind="model.attrs" @click="clickHandle"
         :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
         :disabled="model.disabled || model.locked">
         <template #icon v-if="model.icon">
@@ -47,7 +48,7 @@
             <img :src="model.imgUrl" :height="model.buttonHeight" />
             <div style="margin-top:5px;" class="labelText" v-html="model.controlLabel"></div>
         </template>
-        <template v-else>
+        <template v-else :style="{display:model.loading?'inline-block':''}">
             <img v-if="model.imgUrl" :title="model.controlLabel" :src="model.imgUrl" :height="model.buttonHeight" />
             <span v-else v-html="model.controlLabel"></span>
         </template>
@@ -80,14 +81,14 @@ const uploadData = computed(() => {
     //因传输方式是FormData，故需要对Value是object的进行转化
     let data = {};
     for (var key in props.fileData) {
-      if (typeof props.fileData[key] === "object") {
-          data[key] = JSON.stringify(props.fileData[key]);
-      }
-      else {
-          data[key] = props.fileData[key];
-      }
+        if (typeof props.fileData[key] === "object") {
+            data[key] = JSON.stringify(props.fileData[key]);
+        }
+        else {
+            data[key] = props.fileData[key];
+        }
     }
-    data.flagHaveAlert=0;
+    data.flagHaveAlert = 0;
     return data;
 })
 const headers = computed(() => {
@@ -98,20 +99,20 @@ function clickHandle() {
 }
 
 function handleAvatarBeforeUpload(file) {
-  if(model.value.form && model.value.form.$vue){
-    let submitData = model.value.form.$vue.getFileData(model.value);
-    for (var key in submitData) {
-      if (typeof submitData[key] === "object") {
-        uploadData.value[key] = JSON.stringify(submitData[key]);
-      }
-      else {        
-        uploadData.value[key] = submitData[key];
-      }
+    if (model.value.form && model.value.form.$vue) {
+        let submitData = model.value.form.$vue.getFileData(model.value);
+        for (var key in submitData) {
+            if (typeof submitData[key] === "object") {
+                uploadData.value[key] = JSON.stringify(submitData[key]);
+            }
+            else {
+                uploadData.value[key] = submitData[key];
+            }
+        }
     }
-  }
 }
 function handleAvatarSuccess(res) {
-  emit('importComplete', res, model.value);
+    emit('importComplete', res, model.value);
 }
 function handleAvatarError(info) {
     ElMessage({
@@ -137,47 +138,47 @@ function commandClick(code) {
     color: var(--chinaRed);
     font-weight: 700;
 }
+
 /* 查询搜索 */
 .search-btn,
 .more-btn {
-  height: 26px;
-  background: var(--chinaRed);
-  border-color: var(--chinaRed);
-  box-shadow: 0px 2px 4px 0px rgba(238, 107, 107, 0.25);
-  border-radius: 6px;
-  color: #fff;
+    height: 26px;
+    background: var(--chinaRed);
+    border-color: var(--chinaRed);
+    box-shadow: 0px 2px 4px 0px rgba(238, 107, 107, 0.25);
+    border-radius: 6px;
+    color: #fff;
 }
 
 /* 重置按钮 更多按钮*/
 .reset-btn {
-  height: 26px;
-  background: #FFFFFF;
-  border-color: var(--chinaRed);
-  border-radius: 6px;
-  color: var(--chinaRed);
+    height: 26px;
+    background: #FFFFFF;
+    border-color: var(--chinaRed);
+    border-radius: 6px;
+    color: var(--chinaRed);
 }
 
 /* 搜索按钮,重置按钮和更多按钮的hover */
 .search-btn:hover,
 .reset-btn:hover,
 .more-btn:hover {
-  background-color: var(--btnHoverRed);
-  border-color: var(--btnHoverRed);
-  color: #fff;
+    background-color: var(--btnHoverRed);
+    border-color: var(--btnHoverRed);
+    color: #fff;
 }
 
 .more-btn:hover .open,
 .more-btn:hover .fold {
-  background-color: var(--btnHoverRed);
+    background-color: var(--btnHoverRed);
 }
 
 .search-btn:active,
 .search-btn:focus,
 .reset-btn:active.reset-btn:focus,
 .more-btn:active.more-btn:focus {
-  background-color: var(--btnFocusRed);
-  border-color: var(--btnFocusRed);
-  color: #fff;
+    background-color: var(--btnFocusRed);
+    border-color: var(--btnFocusRed);
+    color: #fff;
 }
-
 </style>

package/src/components/web/Tree.vue

@@ -4,7 +4,7 @@
             <ct-searchscreen ref="reftreescreen" :from="'tree'" :api="searchConditionApi" :screenPara="screenPara"
                 @search="search" @loaded="screenload" ></ct-searchscreen>
         </div>
-        <tree ref="reftree" :api="searchDataApi"  @loaded="loaded" :treeHeight="treeHeight">
+        <tree v-if="loadTree" ref="reftree" :api="searchDataApi"  @loaded="loaded" :treeHeight="treeHeight">
         </tree>
 
 
@@ -14,6 +14,7 @@
 import { ref, nextTick, watch, onMounted } from 'vue'
 import Tree from './Tree/Tree.vue';
 const emit = defineEmits(['loaded'])
+const loadTree=ref(false)
 
 const props = defineProps({
     searchConditionApi: String,
@@ -54,6 +55,7 @@ function loaded(data) {
     } catch (e) { }
 }
 function screenload(data) {
+    loadTree.value=true
     setTreeHeight();
 }
 onMounted(() => {

package/src/components/web/dialog.vue

@@ -19,6 +19,9 @@ onActivated(() => {
 })
 function close() {
     emit('close', props);
+    if (props.vmodel.content[0].attrs && typeof props.vmodel.content[0].attrs["onCloseDialog"] === "function") {
+      props.vmodel.content[0].attrs["onCloseDialog"]();
+    }
 }
 function scrollHandle(ev) {
     contentTop.value = content.value.scrollTop;

package/src/loader/src/Router.js

@@ -4,6 +4,7 @@ import Enum from '../../utils/Enum';
 const Router = function (source) {
   let rtn = {
     disabled: source.selectedMode && source.selectedMode === Enum.ListSelectMode.Multiple ? true : false,//是否可以多选
+    loading: false,
     //动作的 key 值
     get key() {
       return source.key;

package/src/loader/src/SearchScreen.js

@@ -320,6 +320,8 @@ function isHandle(type) {
     let result = false;
     switch (type) {
         case Enum.ControlType.CheckBoxList://复选列表
+        case Enum.ControlType.MultiSelectNoSearch:
+        case Enum.ControlType.MultiSelectWithSearch:
             result = true;
             break;
         default:

package/src/main.js

@@ -21,10 +21,11 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
     //baseUrl: "http://10.88.22.66:6060/xian/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
-    //baseUrl: "http://10.1.245.111:38028/",
+    baseUrl: "http://10.88.22.66:6060/onecard-api/",
+
     flagRouterSelf: true,
     flagApp: false,//是否app端
     zindex: 999,
@@ -63,8 +64,8 @@ app.use(centaline, {
             return {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
-                //authObject: '{token:"1-a7289bb2-9f1e-4a04-9016-1e555bf39188"}',
-                authObject: '{EmpID:"Token_15dc3fe3-b962-4bd2-85e2-2ce843676353",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_15dc3fe3-b962-4bd2-85e2-2ce843676353",Platform:"IOS"}',
+                authObject: '{token:"1647-1902992017571581952",platform:"WEB"}',
+                //authObject: '{EmpID:"Token_2e493771-28ae-485d-afea-0e6dcef23f64",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_2e493771-28ae-485d-afea-0e6dcef23f64",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/mixins.js

@@ -437,7 +437,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     submitData = field.getActionPara(submitData).para;
                     common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
                 }
-                else if(field.isVueComponentInTab){
+                else if (field.isVueComponentInTab) {
                     submitData = field.getActionPara(submitData).para;
                     common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
                 }
@@ -665,7 +665,12 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                             }
                         }
                         else {
+                            field.loading = true;
+                            if (!field.flagAlert && field.content) {
+                                common.message( field.content, 'info',1500,true)
+                            }
                             field.doBlobAction(submitData, (data, headers) => {
+                                field.loading=false;
                                 if (data.type == "application/json") {
                                     const reader = new FileReader();
                                     reader.readAsText(data, 'utf-8');
@@ -838,10 +843,10 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                 }
                 else {
                     if (source == 'table') {
-                      model.$vue.operationLoading = true
+                        model.$vue.operationLoading = true
                     }
-                    else{
-                      submitData = field.getActionPara(submitData).para;
+                    else {
+                        submitData = field.getActionPara(submitData).para;
                     }
                     field.doAction(submitData, (data) => {
                         if (source == 'table') {
@@ -928,10 +933,10 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
             fun(submitData, title, model);
         }
     }
+    if (typeof field.onChanged !== 'undefined') {
+        common.excute.call(model.scripts, field.onChanged)
+    }
     if (field.isSubmit && field.flagVerifyData) {
-        if (typeof field.onChanged !== 'undefined') {
-            common.excute.call(model.scripts, field.onChanged)
-        }
         if (source == 'form' && !model.$vue.validExcute()) {
             return;
         }
@@ -1602,7 +1607,7 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
                                         cancelButtonText: '取消',
                                         type: 'warning'
                                     }).then(() => {
-                                        
+
                                         submitData.flagHaveAlert = '1';
                                         field.doAction(submitData, (res) => {
                                             if (res.rtnCode === Enum.ReturnCode.Successful) {
@@ -1659,10 +1664,10 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
             fun(submitData, title, model);
         }
     }
+    if (typeof field.onChanged !== 'undefined') {
+        common.excute.call(model.scripts, field.onChanged)
+    }
     if (field.isSubmit && field.flagVerifyData) {
-        if (typeof field.onChanged !== 'undefined') {
-            common.excute.call(model.scripts, field.onChanged)
-        }
         if (source == 'form' && !model.$vue.validExcute()) {
             return;
         }

package/src/views/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/batchcontractadjust/batchAdjustCommissionPointList/getLayoutOfSearch'"
-      :searchDataApi="'/batchcontractadjust/batchAdjustCommissionPointList/getList'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/ReportMonthAttendanceList/getLayoutOfSearch'"
+      :searchDataApi="'/ReportMonthAttendanceList/getListOfSearchModel'"></ct-searchlist>
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>