centaline-data-driven-v3 0.1.53 → 0.1.55

package/src/loader/src/Form.js

@@ -5,14 +5,14 @@ import Enum from '../../utils/Enum';
 import common from '../../utils/common';
 import request from '../../utils/request';
 
-function loadFormApi(api, callBack, apiParam, failCallBack, isFormList) {
+function loadFormApi(api, callBack, apiParam, failCallBack, isFormList, appRootUrl) {
   if (api) {
     apiParam = apiParam ? apiParam : {};
-    request.postHandler(common.globalUri(), { "action": 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;
-          let rtn = loadFromModel(data, isFormList);
+          let rtn = loadFromModel(data, isFormList, appRootUrl);
           if (callBack) {
             callBack(rtn);
           }
@@ -29,7 +29,7 @@ function loadFormApi(api, callBack, apiParam, failCallBack, isFormList) {
 
 
 
-function loadFromModel(source, isFormList) {
+function loadFromModel(source, isFormList, appRootUrl) {
   let rtn = {
     formData: {
       form: null,
@@ -37,6 +37,7 @@ function loadFromModel(source, isFormList) {
       excuteData: null,//fields
       fieldsDic: null,//fieldsDic
       _excuteListData: undefined,
+      appRootUrl: appRootUrl || '',
       enableRelationFields(FlagRelation) {
         this.form.enableRelationFields = FlagRelation
       },
@@ -673,6 +674,8 @@ function loadFromModel(source, isFormList) {
         if (source.buttons) {
           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;
             var button = Router(v);
             button.is = "ct-button";
             rtn._buttons.push(button);
@@ -692,6 +695,8 @@ function loadFromModel(source, isFormList) {
         if (source.captionBarButtons) {
           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;
             var button = Router(v);
             button.is = "ct-button";
             rtn._captionBarButtons.push(button);
@@ -711,6 +716,8 @@ function loadFromModel(source, isFormList) {
         if (source.links) {
           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;
             var button = Router(v);
             button.is = "ct-button";
             rtn._links.push(button);
@@ -730,6 +737,8 @@ function loadFromModel(source, isFormList) {
         if (source.actionRouters) {
           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;
             var button = Router(v);
             button.is = "ct-button";
             rtn._actionRouters.push(button);
@@ -740,7 +749,7 @@ function loadFromModel(source, isFormList) {
     },
     //参数取值的Action    
     get parameterAction() {
-      return source.parameterAction;
+      return (appRootUrl || '') + source.parameterAction;
     },
     _pageDisabled: false,
     get pageDisabled() {
@@ -846,21 +855,23 @@ function loadFromModel(source, isFormList) {
           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);
             }
 
           }
@@ -924,6 +935,7 @@ function loadFromModel(source, isFormList) {
       }
     },
     getRtnRouter(v) {
+      v.action = (appRootUrl || '') + v.action;
       var button = Router(v);
       button.is = "ct-button";
       return button;

package/src/loader/src/Router.js

@@ -114,7 +114,7 @@ const Router = function (source) {
       source.hidden = !v;
     },
 
-    //是否显示
+    //组件名称
     get vueComponentName() {
       return source.vueComponentName;
     },
@@ -149,7 +149,7 @@ const Router = function (source) {
     },
     get isClientFuntion() {
       return source.pageStyle === Enum.PageStyle.ClientFunction
-      ||source.actionType===Enum.ActionType.ExcuteClientFunction;
+        || source.actionType === Enum.ActionType.ExcuteClientFunction;
     },
     get isSearchPageWithList() {
       return source.pageStyle === Enum.PageStyle.SearchPageWithList;
@@ -412,6 +412,12 @@ const Router = function (source) {
         if (rtn.isDropdown && rtn.selectOptionCode) {
           data[rtn.paramName] = rtn.selectOptionCode;
         }
+        if (rtn.isCheckbox && rtn.code1) {
+          data[common.initialsToLowerCase(rtn.key)] = "0";
+          if (rtn.code1 == true) {
+            data[common.initialsToLowerCase(rtn.key)] = "1";
+          }
+        }
         params = {
           action: rtn.action,
           para: data

package/src/loader/src/SearchScreen.js

@@ -5,14 +5,14 @@ import common from '../../utils/common';
 import request from '../../utils/request';
 import Router from './Router';
 
-function loadSearchScreenApi(action, callBack, screenPara, prevParam, failCallBack) {
+function loadSearchScreenApi(action, callBack, screenPara, prevParam, failCallBack,appRootUrl) {
   if (action) {
     screenPara = screenPara ? screenPara : {};
-    request.postHandler(common.globalUri(), { "action": action, "para": screenPara }).then(
+    request.postHandler(common.globalUri(), { "action": (appRootUrl||'')+action, "para": screenPara }).then(
       function (response) {
         if (response.rtnCode === Enum.ReturnCode.Successful) {
           let data = response.content;
-          let rtn = loadSearchScreenModel(data, prevParam);
+          let rtn = loadSearchScreenModel(data, prevParam,appRootUrl);
           if (callBack) {
             callBack(rtn);
           }
@@ -26,7 +26,7 @@ function loadSearchScreenApi(action, callBack, screenPara, prevParam, failCallBa
     );
   }
 }
-function loadSearchScreenModel(source, prevParam) {
+function loadSearchScreenModel(source, prevParam,appRootUrl) {
   let rtn = {
     formData: {
       form: null,
@@ -35,6 +35,7 @@ function loadSearchScreenModel(source, prevParam) {
       fieldsDic: null,//fieldsDic
       source: null,
       _excuteListData: undefined,
+      appRootUrl:(appRootUrl||''),
       enableRelationFields(FlagRelation) {
         this.form.enableRelationFields = FlagRelation
       },
@@ -463,7 +464,7 @@ function loadSearchScreenModel(source, prevParam) {
       return false
     },
     get parameterAction() {
-      return source.parameterAction
+      return (appRootUrl||'')+source.parameterAction
     },
     _scripts: null,
     get scripts() {
@@ -700,6 +701,7 @@ function loadSearchScreenModel(source, prevParam) {
         rtn._actionRouters = [];
         if (source.actionRouters) {
           source.actionRouters.forEach((v) => {
+            v.action=(appRootUrl||'')+v.action;
             var button = Router(v);
             button.is = "ct-btn";
             rtn._actionRouters.push(button);
@@ -708,6 +710,7 @@ function loadSearchScreenModel(source, prevParam) {
         else if (source.content && source.content.actionRouters) {
           source.content.actionRouters.forEach((v) => {
             v.actionType = 2;
+            v.action=(appRootUrl||'')+v.action;
             var button = Router(v);
             button.is = "ct-btn";
             rtn._actionRouters.push(button);

package/src/loader/src/SearchTable.js

@@ -3,11 +3,11 @@ import common from '../../utils/common';
 import request from '../../utils/request';
 import Router from './Router';
 
-function loadSearchTableApi(action, callBack, searchModel, flagSearch, defaultSearchData, postThenHandler, searchAction) {
+function loadSearchTableApi(action, callBack, searchModel, flagSearch, defaultSearchData, postThenHandler, searchAction, appRootUrl) {
     var apiData = searchModel?.searchData ? searchModel.searchData : {};
 
     request.postHandler(common.globalUri(), {
-        action: action,
+        action: (appRootUrl||'') + action,
         para: {
             searchFields: apiData,
             pageAttribute: {
@@ -18,7 +18,7 @@ function loadSearchTableApi(action, callBack, searchModel, flagSearch, defaultSe
     }).then(
         function (response) {
             if (response.rtnCode === Enum.ReturnCode.Successful) {
-                let rtn = loadSearchTableModel(response, searchModel, defaultSearchData, action, searchAction);
+                let rtn = loadSearchTableModel(response, searchModel, defaultSearchData, action, searchAction, appRootUrl);
                 if (callBack) {
                     callBack(rtn);
                 }
@@ -31,7 +31,7 @@ function loadSearchTableApi(action, callBack, searchModel, flagSearch, defaultSe
         }
     );
 }
-function loadSearchTableModel(source, searchModel, defaultSearchData, action, searchAction) {
+function loadSearchTableModel(source, searchModel, defaultSearchData, action, searchAction, appRootUrl) {
     let rtn = {
         formData: {
             formTable: null,
@@ -49,6 +49,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
             },
 
         },
+        appRootUrl: appRootUrl||'',
         selectAll: false,//全选是否选中
         selectIndex: 0,//选中行的索引
         pageIndex: 1,//当前显示页数
@@ -279,7 +280,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         },
         //取参数值的 Action名称
         get parameterAction() {
-            return source.content.parameterAction;
+            return (appRootUrl||'') + source.content.parameterAction;
         },
         get multiRowSpan() {
             if (this.isMergeTitle) {
@@ -315,6 +316,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                 if (source.content.toolButtons) {
 
                     source.content.toolButtons.forEach((v) => {
+                       v.action = (appRootUrl||'') + v.action;
                         var button = Router(v);
                         button.is = "ct-button";
                         button.attrs = {
@@ -337,6 +339,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                 rtn._actionRouter = [];
                 if (source.content.actionRouters) {
                     source.content.actionRouters.forEach((v) => {
+                        v.action = (appRootUrl||'') + v.action;
                         var router = Router(v);
                         router.is = "ct-button";
                         rtn._actionRouter.push(router);
@@ -740,6 +743,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         },
         //初始化button路由
         getRtnRouter(v) {
+            v.action = (appRootUrl||'') + v.action;
             var button = Router(v);
             button.is = "ct-btn";
             return button;
@@ -781,7 +785,7 @@ function apiData(model, callback) {
     model.isLoading = true;
     var newSearchModel = model.getSearchData();
     request.postHandler(common.globalUri(), {
-        action: model.searchAction,
+        action: model.appRootUrl + model.searchAction,
         para: {
             searchFields: newSearchModel ? newSearchModel : {},
             pageAttribute: model.pageData,
@@ -841,6 +845,7 @@ function apiData(model, callback) {
                         model._buttons = [];
                         model._actions = [];
                         response.content.toolButtons.forEach((v) => {
+                            v.action = model.appRootUrl + v.action;
                             var button = Router(v);
                             button.is = "ct-button";
                             button.attrs = {
@@ -1008,7 +1013,7 @@ function getCurrentRowApiData(model, callback, rtnData, router) {
         });
     }
     request.postHandler(common.globalUri(), {
-        action: model.searchAction,
+        action: model.appRootUrl+model.searchAction,
         para: {
             searchFields: searchFields,
             pageAttribute: {
@@ -1070,6 +1075,7 @@ function getCurrentRowApiData(model, callback, rtnData, router) {
                     if (response.content.toolButtons) {
                         model._buttons = [];
                         response.content.toolButtons.forEach((v) => {
+                            v.action = model.appRootUrl + v.action;
                             var button = Router(v);
                             button.is = "ct-button";
                             button.attrs = {

package/src/main.js

@@ -22,10 +22,10 @@ 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:7080/ibs-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.88.22.13:6060/smartclass-api/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
 
@@ -67,7 +67,7 @@ app.use(centaline, {
             return {
                 
              //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyaWQiOiIyNTEyMTUxNzQyMTg5QzI4MTgwRDkxRTk0MDhEOTA0QSIsImxvZ2luX3VzZXJfa2V5IjoiN2MzYzNjNjAtNWVjMy00MzdkLWExMDYtOWYxZTMwYjU0Mjg2In0.daG9mS98Gg8KmHSUjYHktMcO2Jk7SVtCcqm2sRB0I8Y2N0TuonIrVUDcHdNdDiuD3v6qO_f010tQWlBsAQ1dqg',
-              authobject: '{token:"T5067-2042438796758376448",platform:"WEB"}',
+              authobject: '{token:"1-83322f82-1cd6-47bb-89db-7cad6d97eb5d"}',
               //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/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":"save","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="'/PropertyComprehensiveQueryList/getLayoutOfSearch'"
+      <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
       
-    :searchDataApi="'/PropertyComprehensiveQueryList/getListOfSearchModel'"></ct-searchlist>
+    :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->