centaline-data-driven 1.1.18 → 1.1.23

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

@@ -6,9 +6,9 @@ import Vue from 'vue';
 import common from '../../../common';
 
 const Dtd = function (source, dateType) {
-  var self = this;
-  if (!dateType) {
-    dateType = "date";
+  var self = this;
+  if (!dateType) {
+    dateType = "date";
   }
   var init = function (data) {
     var rtn = {
@@ -16,9 +16,9 @@ const Dtd = function (source, dateType) {
         if (typeof source.valueFormat !== 'undefined') {
           return source.valueFormat;
         }
-        else {
+        else {
           if (dateType === "datetime") {
-            return 'yyyy-MM-dd HH:mm:ss'
+            return 'yyyy-MM-dd HH:mm:ss'
           }
           return 'yyyy-MM-dd'
         }
@@ -42,21 +42,21 @@ const Dtd = function (source, dateType) {
       get value() {
         return source.code1;
       },
-      set value(v) {
-        if (!v) {
-          source.code1 = "";
-          return;
-        }
+      set value(v) {
+        if (!v) {
+          source.code1 = "";
+          return;
+        }
         source.code1 = common.formatDate(v, rtn.valueFormat);
       },
       get value1() {
         return source.code2;
       },
-      set value1(v) {
-        if (!v) {
-          source.code2 = "";
-          return;
-        }
+      set value1(v) {
+        if (!v) {
+          source.code2 = "";
+          return;
+        }
         source.code2 = common.formatDate(v, rtn.valueFormat);
       },
       get id1() {
@@ -68,7 +68,7 @@ const Dtd = function (source, dateType) {
         source.code1 = this.formatValue[0];
         source.code2 = this.formatValue[1];
       },
-      getFormObj() {
+      getFormObj() {
         var rtnFormObj = {};
         Object.defineProperty(rtnFormObj, source.fieldName1, {
           get: function () {
@@ -89,8 +89,8 @@ const Dtd = function (source, dateType) {
       attrs: {
         type: dateType,
         'unlink-panels': true,
-        get format() {
-          return rtn.valueFormat;
+        get format() {
+          return rtn.valueFormat;
         },
         //'value-format': 'yyyy-MM-dd',
         align: 'left'

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

@@ -5,9 +5,9 @@ import Axios from 'axios';
 import Vue from 'vue';
 
 const Dtd = function (source, dateType) {
-  var self = this;
-  if (!dateType) {
-    dateType = "daterange";
+  var self = this;
+  if (!dateType) {
+    dateType = "daterange";
   }
   var init = function (data) {
     var rtn = {
@@ -37,11 +37,11 @@ const Dtd = function (source, dateType) {
       get placeholder1() {
         return source.placeholder2 || '';
       },
-      setFormatValue(v1) {//上面的set formatValue(v1)无法自动触发(无法监听数组)
-        let dateFormat = "yyyy-MM-dd";
-        if (dateType === "datetimerange") {
-          dateFormat = 'yyyy-MM-dd HH:mm:ss';
-        }
+      setFormatValue(v1) {//上面的set formatValue(v1)无法自动触发(无法监听数组)
+        let dateFormat = "yyyy-MM-dd";
+        if (dateType === "datetimerange") {
+          dateFormat = 'yyyy-MM-dd HH:mm:ss';
+        }
 
         if (v1 && v1.length > 0) {
           source.code1 = v1[0] && v1[0] instanceof Date ? Vue.prototype.$common.formatDate(v1[0], dateFormat) : "";

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

@@ -237,7 +237,7 @@ const box = function (source, fileSourceList, router, optionApi) {
           Vue.prototype.$message.error(res.rtnMsg);
         }
       },
-      deleteFile(file, forceDelete) {
+      deleteFile(file, forceDelete) {
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {
             if (forceDelete) {

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

@@ -19,7 +19,7 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
       },
       set title(v) {
         source.formTitle = v;
-      },
+      },
       isChanged: false,
       get isHorizontalLayout() {
         return source.layoutOrientation === Enum.Orientation.Horizontal
@@ -51,12 +51,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
         rtn._fields = [];
         for (var key in source.fields) {
           let value = source.fields[key];
-
-          let showLabel = true;
-          let isList = false;
-          if (isFormList) {
-            showLabel = false;
-            isList = true;
+
+          let showLabel = true;
+          let isList = false;
+          if (isFormList) {
+            showLabel = false;
+            isList = true;
           }
           let item = LibFunction.GetControl(value, source, showLabel, isList);
 
@@ -242,6 +242,10 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             }
             //源数据
             else {
+              if (rowNum === null && listData.currentRowIndex) {
+                rowNum = listData.currentRowIndex;
+              }
+
               if (rowNum === 0 || (rowNum && fiedlId)) {
                 let fields = listData.rows[rowNum].field;
                 field = fields.find((v) => {

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

@@ -103,6 +103,7 @@ const FormList = function (source, master) {
     },
     _rows:null,
     get rows() {
+     
       if (this._rows) {
         return this._rows;
       }
@@ -158,6 +159,7 @@ const FormList = function (source, master) {
     currentRow: null,
     _tableData: undefined,
     get tableData() {
+      debugger
       if (this._tableData) {
         return this._tableData;
       }

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

@@ -100,11 +100,11 @@ const SearchScreen = function (source, callBack, screenPara) {
         rtnscreens = this.initScreen(screens);
         this._highScreen = rtnscreens;
         return rtnscreens;
-      },
-      setBtnLoading(loading) {
-        this.btnScreen.forEach(btn => {
-          btn.disabled = loading;
-        });
+      },
+      setBtnLoading(loading) {
+        this.btnScreen.forEach(btn => {
+          btn.disabled = loading;
+        });
       },
       get searchData() {
         var rtn = {

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -525,8 +525,16 @@ const Enum = {
      * Horizontal 水平方向布局
      */
     Horizontal: 2
-  }
+  },
 
+  MessageAlertStyle:{
+    //默认        
+    Default : 0,
+    //吐司
+    Toast : 10,
+    //窗口
+    Dialog : 20,
+  },
 
 };
 

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -233,7 +233,18 @@ const LibFunction = {
         var router = source.actionRouters.find((v1) => {
           return v1.key === field.fieldName1;
         });
-        item = File(field, source.medias, router, source.parameterAction);
+        var files = [];
+        source.medias.forEach((v, index) => {
+          if (v.GroupID) {
+            if (v.GroupID == field.fieldName1) {
+              files.push(v);
+            }
+          }
+          else {
+            files.push(v);
+          }
+        })
+        item = File(field, files, router, source.parameterAction);
         item.is = 'ct-file';
         break;
       case Enum.ControlType.PasswordTextBox://密码

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

@@ -22,7 +22,11 @@ const loader = {
   Form: require("./ctl/Form.js").default,
   Router: require("./ctl/Router.js").default,
   Tabs: require("./ctl/Tabs.js").default,
-  ComboBoxWithTextBox: require("./ctl/ComboBoxWithTextBox.js").default
+  ComboBoxWithTextBox: require("./ctl/ComboBoxWithTextBox.js").default,
+  Checkbox: require("./ctl/Checkbox.js").default,
+  InputNumber: require("./ctl/InputNumber.js").default,
+  L: require("./ctl/L.js").default,
+  File: require("./ctl/File.js").default,
 };
 
 export default loader;

package/src/centaline/mixins/dynamicElement.js

@@ -17,7 +17,7 @@ export default {
       inputOld: '',
       changeOld: '',
       inputOld1: '',
-      changeOld1: '',
+      changeOld1: '',
       inputTime: null
     };
   },
@@ -28,8 +28,8 @@ export default {
     let self = this;
     this.$nextTick(() => {
       if (this.model) {
-        this.model.self = self;
-      }
+        this.model.self = self;
+      }
 
       if (this.model && typeof this.model.value !== 'undefined') {
         if (typeof this.model.value !== 'undefined') {
@@ -52,8 +52,8 @@ export default {
     inputHandler(e) {
       var self = this;
       setTimeout(() => {
-        self.valid = true;
-        self.inputTime = (new Date()).getTime();
+        self.valid = true;
+        self.inputTime = (new Date()).getTime();
 
         //通用校验
         if (this.model.validating) {
@@ -62,8 +62,8 @@ export default {
           if (!self.valid) {
             self.validMessage = validtemp.message;
             return false;
-          }
-        }
+          }
+        }
 
         if (typeof self.model.value !== 'undefined') {
           self.inputOld = self.model.value;
@@ -86,34 +86,34 @@ export default {
      */
     changeHandler(e) {
       var self = this;
-      setTimeout(() => {
-        //通用校验
-        var time = (new Date()).getTime();
-        if (time > (self.inputTime + 500) || self.valid) {
-          if (this.model.validating) {
+      setTimeout(() => {
+        //通用校验
+        var time = (new Date()).getTime();
+        if (time > (self.inputTime + 500) || self.valid) {
+          if (this.model.validating) {
             let validtemp = this.model.validating('change', self.inputOld, self.inputOld1);
             self.valid = validtemp.valid;
             if (!self.valid) {
               self.validMessage = validtemp.message;
               return false;
-            }
-          }
-
-          //组件个性化校验
-          if ("undefined" !== typeof this.selfValidExcute) {
-            if (!this.selfValidExcute("change")) {
-              self.valid = false;
-              //return false;
-            }
-          }
-        }
+            }
+          }
+
+          //组件个性化校验
+          if ("undefined" !== typeof this.selfValidExcute) {
+            if (!this.selfValidExcute("change")) {
+              self.valid = false;
+              //return false;
+            }
+          }
+        }
 
         if (typeof self.model.value !== 'undefined') {
           self.changeOld = self.model.value;
         }
         if (typeof self.model.value1 !== 'undefined') {
           self.changeOld1 = self.model.value1;
-        }
+        }
 
         self.$emit('change', e);
       }, 1);
@@ -128,21 +128,21 @@ export default {
       var self = this;
 
       //通用校验
-      if (typeof this.model.validating === "function") {
+      if (typeof this.model.validating === "function") {
         let validtemp = this.model.validating();
         self.valid = validtemp.valid;
         if (!self.valid) {
           self.validMessage = validtemp.message;
           return false;
-        }
-      }
-
-      //组件个性化校验 优化 todo
-      if ("undefined" !== typeof this.selfValidExcute) {
-        if (!this.selfValidExcute("valid")) {
-          return false;
-        }
-      }
+        }
+      }
+
+      //组件个性化校验 优化 todo
+      if ("undefined" !== typeof this.selfValidExcute) {
+        if (!this.selfValidExcute("valid")) {
+          return false;
+        }
+      }
 
       self.valid = true;
       return true;

package/src/centaline/progress/src/progress.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ct-progress">
     <div>
-      <el-progress :text-inside="true" :stroke-width="18" :percentage="percentage"></el-progress>
+      <el-progress :text-inside="true" :stroke-width="18" :percentage="percentage"></el-progress>
       <span>{{message}}</span>
     </div>
   </div>
@@ -11,58 +11,58 @@
   export default {
     name: 'ct-progress',
     props: {
-      progressAction: String,
+      progressAction: String,
       progressKey: String,
     },
     data() {
       return {
-        message: '',
-        percentage: 0,
+        message: '',
+        percentage: 0,
         isDestroy: false,
       };
     },
     methods: {
       load() {
       },
-      getApiData() {
-        const self = this;
-        let params = {
-          action: this.progressAction,
-          para: {
-            key: this.progressKey
-          }
-        }
-
-        if (self.isDestroy) {
-          return;
-        }
-
-        this.$api.postHandler(this.$common.globalUri(), params, null).then((response) => {
-          const data = response.content;
-          if (data && data.rtnMsg) {
-            self.message = data.rtnMsg;
-          }
-          if (response.rtnCode === 200) {
-            this.percentage = data.percentage;
-            if (data.flagFinished) {
-              window.open(data.content, "_blank");
-              setTimeout(() => { self.$emit('finished'); }, 800);
-            }
-            else {
-              setTimeout(() => { self.getApiData() }, 1000);
+      getApiData() {
+        const self = this;
+        let params = {
+          action: this.progressAction,
+          para: {
+            key: this.progressKey
+          }
+        }
+
+        if (self.isDestroy) {
+          return;
+        }
+
+        this.$api.postHandler(this.$common.globalUri(), params, null).then((response) => {
+          const data = response.content;
+          if (data && data.rtnMsg) {
+            self.message = data.rtnMsg;
+          }
+          if (response.rtnCode === 200) {
+            this.percentage = data.percentage;
+            if (data.flagFinished) {
+              window.open(data.content, "_blank");
+              setTimeout(() => { self.$emit('finished'); }, 800);
+            }
+            else {
+              setTimeout(() => { self.getApiData() }, 1000);
             }
-          }
-          else {
-            
+          }
+          else {
+            
           }
         });
       }
     },
-    mounted() {
+    mounted() {
       this.getApiData();
-    },
-    beforeDestroy() {
-      this.isDestroy = true;
+    },
+    beforeDestroy() {
+      this.isDestroy = true;
     }
   }
 </script>

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -48,6 +48,7 @@
   }
   .ct-tablecurrencyImg {
     width: 24px;
+    margin-top: 2px;
   }
 
 </style>

package/src/centaline/templates/src/ContractSearch.js

@@ -6,10 +6,10 @@ const loader = {
     this.loadColumns(model.columns);
   },
   loadColumns: function (columns) {
-    columns.forEach((col) => {
+    columns.forEach((col) => {
       switch (col.id) {
         case "ContractFile":
-          col.template = function (row) {
+          col.template = function (row) {
             var rtn = {
               attrs: {
                 get src() {
@@ -26,7 +26,7 @@ const loader = {
           };
           break;
         case "AccountFlow":
-          col.template = function (row) {
+          col.template = function (row) {
             var rtn = {
               attrs: {
                 get src() {
@@ -38,7 +38,7 @@ const loader = {
             return rtn;
           };
           break;
-        case "ReportNo":
+        case "ReportNo":
           col.template = function (row) {
             var rtn = {
               attrs: {

package/src/main.js

@@ -12,8 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: 'http://tjcptest.centaline.com.cn/v1/form/router',
-  zindex: 999,
+  baseUrl: 'http://10.88.23.22:7070/v1/form/router',
+  zindex: 999,
   showRequestErrorMessage: true,
   handler: {
     // 打开tab页
@@ -27,8 +27,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'f6dec7b1-c059-4587-b655-c44c518f449a',
-        estateId: '20210729104021C49F04B55C50F6AF58',
+        oldToken: '50b50be7-3fa8-48c9-9f8c-6dd16032ac5b',
+        estateId: 'f8dab352-5339-4832-897a-c818cd43b964',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQyMjVlZDY0LWE3M2YtNGM5Mi1iMDM5LWY1OTU0Y2UwM2UyNCJ9.x4Q_nTNVya5n-KnOCTkGSWcgaGA0zIEA5B72sxrm3JUQ-IEnouBEavIF2-KKbzYu-VZZtHd35KT_spPUrpZ2rA'
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作