centaline-data-driven 1.2.82 → 1.2.83

package/README.md

@@ -128,9 +128,9 @@ execServerScript(action, object, successCallback)
 /**
   * @method
   * @param {string} message 消息文字。
-  * @param {string} options 参数。
-  * @param {boolean} options 是否居中。
-  * @param {number} duration 显示时间, 毫秒。设为 0 则不会自动关闭。
+  * @param {string} type 主题:success/warning/info/error。
+  * @param {boolean} center 是否居中。
+  * @param {number} duration 显示时间,1500毫秒。设为 0 则不会自动关闭。
   * @param {boolean} showClose 是否显示关闭按钮。
   * @desc 消息提示。常用于主动操作后的反馈提示。
   */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.82",
+  "version": "1.2.83",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/finance/collection-money/detail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/example/readDetail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -19,10 +19,6 @@
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
         apiParam:{
 actionType: 2,
-originalTraId: "1527194056950345730",
-pageOnly: true,
-pageStyle: 2,
-pageTitle: "新增代收款"
           }
       }
     },

package/src/centaline/api/index.js

@@ -156,7 +156,7 @@ const api = {
       }
     );
   },
-  postThenHandler: function (response) {
+  postThenHandler: function (response,scripts) {
     var data = response.data;
 
     if (typeof common.getDataDrivenOpts().handler.requestComplete === 'function') {
@@ -165,7 +165,8 @@ const api = {
 
     // 执行js
     if (data.clientActionType === Enum.ClientActionType.ExcuteScript && data.content) {
-      eval(data.content);
+      // eval(data.content);
+      common.excute.call(scripts, data.content);
     }
 
     //关闭tab页
@@ -192,9 +193,6 @@ const api = {
       }
 
       if (data.notification === Enum.ActionType.Export && data.content) {//导出
-        //var fileName = data.content.fieldName1;
-        //var fileContent = window.atob(data.content.code1);
-        //Vue.prototype.$common.saveFile(fileName, fileContent);
         var dialogOption = {
           title: "导出",
           content: [{
@@ -222,14 +220,6 @@ const api = {
         }
         else {
           Vue.prototype.$message.error(response.data.rtnMsg);
-          // Vue.prototype.$message({
-          //   message: response.data.rtnMsg,//消息文字
-          //   dangerouslyUseHTMLString: false,
-          //   type: 'error',//主题:success/warning/info/error
-          //   center: true,//是否居中
-          //   duration: 0, //显示时间, 毫秒。设为 0 则不会自动关闭
-          //   showClose: true,//是否显示关闭按钮
-          // });
         }
       }
       return Promise.reject(response);
@@ -237,22 +227,22 @@ const api = {
     //返回给下一个链式调用
     return Promise.resolve(response.data);
   },
-  postHandler(url, params, formData) {
+  postHandler(url, params, scripts) {
     if(common.flagRouterSelf()){
       url=url+params.action;
       params=params.para;
     }
     return Axios.post(url, params, {
       headers: common.getDataDrivenOpts().handler.getRequestHeaders()
-    }).then(this.postThenHandler).catch((ex) => {
-      console.log(ex);
+    }).then((response) => {
+      return this.postThenHandler(response,scripts);
+    }).catch((ex) => {
       if (ex.message) {
         Vue.prototype.$message.error(ex.message);
       }
       else if (typeof ex.data === "string") {
         Vue.prototype.$message.error(ex.data);
       }
-      //return Promise.reject(ex.data ? ex.data : ex);
       return Promise.resolve(ex.data ? ex.data : ex);//错误处理了，直接返回成功，要判断response.rtnCode=200再处理
     });
   }

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -412,7 +412,7 @@
                   else{
                     self.model.doAction(data);
                   }
-                })
+                },self.model.scripts);
               }
             }
           }
@@ -474,6 +474,14 @@
         self.model.hiddenHandle(field);
         self.model.requiredHandle(field);
         //self.model.validMrf(field);
+
+        if(field.onAfterChanged){
+          var router =self.model.actionRouters.find((v) => {
+            return v.id === field.onAfterChanged;
+          });
+          self.clickHandler(router);
+        }
+
         self.$forceUpdate();
       },
       changeCallBackHandler(field, callBackFunName, callBackPara) {

package/src/centaline/dynamicLayout/src/dynamicLayoutImage.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="model.routerKey">
     <div v-if="model.rightRouter&&model.value!=''" :ref="'router'+forname+forrowindex" :style="model.styleObject">
-      <el-popover class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'"
+      <el-popover class="Stats-popover" :placement="option.placement?option.placement:'left'"
                   v-model="visible" :trigger="option.trigger?option.trigger:''">
         <div style="border-bottom:none">
           <div style="color: #388cd3;text-align: center;">{{message}}</div>

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -24,7 +24,7 @@
         <table border="0" cellpadding="0" cellspacing="0"
                :class="['ct-table',model.attrs.size?'ct-table-'+model.attrs.size:'']">
           <!--表头-->
-          <thead ref="tableHead">
+          <thead ref="tableHead" class="right-no-fixation-th">
             <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr" :key="columnsIndex">
               <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
                 <label class="el-checkbox">

package/src/centaline/loader/src/ctl/Base.js

@@ -281,6 +281,9 @@ const Base = function (source) {
     get decimals() {
       return source.decimals1;
     },
+    get onAfterChanged() {
+      return source.onAfterChanged;
+    },
   };
 
   return rtn;

package/src/centaline/loader/src/ctl/Form.js

@@ -442,24 +442,24 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         },
         //消息提示 type主题:success/warning/info/error。 duration 显示时间, 毫秒。设为 0 则不会自动关闭。 showClose 是否显示关闭按钮。
         message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
-            if (typeof center === 'undefined') {
+          if (typeof center === 'undefined') {
             center = true;
-            }
-            if (typeof duration === 'undefined') {
+          }
+          if (typeof duration === 'undefined') {
             duration = 1500;
-            }
-            if (typeof showClose === 'undefined') {
+          }
+          if (typeof showClose === 'undefined') {
             showClose = false;
-            }
+          }
 
-            Vue.prototype.$message({
+          Vue.prototype.$message({
             message: message,//消息文字
             dangerouslyUseHTMLString: dangerouslyUseHTMLString || false,
             type: type || 'error',//主题:success/warning/info/error
             center: center,//是否居中
             duration: duration, //显示时间, 毫秒。设为 0 则不会自动关闭
             showClose: showClose,//是否显示关闭按钮
-            });
+          });
         },
       },
       getFormObj() {

package/src/centaline/loader/src/ctl/Router.js

@@ -241,9 +241,9 @@ const Router = function (source) {
       }
       return params;
     },
-    doAction(data, callback) {
+    doAction(data, callback,scripts) {
       if (rtn.action) {
-        Vue.prototype.$api.postHandler(common.globalUri(), rtn.getActionPara(data)).then((response) => {
+        Vue.prototype.$api.postHandler(common.globalUri(), rtn.getActionPara(data),scripts).then((response) => {
           callback(response);
         }).catch((ex) => {
           callback(ex);//里面需要有data.rtnCode === 200的处理

package/src/main.js

@@ -12,10 +12,10 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.13:7070/v1/form/router",
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  baseUrl: "http://10.88.22.69:8080/", 
-  flagRouterSelf: true,
+  // baseUrl: "http://10.88.22.69:8080/", 
+  // flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {