centaline-data-driven 1.1.37 → 1.1.41

package/build/centaline/centaline.path.js

@@ -35,6 +35,7 @@ const paths = {
     "dynamicDetail": "./src/centaline/dynamicDetail/index.js",//详情页控件
     "dynamicTree": "./src/centaline/dynamicTree/index.js",//树组件
     "dynamicSensitiveEye": "./src/centaline/dynamicSensitiveEye/index.js",////敏感数据小眼睛控
+    "dynamicCb": "./src/centaline/dynamicCb/index.js",////复选框
     "progress": "./src/centaline/progress/index.js",//进度条
   },
   "plugs": {

package/package.json

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

package/src/Form.vue

@@ -1,11 +1,12 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--:api="'FormSample/formdata'"-->
     <!--<ct-form :source="formdata.content"></ct-form>-->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
+    <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -15,9 +16,10 @@
     name: 'App',
     data() {
       return {
-        apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
+        // apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {SN: "13557_132", UserID: "wuhan3"},
+        apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
       }
     },
     methods: {

package/src/centaline/common/index.js

@@ -650,6 +650,7 @@ const common = {
       reg = /^(\-)?\d*$/;
     }
     else{
+      if(dc===-1)dc=12;
       reg = new RegExp("^(\\-)?\\d*[.]{0,1}(\\d{1," + dc + "})?$");
     }
     if (value === '' || reg.test(value)) {

package/src/centaline/dynamicCb/index.js

@@ -0,0 +1,11 @@
+import dynamicCb from './src/dynamicCb'
+
+dynamicCb.install = function (Vue, options) {
+  Vue.component(dynamicCb.name, dynamicCb);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicCb);
+}
+
+export default dynamicCb;

package/src/centaline/dynamicCb/src/dynamicCb.vue

@@ -0,0 +1,72 @@
+<template>
+  <div class="field-top">
+    <div v-if="model !== null" class="ct-checkbox">
+      <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
+          {{model.label}}
+        </div>
+        <div class="ct-radios">
+          <el-checkbox v-model="model.value" :disabled="model.lock" @change="changeCheckBoxHandler"></el-checkbox>
+        </div>
+      </div>
+      <transition name="el-fade-in">
+        <span v-show="!valid" class="errorMessage">
+          {{validMessage}}
+        </span>
+      </transition>
+    </div>
+  </div>
+</template>
+<script>
+  import dynamicElement from '../../mixins/dynamicElement';
+  export default {
+    name: 'ct-cb',
+    mixins: [dynamicElement],
+    props: {
+      vmodel: Object,
+      api: String
+    },
+    data() {
+      return {
+
+      };
+    },
+    mounted() {
+      var self = this;
+      this.$nextTick(function () {
+        
+        if (self.vmodel) {
+          self.load(self.vmodel);
+          self.$emit('loaded');
+        }
+        else if (typeof self.source !== 'undefined') {
+          self.loaderObj.Seg(self.source, (data) => {
+            self.load(data);
+          });
+        }
+      });
+    },
+    methods: {
+      load(data) {
+        this.model = data;
+      },
+      changeCheckBoxHandler: function (event) {
+        this.changeHandler();
+      }
+    }
+  }
+</script>
+<style>
+   .ct-checkbox {
+    font-size: 12px;
+    width: 100%;
+  }
+  .ct-checkbox .ct-radios {
+    color: #606266;
+    /* border-radius: 4px; */
+    /* border: 1px solid #dcdfe6; */
+    padding-left: 15px;
+    padding-bottom: 3px;
+    padding-top: 3px;
+  }
+</style>

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -68,7 +68,7 @@
         this.inputHandler(this.model.checkedItemArr);
         this.changeHandler(this.model.checkedItemArr);
         this.model.updateCode1();
-
+        if(this.model.autoSearch) this.$emit('click');
       }
     }
   }

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

@@ -761,8 +761,11 @@
           }
           //执行客户端脚本
           else {
-            let parm={submitData:submitData,field:field}
-            self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
+            // let parm={submitData:submitData,field:field}
+            // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
+            let title=field.pageTitle==undefined ?field.label:field.pageTitle;
+            var fun =self.$common.getDataDrivenOpts().handler[action];
+            fun(submitData,title,self.model);
             // var fun = self.model.scripts.formData[action];
             // fun(submitData,field);
           }

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -89,7 +89,11 @@
         if (self.LastClickNode != data) {
           self.LastClickNode = data;
           var rowRouter = self.model.rowSelectRouter;
-          this.model.getCurrentRowApiData(rowRouter.action, data, function (rowdata) {
+          var SearchData = {};
+          rowRouter.submitFormField.forEach(v => {
+            SearchData[v] = data[v];
+          })
+          this.model.getCurrentRowApiData(rowRouter.action, SearchData, function (rowdata) {
             var newdata = self.$common.deepClone(data);
             newdata.rowRouter = rowdata
             self.$emit('loaded', newdata);

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -27,17 +27,14 @@
     props: {
       vmodel: Object,
       searchConditionApi: String,
-      searchDataApi: String,
-      apiParam: {
-        type: Object,
-        default: () => { }
-      }
+      searchDataApi: String
     },
     data() {
       return {
         searchTableConditionApi: "",
         searchTableDataApi: "",
-        isShowSearchlist: false
+        isShowSearchlist: false,
+        apiParam: {}
       };
     },
     methods: {
@@ -51,7 +48,8 @@
           delete defaultPara.rowRouter;
           delete defaultPara.getLayoutOfSearch;
           delete defaultPara.getList;
-          self.apiParam.defaultPara = defaultPara;
+
+          self.apiParam = defaultPara;
           self.$nextTick(() => {
             self.isShowSearchlist = true;
           });
@@ -69,8 +67,8 @@
   #app-Tree .el-main {
     padding: 0 0px 0px 10px;
   }
-    
-  #app-Tree .el-main  .ct-table-content {
-    padding: 0 0 0 15px;
-  }
+
+    #app-Tree .el-main .ct-table-content {
+      padding: 0 0 0 15px;
+    }
 </style>

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

@@ -0,0 +1,27 @@
+import base from '../../index';
+import Base from './Base';
+import valid from '../../../validate/index';
+import Axios from 'axios';
+const Cb = function (source, callBack) {
+  var self = this;
+  var init = function (data) {
+    var rtn = {
+      get value() {
+        return data.code1 === "1";
+      },
+      set value(v) {
+        if (v) {
+          data.code1 = "1";
+        }
+        else {
+          data.code1 = "0";
+        }
+      }
+    };
+    rtn = base.copy(Base(data), rtn);
+    return rtn;
+  }
+
+  return init(source);
+}
+export default Cb;

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

@@ -2,14 +2,11 @@ import base from '../../index';
 import Base from './Base';
 import valid from '../../../validate/index';
 import Axios from 'axios';
-import Vue from 'vue';
 const box = function (source, callBack) {
   var self = this;
   var init = function (data) {
     var rtn = {
-
-      get clearable() {
-        
+      get clearable() {        
         if (typeof source.clear === 'undefined'&&!source.locked) {
           return true;
         }
@@ -22,11 +19,16 @@ const box = function (source, callBack) {
       },
       set clearable(v) {
         source.clear = v;
-      },
-      
+      },      
       get decimals() {
         return data.decimals1;
-      }
+      },
+      get value() {
+        return source.code1;
+      },
+      set value(v) {
+        source.code1 = v;
+      },
     };
     rtn = base.copy(Base(data), rtn);
     rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -16,7 +16,13 @@ const Iti = function (source) {
     },
     set clearable(v) {
       source.clear = v;
-    },    
+    }, 
+    get value() {
+      return source.code1;
+    },
+    set value(v) {
+      source.code1 = v;
+    },   
     get value1() {
       return source.code2||'';
     },

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

@@ -101,12 +101,9 @@ const tree = function (source, callBack, searchModel, defaultSearchData, resolve
       getCurrentRowApiData(api, searchModel, callback) {
         var self = this;
         var para = searchModel ? searchModel : {};
-
         Vue.prototype.$api.postHandler(common.globalUri(), {
           action: api,
-          para: {
-            paramDataQuery: para
-          }
+          para: para
         })
           .then(function (response) {
             if (response.rtnCode === Enum.ReturnCode.Successful) {

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

@@ -210,7 +210,11 @@ const Enum = {
     /// <summary>
     /// 敏感数据小眼睛控件
     /// </summary>
-    SensitiveEye : 41,
+    SensitiveEye: 41,
+    /// <summary>
+    /// 复选
+    /// </summary>
+    CheckBox: 43,
   },
 
   //返回状态码

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

@@ -28,6 +28,7 @@ import File from '../File';
 import HyperLink from '../HyperLink';
 import PlaceHolder from '../PlaceHolder';
 import SensitiveEye from '../SensitiveEye';
+import Cb from '../Cb';
 
 const LibFunction = {
   install(Vue) {
@@ -294,6 +295,10 @@ const LibFunction = {
         item = SensitiveEye(field);
         item.is = 'ct-sensitiveeye';
         break;
+      case Enum.ControlType.CheckBox://复选框
+        item = Cb(field);
+        item.is = 'ct-cb';
+        break;
       default:
         item = L(field);
         item.is = 'ct-labelText';

package/src/centaline/validate/index.js

@@ -69,6 +69,7 @@ const actions = {
       reg = /^(\-)?\d*$/;
     }
     else{
+      if(dc===-1)dc=12;
       reg = new RegExp("^(\\-)?\\d*[.]{0,1}(\\d{1," + dc + "})?$");
     }
     if (v.value === '') {
@@ -102,6 +103,7 @@ const actions = {
       reg = /^(\-)?\d*$/;
     }
     else{
+      if(dc===-1)dc=12;
       reg = new RegExp("^(\\-)?\\d*[.]{0,1}(\\d{1," + dc + "})?$");
     }    
     if (v.value === '' && v.value1 === '') {

package/src/main.js

@@ -12,7 +12,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: process.env.BASE_API,
+  baseUrl: "http://10.88.22.67:8080/v1/form/router",
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -35,6 +35,8 @@ Vue.use(centaline, {
       return {
         oldToken: '2db49cf6-0026-428b-9167-4273376a076f',
         estateId: '20210729104021C49F04B55C50F6AF58',
+        originalRequestURL: 'http://10.88.22.67:8080',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作