centaline-data-driven 1.6.9 → 1.6.11

package/build/centaline/centaline.path.js

@@ -66,7 +66,7 @@ const paths = {
     "dynamicLH": "./src/centaline/dynamicLH/index.js", //html 标签
     "dynamicImage": "./src/centaline/dynamicImage/index.js", //图片
     "dynamicAppContainer": "./src/centaline/dynamicAppContainer/index.js", //
-
+    "dynamicSteps": "./src/centaline/dynamicSteps/index.js", //步骤控件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js", //调用API插件

package/package.json

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

package/release-log.md

@@ -1,3 +1,25 @@
+# v1.6.11
+2024-07-01
+
+优化
+
+步骤控件
+
+表单列表locked没有锁定处理
+
+# v1.6.10
+2024-06-25
+
+优化
+
+数字区间组件新增负值最小值判断
+
+数字区间组件清空时inputOld值设为空
+
+数字中间隐藏显示组件行高不同导致表单换行
+
+表单列表添加工具栏按钮
+
 # v1.6.9
 2024-06-12
 

package/src/Form.vue

@@ -1,7 +1,7 @@
 <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="'/sunteammanage/suncommissionarrivalimport/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/workflowmange/workFlow/getLayoutOfApproval'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          
+          "processName":"深圳中原CCES开票审批流程","curActivityName":"总监审批","procInstID":"15857","sn":"15857_100","actionType":2
         },
         topHeight:10,
       }

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -22,6 +22,7 @@
              :headers="headers"
              :multiple="false"
              :show-file-list="false"
+             :before-upload="handleAvatarBeforeUpload"
              :on-success="handleAvatarSuccess"
              :on-error="handleAvatarError">
     <el-button size="mini" type="primary">{{model.label}}</el-button>
@@ -108,6 +109,7 @@
       rowindex:Number,
       flagAppMode: Boolean,
       actionRouters: Array,
+      parentModel: Object,
     },
     mixins: [dynamicElement],
     data: function () {
@@ -163,6 +165,19 @@
       }
     },
     methods: {
+      handleAvatarBeforeUpload(file) {
+        if(this.parentModel && this.parentModel.is && this.parentModel.is=="ct-form-list-table" && this.parentModel.$self){
+          let submitData = this.parentModel.$self.getFileData(this.vmodel);
+          for (var key in submitData) {
+            if (typeof submitData[key] === "object") {
+              this.uploadData[key] = JSON.stringify(submitData[key]);
+            }
+            else {
+              this.uploadData[key] = submitData[key];
+            }
+          }
+        }
+      },
       handleAvatarSuccess(res) {
         let self = this;
         this.$api.postThenHandler({ data: res}).then(function () {

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

@@ -3,12 +3,21 @@
     <div v-if="model.title" class="list-title">
       <h5>{{model.title}}</h5>
     </div>
-    <div v-else-if="model.create || (model.selectRouter && model.selectRouter.id)" class="list-title"></div>
+    <div v-else-if="model.create || (model.selectRouter && model.selectRouter.id) || model.toolButtonsShow.length>0" class="list-title"></div>
     <div class="list-button">
-      <component v-if="model.selectRouter!==null" :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
-      <el-button v-if="model.create" :disabled="model.disabled" type="success" class="max-btn-add" style="width: auto;" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
-        {{model.createText}}
-      </el-button>
+      <ul>
+        <li v-for="(v,i) in model.toolButtonsShow" >
+          <component :is="v.is" :vmodel="v" :parentModel="model" @click="toolButtonsClick" @importComplete="importComplete" @change="toolButtonsChangeHandler(v,$event)"></component>
+        </li>
+        <li v-if="model.selectRouter!==null">
+          <component :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
+        </li>
+        <li v-if="model.create" >
+          <el-button :disabled="model.disabled" type="success" class="max-btn-add" style="width: auto;" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+            {{model.createText}}
+          </el-button>
+        </li>
+      </ul>
     </div>
 
     <div id="listTable">
@@ -377,6 +386,20 @@
 
         this.$emit('tableButtonClick', button, submitData);
       },
+      toolButtonsClick(field) {
+        this.$emit('tableButtonClick', field, null);
+      },
+      toolButtonsChangeHandler(field) {
+        this.$emit('change', field);
+      },
+      importComplete(res, button) {
+        this.$emit('importComplete', res, button);
+      },
+      getFileData(field) {
+        var submitData = {};
+        submitData = this.parentModel.self.getFileData(field);
+        return submitData;
+      },
       popupSearchListHandle(field) {
         if(field.isSearchPageWithList){
           var self = this;       
@@ -531,4 +554,16 @@
 .el-table .cell {
   text-overflow: clip;
 }
+
+.list-button ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  width: auto;
+}
+.list-button ul li {
+  margin-right: 5px;
+  float: left;
+}
+
 </style>

package/src/centaline/dynamicIti/src/dynamicIti.vue

@@ -94,7 +94,12 @@
         if (this.model.max1 !== "" && parseFloat(this.model.value1) > parseFloat(this.model.max1)) {
           this.model.value1 = this.inputOld1;
         }
-
+        if (this.model.min !== "" && parseFloat(this.model.value) < parseFloat(this.model.min)) {
+          this.model.value = this.inputOld;
+        }
+        if (this.model.min1 !== "" && parseFloat(this.model.value1) < parseFloat(this.model.min1)) {
+          this.model.value1 = this.inputOld1;
+        }
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);//todo input事件里要不要加这个事件
       },
@@ -128,6 +133,8 @@
       },
       clearClickHandle: function (event,id) {
         this.model.reset();
+        this.inputOld='';
+        this.inputOld1='';
         this.isShowClear(id);
       },
       mouseOverHandle: function (id) {

package/src/centaline/dynamicSensitiveEye/src/dynamicSensitiveEye.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="field-top">
-    <div v-if="model !== null" class="ct-text ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
+  <div class="field-top el-text-eye">
+    <div v-if="model !== null" class="ct-text ct-flex-div el-text-lineHeight" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>
@@ -63,6 +63,15 @@
   .eyelabel {
     min-width:80px;
   }
+  .el-text-lineHeight{
+    line-height: 26px;
+    display: inline-flex;
+  }
+  .el-text-eye{
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+  }
   .el-icon-eye:before {
     background: url("../../../assets/icon-eye.png") no-repeat;
     content: '';
@@ -71,5 +80,6 @@
     height: 16px;
     font-size: 16px;
     background-size: 16px;
+    margin-bottom: -3px;
   }
 </style>

package/src/centaline/dynamicSteps/index.js

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

package/src/centaline/dynamicSteps/src/dynamicSteps.vue

@@ -0,0 +1,63 @@
+<template>
+  <div class="field-top">
+    <div v-if="model !== null" class="ccai ct-Steps">
+      <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']" style="display: inline-block;">
+        <div v-if="model.showLabel && model.label" :class="[model.labelClass]" style="text-align: left;padding-bottom: 5px;color: #303133;">
+          <h5>{{model.label}}</h5>
+        </div>
+        <div>
+          <el-steps :space="model.code2.space" :direction="model.code2.direction" :active="model.code2.active" :simple="model.code2.simple"
+          :process-status="model.code2.processStatus" :finish-status="model.code2.finishStatus" :align-center="model.code2.alignCenter">
+            <el-step v-for="(step, index) in model.code1" :key="index" :title="step.title" :icon="step.icon">
+              <div slot="description" v-html="step.description">
+              </div>
+            </el-step>            
+          </el-steps>
+        </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-Steps',
+    mixins: [dynamicElement],
+    props: {
+      vmodel: Object,
+      api: String
+    },
+    data() {
+      return {
+      };
+    },
+    mounted() {
+      var self = this;
+      this.$nextTick(function () {        
+        if (self.vmodel) {
+          self.load(self.vmodel);
+        }
+        else if (typeof self.source !== 'undefined') {
+          self.loaderObj.Steps(self.source, (data) => {
+            self.load(data);
+          });
+        }
+      });
+    },
+    methods: {
+      load(data) {
+        this.model = data;
+      },
+    }
+  }
+</script>
+<style>
+  .ct-Steps {
+    width: 100%;
+  }
+</style>

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

@@ -90,7 +90,7 @@ const FormList = function (source, master) {
       source.disabled = v;
     },
     get tableDisabled() {
-      return source.disabled || false;
+      return source.disabled || master.locked || false;
     },
     getFormObj() {
       let rtnFormArr = [];
@@ -148,6 +148,40 @@ const FormList = function (source, master) {
         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-btn";
+            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/centaline/loader/src/ctl/Steps.js

@@ -0,0 +1,56 @@
+import base from '../../index';
+import Base from './Base';
+
+const Steps = function (source) {
+  var init = function (data) {
+    var rtn = {
+      modelSteps:{
+        space:'',
+        direction:'horizontal',
+        active:0,
+        processStatus:'process',
+        finishStatus:'finish',
+        alignCenter:false,
+        simple:false,
+      },
+      listModelStep:[],
+      get code1() {
+        if (data.code1){
+          if(Object.prototype.toString.call(data.code1) === "[object String]"){
+            rtn.listModelStep = JSON.parse(data.code1);
+          }
+          else{
+            rtn.listModelStep = data.code1;
+          }
+        }
+        return rtn.listModelStep;
+      },
+      get code2() {
+        let tmpV=null;
+        if (data.code2){
+          if(Object.prototype.toString.call(data.code2) === "[object String]"){
+            tmpV = JSON.parse(data.code2);
+          }
+          else{
+            tmpV = data.code2;
+          }
+        }
+        if(tmpV){
+          if(tmpV.space)rtn.modelSteps.space=tmpV.space;
+          if(tmpV.direction)rtn.modelSteps.direction=tmpV.direction;
+          rtn.modelSteps.active=Number(tmpV.active);
+          if(tmpV.processStatus)rtn.modelSteps.processStatus=tmpV.processStatus;
+          if(tmpV.finishStatus)rtn.modelSteps.finishStatus=tmpV.finishStatus;
+          if(tmpV.alignCenter)rtn.modelSteps.alignCenter=tmpV.alignCenter;
+          if(tmpV.simple)rtn.modelSteps.simple=tmpV.simple;
+        }
+        return rtn.modelSteps;
+      },
+    };
+    rtn = base.copy(Base(data), rtn);
+    return rtn;
+  }
+
+  return init(source);
+}
+export default Steps;

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

@@ -281,6 +281,11 @@ const Enum = {
     /// </summary>
     Location: 56,
 
+    /// <summary>
+    ///  步骤控件
+    /// </summary>
+    Steps: 57,
+
   },
 
   //返回状态码

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

@@ -39,6 +39,7 @@ import Container from '../Container';
 import Contact from '../Contact';
 import LH from '../LH';
 import Image from '../Image';
+import Steps from '../Steps';
 
 const LibFunction = {
   install(Vue) {},
@@ -389,6 +390,10 @@ const LibFunction = {
         item = DragSort(field);
         item.is = 'ct-dragSort';
         break;
+      case Enum.ControlType.Steps: //步骤控件
+        item = Steps(field);
+        item.is = 'ct-Steps';
+        break;
       default:
         item = L(field);
         item.is = 'ct-labelText';
@@ -429,6 +434,7 @@ const LibFunction = {
           return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine || field.controlType === Enum.ControlType.Repeat
             || field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File 
             || field.controlType === Enum.ControlType.SliceUpload || field.controlType === Enum.ControlType.PhoneDial 
+            || field.controlType === Enum.ControlType.Steps 
             || field.controlType === Enum.ControlType.SearchPage;
         },
         showLabel: showLabel

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

@@ -47,6 +47,7 @@ const loader = {
   LH: require("./ctl/LH.js").default,
   Image: require("./ctl/Image.js").default,
   AppContainer: require("./ctl/AppContainer.js").default,
+  Steps: require("./ctl/Steps.js").default,
 };
 
 export default loader;

package/src/main.js

@@ -19,11 +19,11 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:6060/onecard-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
-  // baseUrl: "http://10.25.10.63:9999/service-api/",
+  baseUrl: "http://10.25.10.63:9999/service-api/",
   // baseUrl: "http://10.25.10.69:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  baseUrl: "http://10.88.22.46:9999/service-api/",
+  // baseUrl: "http://10.88.22.46:9999/service-api/",
   // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:31574/service-api/",
   // baseUrl: "https://tjcptest.centaline.com.cn/", 
@@ -61,11 +61,11 @@ Vue.use(centaline, {
         // authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksKAjEMQO_StYEkTZp2dq3TbjzE0JERxpX4AUW8u4qHcPd4m_ee7nKb3eDYxio1EJRKHoTFf8gzIKqOJbdajKfUssYRBZhTAWnWICbzoJR8xhhLLTLFLRIjE-g2G4hlhawtga9BLKKNWNht3HI_uYGMlFkl8cat_foT5BN-xe2ynHfL4x9zx-v6yRKbCR4QYp87SEeFzr1D2Hfbk4ZwQHOvNwAAAP__.WXDbBaPltpYZXolspry93UzYBfcZrKEmjpvrgrVTWFM"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D","estDeptPath":"009.001.001"}',
+        EstateInfo: '{"estateId":"20191111150458268D9815816AA4E11A","estateName":"%E5%BD%AD%E4%BF%8A%E6%9D%B0%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98","estDeptPath":"009.001.001"}',
         estateId: '',
 
-        authObject: '{"currentEstate":{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D","estDeptPath":"009.001.001"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"Typw5","time":1716775934315,"sign":"a3cb02a3fc6178350dbe5680579ef127","systemSource":"CCESU","empNo":"csgl2","empId":"202110201430497BB5FE89123A054CCA"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjgwOGVlMmZjLTA2ZDMtNDVmYy05NjJkLWY0ODM5MDQyYzk4ZiJ9.55wMFYRikPhYq-qfQmyliambjFkMtVX4b5wuO2zuCbPMhsDBcinq3Jg58dH4agJLKwim3UUd0-XfEpaEaTORLw',
+        authObject: '{"currentEstate":{"estateId":"20230816143513168CD66AB41E271F67","estateName":"%E4%B8%AD%E5%BB%BA%E5%A4%A7%E5%85%AC%E9%A6%86","estDeptPath":"001.007.001"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"93064b1c23ff74f05770bc9041dce8a0","token":"","random":"9dBswG","time":1719557794814,"sign":"074cc558ae88321e4d2a5757a636af46","systemSource":"CCESU","empNo":"ceshics0","empId":"201804231035296D8646770E1ECD32CD"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImNjMTE2YjNmLWU4ZGEtNDE5Mi1hOTE3LTA3MWMxNzgxOGUzNSJ9.tx8-RFl9Z2Dpq7VjSuxD8zEdo3Zwy1Xub-zzCvWnLVpSIREUM_ahwc-O5eRrOENux-l4SiZCaxo7YS_hyZ6hKg',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作