centaline-data-driven-v3 0.0.88 → 0.0.90

package/src/loader/src/CheckBoxList.js

@@ -8,7 +8,7 @@ const CheckBoxList = function (source) {
             this._value = [];
             if (source.code1) {
                 let val = source.code1
-                if (typeof source.code1 === 'string'){
+                if (typeof source.code1 === 'string') {
                     val = JSON.parse(source.code1)
                 }
                 val.forEach((v) => {
@@ -33,14 +33,14 @@ const CheckBoxList = function (source) {
             });
             currentOptions.forEach((v) => {
                 rtn.globalOptions.forEach((v1) => {
-                    if(v.code===v1.code){
-                        v['rowID']=v1['rowID']
+                    if (v.code === v1.code) {
+                        v['rowID'] = v1['rowID']
                     }
                 });
             });
             if (source.code1) {
                 let checked = source.code1
-                if (typeof source.code1 === 'string'){
+                if (typeof source.code1 === 'string') {
                     checked = JSON.parse(source.code1)
                 }
                 checked.forEach((v) => {
@@ -68,17 +68,28 @@ const CheckBoxList = function (source) {
         //初始数据
         get globalOptions() {
             if (source.code1) {
-                if (typeof source.code1 === 'string'){
+                if (typeof source.code1 === 'string') {
                     return [].concat(JSON.parse(source.code1));
                 }
                 return [].concat(source.code1);
-                
+
             }
             else {
                 return []
             }
         },
-
+        getCheckedName() {
+            var nameArr = '';
+            var checked = source.code1 === '' ? [] : [].concat(JSON.parse(source.code1));
+            checked.forEach((v) => {
+                if (v['code']) {
+                    if (!v['flagDeleted']) {
+                        nameArr = nameArr + (nameArr ? ' ' : '') + v['name'];
+                    }
+                }
+            });
+            return nameArr;
+        },
 
     };
     rtn = base.copy(source, rtn);

package/src/loader/src/Form.js

@@ -3,7 +3,7 @@ import LibFunction from './LibFunction';
 import Router from './Router';
 import Enum from '../../utils/Enum';
 import common from '../../utils/common';
-import request from '../../utils/request'; 
+import request from '../../utils/request';
 
 function loadFormApi(api, callBack, apiParam, failCallBack, isFormList) {
   if (api) {
@@ -47,7 +47,7 @@ function loadFromModel(source, isFormList) {
           return rtn1.code1;
         }
       },
-     
+
       //获取code2
       getCode2ByField1(id) {
         var rtn1 = this.fieldsDic[id];
@@ -63,17 +63,6 @@ function loadFromModel(source, isFormList) {
           router[attrKey] = attrValue;
         }
       },
-      setbuttonRouter(id, attrKey, attrValue) {
-        var router = this.form.buttons.find((v1) => {
-          return v1.key === id;
-        });
-        if (router) {
-          router[attrKey] = attrValue;
-          if(common.flagApp()&&this.form.$vue.loaded){
-            this.form.$vue.loaded(this.form)
-          }
-        }
-      },
       //获取Field的属性attrKey的值
       getValueByFieldName(id, attrKey) {
         attrKey = common.initialsToLowerCase(attrKey);
@@ -125,6 +114,11 @@ function loadFromModel(source, isFormList) {
             }
             if (rtn1.itemKey) rtn1.itemKey = Math.random()
           }
+          if (rtn1.is == 'ct-button') {
+            if (common.flagApp() && this.form.$vue.loaded) {
+              this.form.$vue.loaded(this.form)
+            }
+          }
           hiddenHandle(rtn1, this.form);
           requiredHandle(rtn1, this.form);
         }
@@ -307,6 +301,9 @@ function loadFromModel(source, isFormList) {
             if (flagTemplate) {
               data.field[attrName] = value;
             }
+            if (data.listData.flagTemplate && data.listData.$vue) {
+              data.listData.$vue.itemKey = Math.random()
+            }
           }
 
           //如果有汇总列，触发重新计算汇总
@@ -751,13 +748,13 @@ function loadFromModel(source, isFormList) {
             return v1.key === field.fieldName1;
           });
         }
-        rtn._aiRouter= router;
+        rtn._aiRouter = router;
         return rtn._aiRouter;
       }
-    },  
+    },
     get aiChat() {
       return source.aiChat;
-    }, 
+    },
     //获取表单数据
     getFormObj() {
       var rtnFormObj = {};
@@ -800,9 +797,9 @@ function loadFromModel(source, isFormList) {
     getRefFieldPara(refFieldNameArr) {
       let submitData = {};
       var tempFormData = rtn.getFormObj();
-      
+
       refFieldNameArr.forEach((v) => {
-        submitData[v] =  common.getDataOfUpperLower(tempFormData,v);
+        submitData[v] = common.getDataOfUpperLower(tempFormData, v);
       });
       return submitData;
     },
@@ -914,14 +911,14 @@ function allRequiredHandle(model) {
 function requiredHandle(item, model) {
   if (item.fieldName1) {
     let field = null;
+    let field1 = null;
     let value = getFieldValue(item);
     for (var i in model.fields) {
       if (model.fields[i].requiredRelationField === item.fieldName1) {
         field = model.fields[i];
-        let f = model.fieldsDic[field.fieldName1];
         if (field) {
-          let hiddenValueArr = field.requiredRelationFieldValue.split(',');
-          if (hiddenValueArr.indexOf(value) > -1) {
+          let requiredValueArr = field.requiredRelationFieldValue.split(',');
+          if (requiredValueArr.indexOf(value) > -1) {
             field.required = true;
           }
           else {
@@ -929,6 +926,22 @@ function requiredHandle(item, model) {
           }
         }
       }
+      if (model.fields[i].controlType == Enum.ControlType.Compound || model.fields[i].controlType == Enum.ControlType.ContainerControl) {
+        for (var i1 in model.fields[i].fields) {
+          if (model.fields[i].fields[i1].requiredRelationField === item.fieldName1) {
+            field1 = model.fields[i].fields[i1];
+            if (field1) {
+              let requiredValueArr = field1.requiredRelationFieldValue.split(',');
+              if (requiredValueArr.indexOf(item.code1) > -1) {
+                field1.required = true;
+              }
+              else {
+                field1.required = false;
+              }
+            }
+          }
+        }
+      }
     }
   }
 }

package/src/main.js

@@ -21,8 +21,8 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl:"https://uplink.centaline.com.cn/xian/",
-    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    //baseUrl:"https://uplink.centaline.com.cn/xian/",
+    baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
     //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
     //baseUrl: "http://10.88.22.66:6060/xian/",
@@ -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: true,
@@ -67,8 +67,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-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
-                //authObject: '{EmpID:"Token_156a7f3f-b1e9-4592-aaef-49a572768c06",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_156a7f3f-b1e9-4592-aaef-49a572768c06",Platform:"IOS"}',
+                //authObject: '{token:"1-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
+                authObject: '{EmpID:"Token_24ffcd48-4caa-4158-af20-b6dea70d869e",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_24ffcd48-4caa-4158-af20-b6dea70d869e",Platform:"IOS"}',
             };
         },
         getToken() {

package/src/utils/mixins.js

@@ -144,7 +144,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                         //action有值，提交到后台
                         if (field.action) {
                             if (common.flagApp()) {
-                                showLoadingToast({ message: '正在处理', forbidClick: true, duration: 100000 });
+                                showLoadingToast({ message:common.LocalizedString('正在处理', '正在處理') , forbidClick: true, duration: 100000 });
                             }
                             field.disabled = true;//提交按钮禁用
                             model.pageDisabled = true;
@@ -442,12 +442,22 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
                 }
                 else if (field.isOpenUrlInBrowse) {// 浏览器打开
-                    window.open(submitData[field.submitFormField], "_blank");
+                    if(common.getDataDrivenOpts().handler.openUrlInBrowse){
+                        common.getDataDrivenOpts().handler.openUrlInBrowse(submitData[field.submitFormField]);
+                    }
+                    else{
+                        window.open(submitData[field.submitFormField], "_blank");
+                    }
                 }
                 else if (field.isBrowserNewTab) {// 浏览器打开
                     submitData = field.getActionPara(submitData).para;
                     let query = common.objectToQueryStr(submitData);
-                    window.open(action + query, "_blank");
+                    if(common.getDataDrivenOpts().handler.openUrlInBrowse){
+                        common.getDataDrivenOpts().handler.openUrlInBrowse(action + query);
+                    }
+                    else{
+                        window.open(action + query, "_blank");
+                    }
                 }
                 else if (field.isUrlInSystemTab) {//外部框架tab页打开URl
                     submitData = field.getActionPara(submitData).para;

package/src/views/SearchList.vue

@@ -3,13 +3,13 @@
     <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
       :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
        :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
-<!-- 
-       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
+
+       <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
       :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist> -->
 
       
-      <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'"
-      :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModelForMy'"></ct-searchlist> -->
+      <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/AttendanceClassList/getLayoutOfSearch'"
+      :searchDataApi="'/AttendanceClassList/getListOfSearchModel'"></ct-searchlist> -->
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>