centaline-data-driven 1.2.65 → 1.2.68

package/package.json

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

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -48,7 +48,7 @@
                       </li>
                   </ul>
                 </button>
-                <component v-else-if="model.actionRouters!==null && model.actionRouters.legth===3" class="max-report"
+                <component v-else-if="model.actionRouters!==null && model.actionRouters.length===3" class="max-report"
                 :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[2],$event)">
                 </component>
               </div>
@@ -606,7 +606,9 @@
           if(oldValue!==newValue){
             let parm=this.apiParam;
             parm[this.parentModel.primaryKey]=newValue;
-            this.loaderObj.Detail(this.api,parm, this.load);
+            // this.loaderObj.Detail(this.api,parm, this.load);
+            var fun =self.$common.getDataDrivenOpts().handler['refreshPropertyDetailRET'];
+            fun(parm,parm.pageTitle,self.parentModel);            
           }
         }
       },
@@ -618,7 +620,9 @@
           if(oldValue!==newValue){
             let parm=this.apiParam;
             parm[this.parentModel.primaryKey]=newValue;
-            this.loaderObj.Detail(this.api,parm, this.load);
+            // this.loaderObj.Detail(this.api,parm, this.load);
+            var fun =self.$common.getDataDrivenOpts().handler['refreshPropertyDetailRET'];
+            fun(parm,parm.pageTitle,self.parentModel);            
           }
         }
       },

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -155,7 +155,7 @@
           }
           self.model.actionRoutersSimple.forEach((v,i) => {
             if(!v.rightField || (self.model.fields1Dic[v.rightField] && self.model.fields1Dic[v.rightField].value == 1)){
-              if(self.$refs['routers'+i][0] && self.$refs['routers'+i][0].$el){
+              if(self.$refs['routers'+i] && self.$refs['routers'+i].length>0 && self.$refs['routers'+i][0] && self.$refs['routers'+i][0].$el){
                 if(sumWidth+self.$refs['routers'+i][0].$el.offsetWidth+moreWidth+10>totalWidth && self.showIndex===0){
                   self.showIndex=i;
                 }

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

@@ -22,12 +22,10 @@
               </template>
               <template slot-scope="scope">
                 <span v-if="scope.row.isSet">
-                  <!--<component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :api="model.OptApi"></component>-->
                   <component ref="Fields" :is="v.is" :vmodel="model.currentRow.data[v.id]" :api="model.OptApi"
                              @change="changeHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"
                              @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
                 </span>
-                <!--<span v-else>{{scope.row[v.id].labelValue}}</span>-->
                 <span v-else-if="v.is=='ct-sensitiveeye'">
                   <component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
                 </span>

package/src/centaline/dynamicRichText/src/dynamicRichText.vue

@@ -1,10 +1,14 @@
 <template>
   <div class="field-top">
-    <div class="ct-rich-text"
-         style="width: 100%;"
-         v-if="model !== null">
-      <vue-ueditor-wrap ref="editor" v-model="model.value" :config="config"></vue-ueditor-wrap>
-    </div>
+    <template v-if="model !== null">
+      <div v-if="model.label" style="width:100%;padding-bottom: 5px;"><h5 :class="[model.labelClass]">{{model.label}}</h5></div>
+      <div class="ct-rich-text" style="width:100%;display:flex" v-if="model.lock">
+        <p v-html="model.value"></p>
+      </div>
+      <div class="ct-rich-text" style="width: 100%;" v-else>
+        <vue-ueditor-wrap ref="editor" v-model="model.value" :config="config"></vue-ueditor-wrap>
+      </div>
+    </template>
   </div>
 </template>
 <script>
@@ -25,10 +29,10 @@
     },
     data() {
       const that = this;
-      return {  
+      return {
         editor: {},
         config: {
-          imageUrl:"",
+          imageUrl: "",
           serverUrl: "",
           UEDITOR_HOME_URL: '/static/UEditor/',
           readonly: false,
@@ -238,12 +242,12 @@
         this.model = this.vmodel;
       }
 
-      if (this.model.action == "") {
-        this.$message.warning("请配置Action！");
+      if (this.model.action == "" && !this.model.lock) {
+        this.$message.warning("请配置富文本Action！");
         this.config.toolbars = [['help']];
         return;
       }
-      this.config.maximumWords = this.model && this.model.maxValue1 ? parseFloat(this.model.maxValue1) : 5000;
+      this.config.maximumWords = this.model && this.model.max ? parseFloat(this.model.max) : 5000;
       this.config.serverUrl = this.model.action;
       this.config.imageUrl = this.model.action;
     },

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

@@ -202,7 +202,9 @@ const Detail = function (source,para ,callBack) {
                   var router = Router(v);
                   router.is = "ct-btn";
                   router.attrs = { size: "mini" }
-                  rtn._actionRoutersSimple.push(router);
+                  if(router.show){
+                    rtn._actionRoutersSimple.push(router);
+                  }
                 });
               }
               return rtn._actionRoutersSimple;

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

@@ -147,9 +147,7 @@ const FormList = function (source, master) {
       };
       //遍历每一列
       let rowIndex = 0;
-      //for (var key in source.fields) {
       r.columns.forEach((value) => {
-        //let value = source.fields[key];
         value.onChanged = value.onChange ? value.onChange : source.rows[0].columns[rowIndex].onChanged;//事件使用第一条的
         value.onBlur = value.onBlur ? value.onBlur : source.rows[0].columns[rowIndex].onBlur;//事件使用第一条的
         rowIndex++;
@@ -159,7 +157,6 @@ const FormList = function (source, master) {
           row.field.push(item);
         }
       });
-      //}
       return row;
     },
     currentRow: null,