centaline-data-driven 1.4.74 → 1.4.76

package/package.json

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

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1564070698362736640"} ,
+        apiParam: {actionType: 1,chanceID: "1602938585265344512"} ,
       }
     },
     mounted() {

package/src/centaline/api/index.js

@@ -6,7 +6,7 @@ import common from '../common';
 //Axios.defaults.baseURL = 'https://localhost:44381/api'
 Axios.defaults.headers.post['Content-Type'] = 'application/json';
 Axios.defaults.maxContentLength = 400000;
-Axios.defaults.withCredentials = true;//允许带上跨域cookies
+// Axios.defaults.withCredentials = true;//允许带上跨域cookies
 
 // Axios.defaults = {
 //  // `url` 是用于请求的服务器 URL

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -79,7 +79,7 @@
           <div>
             <el-progress type="circle" v-if="file.progressFlag" :show-text="false"
                          :percentage="typeof file.loadProgress !== 'undefined' && file.loadProgress !== null ? file.loadProgress : 0.00"
-                         :width="96" :height="96" class="file-cirle"></el-progress>
+                         :width="96" :height="96" class="file-cirle file-cirle-mrLeft"></el-progress>
             <div class="circleCenter" v-if="file.progressFlag">
               <div style="font-size: 12px;color: #666;"> {{ file.loadProgress.toFixed(2) }}%</div>
             </div>
@@ -167,7 +167,7 @@
           <div>
             <el-progress type="circle" v-if="file.progressFlag" :show-text="false"
                          :percentage="typeof file.loadProgress !== 'undefined' && file.loadProgress !== null ? file.loadProgress : 0.00"
-                         :width="96" :height="96" class="file-cirle"></el-progress>
+                         :width="96" :height="96" class="file-cirle file-cirle-mrLeft"></el-progress>
             <div class="circleCenter" v-if="file.progressFlag">
               <div style="font-size: 12px;color: #666;"> {{ file.loadProgress.toFixed(2) }}%</div>
             </div>
@@ -719,7 +719,7 @@
     left: 35px;
   }
 
-  .file-cirle .el-progress-circle {
+  .file-cirle-mrLeft .el-progress-circle {
     margin-left: 15px;
   }
 
@@ -727,8 +727,7 @@
     position: absolute;
     top: 50%;
     left: 50%;
-    margin-top: -11px;
-    margin-left: -20px;
+    transform: translate(-50%,-50%); 
   }
  
 .browseDefault .el-radio__input.is-checked .el-radio__inner {

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

@@ -1,10 +1,10 @@
 <template>
   <div class="ct-form-list" v-focus="foucus" :class="{'tableDisabled':model.tableDisabled}">
-    <div class="list-title">
+    <div v-if="model.create || (model.selectRouter && model.selectRouter.id)" class="list-title">
       <h5>{{model.title}}</h5>
     </div>
     <div class="list-button">
-      <component v-if="model.selectRouter !== null" :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
+      <component v-if="model.selectRouter!==null" :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
       <el-button v-if="model.create" type="success" class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
         新增
       </el-button>
@@ -88,9 +88,21 @@
       },      
       getFontColor() {
         return this.rowData.fontColor || '';
-      }
+      },
+      getLableShow(){
+        let labelShow=this.vmodel.labelValue;
+        if(this.vmodel.unitName){
+          labelShow=labelShow+this.vmodel.unitName;
+        }
+        if(this.vmodel.type===6){
+          if(this.vmodel.code2){
+            labelShow=this.vmodel.labelValue+this.vmodel.code2;
+          }
+        }
+        return labelShow;
+      },
     },
-    template: '<div :class="getClass()" :style="{\'color\':getFontColor()}">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
+    template: '<div :class="getClass()" :style="{\'color\':getFontColor()}">{{getLableShow()}}</div>'
   }
 
   export default {

package/src/centaline/dynamicSosTt/src/dynamicSosTt.vue

@@ -258,7 +258,7 @@
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
-        if (this.model.required && this.model.value1 == "") {
+        if (this.model.required && !this.model.value1) {
           this.validMessage = "必填";
           this.valid = false;
           return false;

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

@@ -37,6 +37,9 @@ const FormList = function (source, master) {
     get create() {
       return source.rightNew === true;
     },
+    set create(v) {
+      return source.rightNew = v;
+    },
     get required() {
       return master.required;
     },
@@ -366,6 +369,9 @@ const FormList = function (source, master) {
                 for (let findex = 0; findex < row.length; findex++) {//循环所在行的列
                   Vue.set(row[findex], 'code1', ev.formData.source.fields[findex].code1);
                   Vue.set(row[findex], 'name1', ev.formData.source.fields[findex].name1);
+                  if(ev.formData.source.fields[findex].code2){
+                    Vue.set(row[findex], 'code2', ev.formData.source.fields[findex].code2);
+                  }
                 }
 
                 common.closeDialog(dialogOption.dialog);
@@ -433,6 +439,9 @@ const FormList = function (source, master) {
                 let field = row.columns[findex];
                 field.code1 = ev.formData.source.fields[findex].code1;
                 field.name1 = ev.formData.source.fields[findex].name1;
+                if(ev.formData.source.fields[findex].code2){
+                  field.code2=ev.formData.source.fields[findex].code2;
+                }
               }
 
               let rowItem = rtn.initRow(row);

package/src/main.js

@@ -48,7 +48,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjkEOwjAMBP-SM5YS27EdbmlDLzyialCR4IRoK4EQfyeIR3Ad7c7uyy1bdXuXUMWYCfpDR8AlK3QSPPSScsyWUbo4yhALoiqQDgZ98ASIuYC3ogMVSqJ-LJyyYTM11EwYDmAdZcDIxjREThrdzs2Pm9sH0cQqiLhzl2n9AbJkX7At8_04P_9x7rpe2uy5NepcFYTFt7AgVKQz6EnVq01UQ3TvDwAAAP__.NfZrt1wK0fZT3WdJplCcBlTe7PriWBvxZb0MU_YWWoA',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjFuwzAMRe-i2QQokiKpbLJlLz1EIDcOkExBnAAtgty9KnqILn94w3v_FfbnGg4hk6mLMEzzyCC1GIwaESbNJRUvpGM66pIqkRmwLQ5TRAaiUgG92sKVsxoeq-Ti1E0ddRPFGXzkApTEhZck2VIYwvZ1C4eojpHNXYZwaY8_gCnKL3ju2_1j-_6Pc9fHpWfZziatKWDjT5BTn3xODRRXkrY2ZDmF9w8AAAD__w.sUuy7HIYebv9o9r8-QfM3m-xy5W1OW6FNcq7Wyy0Hp0',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',