centaline-data-driven-v3 0.0.72 → 0.0.74

package/src/loader/src/FormList.js

@@ -120,6 +120,12 @@ function FormListModel(source, master,actionRouters) {
         get totalCols() {
             return source.totalCols;
         },
+        get tableDisabled() {
+          return source.disabled || master.locked || false;
+        },
+        set tableDisabled(v) {
+          source.disabled = v;
+        },
         //表单表格 选择数据来源的路由
         get selectRouter() {
             if (source.selectRouter) {
@@ -128,7 +134,7 @@ function FormListModel(source, master,actionRouters) {
                 return button;
             }
             return null;
-        },
+        },    
         //表格编辑模式
         get editMode() {
             return source.editMode;
@@ -168,6 +174,57 @@ function FormListModel(source, master,actionRouters) {
                 return rtn._buttons;
             }
         },
+        _buttonsShow: null,
+        get buttonsShow() {
+          if (rtn._buttonsShow !== null) {
+            return rtn._buttonsShow;
+          }
+          else {
+            rtn._buttonsShow = [];
+            if (rtn.buttons) {
+              rtn.buttons.forEach((v) => {
+                if(v.show){
+                  rtn._buttonsShow.push(v);
+                }
+              });
+            }
+            return rtn._buttonsShow;
+          }
+        },
+        _toolButtons: null,
+        get toolButtons() {
+          if (rtn._toolButtons !== null) {
+            return rtn._toolButtons;
+          }
+          else {
+            rtn._toolButtons = [];
+            if (source.toolButtons) {
+              source.toolButtons.forEach((v) => {
+                var button = Router(v);
+                button.is = "ct-button";
+                rtn._toolButtons.push(button);
+              });
+            }
+            return rtn._toolButtons;
+          }
+        },
+        _toolButtonsShow: null,
+        get toolButtonsShow() {
+          if (rtn._toolButtonsShow !== null) {
+            return rtn._toolButtonsShow;
+          }
+          else {
+            rtn._toolButtonsShow = [];
+            if (rtn.toolButtons) {
+              rtn.toolButtons.forEach((v) => {
+                if(v.show){
+                  rtn._toolButtonsShow.push(v);
+                }
+              });
+            }
+            return rtn._toolButtonsShow;
+          }
+        },
         _rows: null,
         get rows() {
             if (this._rows) {

package/src/loader/src/LibFunction.js

@@ -216,9 +216,10 @@ const LibFunction = {
                 item.is = 'ct-customizecolumns'
                 break;
             case Enum.ControlType.Location:
-                item = Location(item);
-                item.is = 'ct-Location';
-                break;
+              moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+              item = Location(item,moreActionRouter);
+              item.is = 'ct-location';
+              break;
             case Enum.ControlType.SearchPage: //搜索列表页面
                 item = {};
                 item.is = 'ct-searchlist';

package/src/loader/src/Location.js

@@ -1,8 +1,8 @@
 import base from '../../loader/index';
 import valid from '../../utils//validate';
-const Location = function (source) {
+const Location = function (source,moreActionRouter) {
     let rtn = {
-        moreActionRouter: source.moreActionRouter,
+        moreActionRouter: moreActionRouter,
         getFormObj() {
             var rtnFormObj = {};
             Object.defineProperty(rtnFormObj, source.fieldName1, {

package/src/main.js

@@ -21,11 +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.88.22.66:6060/onecard-api/",
-
+    //baseUrl: "http://10.1.245.111:38028/",
+    
     flagRouterSelf: true,
     flagApp: false,//是否app端
     zindex: 999,
@@ -64,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:"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"}',
+                //authObject: '{token:"1-a7289bb2-9f1e-4a04-9016-1e555bf39188"}',
+                authObject: '{EmpID:"Token_f5be9890-db08-463b-b6c3-0874f422fac9",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_f5be9890-db08-463b-b6c3-0874f422fac9",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作