centaline-data-driven-v3 0.1.54 → 0.1.56

package/package.json

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

package/src/loader/src/Form.js

@@ -8,7 +8,7 @@ import request from '../../utils/request';
 function loadFormApi(api, callBack, apiParam, failCallBack, isFormList, appRootUrl) {
   if (api) {
     apiParam = apiParam ? apiParam : {};
-    request.postHandler(common.globalUri(), { "action": (appRootUrl||'') + api, "para": apiParam }).then(
+    request.postHandler(common.globalUri(), { "action": (appRootUrl || '') + api, "para": apiParam }).then(
       function (response) {
         if (response.rtnCode === Enum.ReturnCode.Successful) {
           let data = response.content;
@@ -37,7 +37,7 @@ function loadFromModel(source, isFormList, appRootUrl) {
       excuteData: null,//fields
       fieldsDic: null,//fieldsDic
       _excuteListData: undefined,
-      appRootUrl: appRootUrl||'',
+      appRootUrl: appRootUrl || '',
       enableRelationFields(FlagRelation) {
         this.form.enableRelationFields = FlagRelation
       },
@@ -675,7 +675,7 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.buttons.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl||'') + v.action;
+            v.action = (appRootUrl || '') + v.action;
             var button = Router(v);
             button.is = "ct-button";
             rtn._buttons.push(button);
@@ -696,7 +696,7 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.captionBarButtons.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-             v.action = (appRootUrl||'') + v.action;
+            v.action = (appRootUrl || '') + v.action;
             var button = Router(v);
             button.is = "ct-button";
             rtn._captionBarButtons.push(button);
@@ -717,7 +717,7 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.links.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-             v.action = (appRootUrl||'') + v.action;
+            v.action = (appRootUrl || '') + v.action;
             var button = Router(v);
             button.is = "ct-button";
             rtn._links.push(button);
@@ -738,7 +738,7 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.actionRouters.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl||'') + v.action;
+            v.action = (appRootUrl || '') + v.action;
             var button = Router(v);
             button.is = "ct-button";
             rtn._actionRouters.push(button);
@@ -749,7 +749,7 @@ function loadFromModel(source, isFormList, appRootUrl) {
     },
     //参数取值的Action    
     get parameterAction() {
-      return (appRootUrl||'') + source.parameterAction;
+      return (appRootUrl || '') + source.parameterAction;
     },
     _pageDisabled: false,
     get pageDisabled() {
@@ -855,21 +855,23 @@ function loadFromModel(source, isFormList, appRootUrl) {
           else if (f.controlType == Enum.ControlType.SearchPage) {
             if (f.table) {
               let rtnFormArr = [];
-              var tempListData = f.table.model.getSelectRowData({ isMulti: f.table.model.isMulti });
-              if (tempListData) {
-                for (let i = 0; i < tempListData.length; i++) {
-                  rtnFormArr.push(tempListData[i]);
+              if (f.table.model) {
+                var tempListData = f.table.model.getSelectRowData({ isMulti: f.table.model.isMulti });
+                if (tempListData) {
+                  for (let i = 0; i < tempListData.length; i++) {
+                    rtnFormArr.push(tempListData[i]);
+                  }
                 }
+                let rtnObj = {};
+                Object.defineProperty(rtnObj, f.fieldName1, {
+                  get: function () {
+                    return rtnFormArr;
+                  },
+                  enumerable: true,
+                  configurable: true
+                });
+                Object.assign(rtnFormObj, rtnObj);
               }
-              let rtnObj = {};
-              Object.defineProperty(rtnObj, f.fieldName1, {
-                get: function () {
-                  return rtnFormArr;
-                },
-                enumerable: true,
-                configurable: true
-              });
-              Object.assign(rtnFormObj, rtnObj);
             }
 
           }
@@ -933,7 +935,7 @@ function loadFromModel(source, isFormList, appRootUrl) {
       }
     },
     getRtnRouter(v) {
-      v.action = (appRootUrl||'') + v.action;
+      v.action = (appRootUrl || '') + v.action;
       var button = Router(v);
       button.is = "ct-button";
       return button;

package/src/main.js

@@ -21,16 +21,15 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    //baseUrl: "http://10.88.22.13:7080/ibs-api/",
+    baseUrl: "http://10.88.22.66/IBS.Mvc/api/",
     //baseUrl:"http://10.88.22.66:7080/ibs-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/IBS.Mvc/api/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -67,7 +66,7 @@ app.use(centaline, {
             return {
                 
              //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyaWQiOiIyNTEyMTUxNzQyMTg5QzI4MTgwRDkxRTk0MDhEOTA0QSIsImxvZ2luX3VzZXJfa2V5IjoiN2MzYzNjNjAtNWVjMy00MzdkLWExMDYtOWYxZTMwYjU0Mjg2In0.daG9mS98Gg8KmHSUjYHktMcO2Jk7SVtCcqm2sRB0I8Y2N0TuonIrVUDcHdNdDiuD3v6qO_f010tQWlBsAQ1dqg',
-              authobject: '{EmpID:"Token_bc5284a5-19d5-467c-8601-e295062981fc",MachineCode:"1d6b7fc9-90ff-4a68-9504-1174fa72db7b",SSO_Token:"SSOToken_bc5284a5-19d5-467c-8601-e295062981fc",Platform:"IOS"}',
+              authobject: '{EmpID:"Token_5ee29143-b885-4ee7-9cef-b85e4bdca4a0",MachineCode:"1d6b7fc9-90ff-4a68-9504-1174fa72db7b",SSO_Token:"SSOToken_5ee29143-b885-4ee7-9cef-b85e4bdca4a0",Platform:"WEB"}',
               //authobject: '{EmpID:"Token_946d56e1-7972-4382-9d10-4a72496aab39",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_946d56e1-7972-4382-9d10-4a72496aab39",Platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',

package/src/utils/mixins.js

@@ -993,8 +993,10 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                         cancelButtonText: '取消',
                                         type: 'warning'
                                     },model.appendToBody).then(() => {
+                                        model.$vue.operationLoading = true
                                         submitData.flagHaveAlert = '1';
                                         field.doAction(submitData, (res) => {
+                                            model.$vue.operationLoading = false
                                             if (res.rtnCode === Enum.ReturnCode.Successful) {
                                                 if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
                                                     model.$vue.doAction(res, model);

package/src/views/Form.vue

@@ -1,12 +1,10 @@
 <template>
-  <div
-      :style="{ 'width': '800px' , 'height': '800px', margin: 'auto', 'position': 'relative'}">
-   <ct-form :source="source" :openType="'tree'"></ct-form>
-    <!-- <ct-textbox :source="source"></ct-textbox> -->
-<ct-dialoglist ref="dialogList"></ct-dialoglist>
- </div>  
-</template>
+    <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
+    <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'/admin/SchoolTeachingPlanLibrary/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-dialog-list></ct-dialog-list>
+  </div>  
+  </template>
 <script lang="ts" setup>
-const source={"flagSearch":false,"parameterAction":"/cache/getParamList","actionTitle":"","title":"新跟進","flagFixedTabOnHorizontalLayout":false,"layoutOrientation":"Vertical","flagHideSaveLine":true,"captionBarButtons":[],"flagAlertCloseWindowAfterSave":false,"scripts":"","actionRouters":[{"buttonHeight":0,"hidden":false,"align":"left","pageHeight":600,"pageWidth":800,"buttonType":"Submit","action":"ind/PropertyFollow/save","flagAlert":false,"pageColumns":0,"text":"保存","locked":false,"key":"saveShortcutFollow","flagAttachSearchCondition":false,"flagAddRowAfterAction":false,"flagFreshCurrentRow":false,"actionType":"New","flagAsync":false,"flagVerifyData":true}],"buttons":[],"colSpan":0,"list":[],"labelPlacement":"left","onload":"","medias":[],"flagShowTitle":false,"fields":[{"displayLabelAfterSelected":true,"code1":"100476","fieldName1":"PropertyID","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"","mediaViewPageType":"PageInLayer","hidden":false,"spanCols":1,"controlType":"Hidden"},{"displayLabelAfterSelected":true,"code1":"1","fieldName1":"FlagShortcutFollow","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"","mediaViewPageType":"PageInLayer","hidden":false,"spanCols":1,"controlType":"Hidden"},{"displayLabelAfterSelected":true,"code1":"","fieldName1":"FullFollow","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"","mediaViewPageType":"PageInLayer","compoundFields":[{"displayLabelAfterSelected":true,"code1":"","fieldName1":"FollowContent","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"","mediaViewPageType":"PageInLayer","hidden":false,"spanCols":1,"maxValue1":"50","controlType":"TextBox"},{"displayLabelAfterSelected":true,"code1":"","fieldName1":"saveShortcutFollow","SearchOperation":"None","lazyLoad":false,"autoSearch":false,"autoFill":false,"SearchDataType":"None","controlLabel":"保存","mediaViewPageType":"PageInLayer","hidden":false,"spanCols":1,"controlType":"ButtonCommon"}],"hidden":false,"spanCols":1,"controlType":"CompoundControl"}]}
- const apiParam={"originalOrderId":"2014640778344816640","columnName":"orderNo","actionType":"1","pageStyle":"2","pageOnly":"true"}
+ const apiParam={"teachingPlanId":"1982726202548482048","actionType":3}
 </script>

package/src/views/SearchList.vue

@@ -4,9 +4,9 @@
       
     :searchDataApi="'/ccesmanage/AppUseSummaryList/getList'"></ct-searchlist> -->
 
-      <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
+      <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
       
-    :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
+    :searchDataApi="'/propertyPublishList/getListOfSearchModel'" :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->