centaline-data-driven 1.2.80 → 1.2.83

package/README.md

@@ -128,9 +128,9 @@ execServerScript(action, object, successCallback)
 /**
   * @method
   * @param {string} message 消息文字。
-  * @param {string} options 参数。
-  * @param {boolean} options 是否居中。
-  * @param {number} duration 显示时间, 毫秒。设为 0 则不会自动关闭。
+  * @param {string} type 主题:success/warning/info/error。
+  * @param {boolean} center 是否居中。
+  * @param {number} duration 显示时间,1500毫秒。设为 0 则不会自动关闭。
   * @param {boolean} showClose 是否显示关闭按钮。
   * @desc 消息提示。常用于主动操作后的反馈提示。
   */

package/build/centaline/centaline.path.js

@@ -3,7 +3,6 @@ const paths = {
     "dynamicD": "./src/centaline/dynamicD/index.js",//日期组件
     "dynamicGp": "./src/centaline/dynamicGp/index.js",//分组标签组件
     "dynamicIti": "./src/centaline/dynamicIti/index.js",//数字区域组件
-    "dynamicLs": "./src/centaline/dynamicLs/index.js",//表单列表组件
     "dynamicMt": "./src/centaline/dynamicMt/index.js",//多行文本组件
     "dynamicSo": "./src/centaline/dynamicSo/index.js",//单选下拉菜单
     "dynamicSos": "./src/centaline/dynamicSos/index.js",//单选搜索下拉菜单
@@ -11,7 +10,6 @@ const paths = {
     "dynamicT": "./src/centaline/dynamicT/index.js",//文本input组件
     "dynamicL": "./src/centaline/dynamicL/index.js",//文本label组件
     "dynamicTags": "./src/centaline/dynamicTags/index.js",//多选搜索下拉菜单组件
-    "dynamicLabel": "./src/centaline/dynamicLabel/index.js",//标签组件
     "dynamicForm": "./src/centaline/dynamicForm/index.js",//表单组件
     "dynamicDrop": "./src/centaline/dynamicDrop/index.js",//快捷下拉输入组件
     "dynamicSearchList": "./src/centaline/dynamicSearchList/index.js",//查询表单组件  

package/package.json

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/example/readDetail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -18,11 +18,7 @@
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
         apiParam:{
-actionType: 3,
-originalTraId: "1526048947277938690",
-pageOnly: true,
-pageStyle: 2,
-pageTitle: "成交报告"
+actionType: 2,
           }
       }
     },

package/src/centaline/api/index.js

@@ -156,7 +156,7 @@ const api = {
       }
     );
   },
-  postThenHandler: function (response) {
+  postThenHandler: function (response,scripts) {
     var data = response.data;
 
     if (typeof common.getDataDrivenOpts().handler.requestComplete === 'function') {
@@ -165,7 +165,8 @@ const api = {
 
     // 执行js
     if (data.clientActionType === Enum.ClientActionType.ExcuteScript && data.content) {
-      eval(data.content);
+      // eval(data.content);
+      common.excute.call(scripts, data.content);
     }
 
     //关闭tab页
@@ -192,9 +193,6 @@ const api = {
       }
 
       if (data.notification === Enum.ActionType.Export && data.content) {//导出
-        //var fileName = data.content.fieldName1;
-        //var fileContent = window.atob(data.content.code1);
-        //Vue.prototype.$common.saveFile(fileName, fileContent);
         var dialogOption = {
           title: "导出",
           content: [{
@@ -222,14 +220,6 @@ const api = {
         }
         else {
           Vue.prototype.$message.error(response.data.rtnMsg);
-          // Vue.prototype.$message({
-          //   message: response.data.rtnMsg,//消息文字
-          //   dangerouslyUseHTMLString: false,
-          //   type: 'error',//主题:success/warning/info/error
-          //   center: true,//是否居中
-          //   duration: 0, //显示时间, 毫秒。设为 0 则不会自动关闭
-          //   showClose: true,//是否显示关闭按钮
-          // });
         }
       }
       return Promise.reject(response);
@@ -237,22 +227,22 @@ const api = {
     //返回给下一个链式调用
     return Promise.resolve(response.data);
   },
-  postHandler(url, params, formData) {
+  postHandler(url, params, scripts) {
     if(common.flagRouterSelf()){
       url=url+params.action;
       params=params.para;
     }
     return Axios.post(url, params, {
       headers: common.getDataDrivenOpts().handler.getRequestHeaders()
-    }).then(this.postThenHandler).catch((ex) => {
-      console.log(ex);
+    }).then((response) => {
+      return this.postThenHandler(response,scripts);
+    }).catch((ex) => {
       if (ex.message) {
         Vue.prototype.$message.error(ex.message);
       }
       else if (typeof ex.data === "string") {
         Vue.prototype.$message.error(ex.data);
       }
-      //return Promise.reject(ex.data ? ex.data : ex);
       return Promise.resolve(ex.data ? ex.data : ex);//错误处理了，直接返回成功，要判断response.rtnCode=200再处理
     });
   }

package/src/centaline/css/max.css

@@ -248,4 +248,7 @@
 .max.el-button.el-button--mini{
     height: 26px;
 }
-
+.ct-text .showLabel label{
+    display: inline-block;
+    line-height: 27px!important;
+  }

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

@@ -354,6 +354,20 @@
         if(this.model.tags2 && this.model.tags2[0]){
           this.model.getTags2List(0);
         }
+        if (typeof window.localStorage !== 'undefined') {
+          var tagkey = window.localStorage.getItem('detailtagkey');
+          for (var i = 0; i < self.model.tags1.length; i++) {
+            if (tagkey == self.model.tags1[i].appID) {
+              self.model.activeIndex1 = i.toString();
+              if (self.model.tags1 && self.model.tags1[i]) {
+                self.listKey = self.listKey + 1;
+                self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionApiUrl || '';
+                self.model.searchDataApiTags1 = self.model.tags1[i].searchDataApiUrl || '';
+                self.model.paramDataTags1 = self.model.tags1[i].paramData || '';
+              }
+            }
+          }
+        }
         this.loadOperation();
         this.loadCommission();
         this.setDetailHeight();
@@ -444,7 +458,8 @@
           this.listKey=this.listKey+1;
           this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
           this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
-          this.model.paramDataTags1=this.model.tags1[i].paramData||'';
+          this.model.paramDataTags1 = this.model.tags1[i].paramData || '';
+          window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID);//存储
         }
       },      
       fieldClickHandler(field) {

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

@@ -149,6 +149,20 @@
         if(this.model.tags2 && this.model.tags2[0]){
           this.model.getTags2List(0);
         }
+        if (typeof window.localStorage !== 'undefined') {
+          var tagkey = window.localStorage.getItem('simpletagkey');
+          for (var i = 0; i < self.model.tags1.length;i++) {
+            if (tagkey == self.model.tags1[i].appID) {
+              self.model.activeIndex1 = i.toString();
+              if (self.model.tags1 && self.model.tags1[i]) {
+                self.listKey = self.listKey + 1;
+                self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionApiUrl || '';
+                self.model.searchDataApiTags1 = self.model.tags1[i].searchDataApiUrl || '';
+                self.model.paramDataTags1 = self.model.tags1[i].paramData || '';
+              }
+            }
+          }
+        }
         this.loadOperation();
         this.setDetailStyle();
         this.$nextTick(() => {
@@ -249,6 +263,7 @@
           this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionApiUrl || '';
           this.model.searchDataApiTags1 = this.model.tags1[i].searchDataApiUrl || '';
           this.model.paramDataTags1 = this.model.tags1[i].paramData || '';
+          window.localStorage.setItem("simpletagkey", this.model.tags1[i].appID);//存储
         }
       },      
       fieldClickHandler(field) {

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

@@ -207,7 +207,6 @@
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
-
         if (this.model.required) {
           if (this.model.getfileListLength() === 0) {
             this.validMessage = "必须上传附件";
@@ -217,48 +216,31 @@
         }
 
         if (this.model.max) {
-          //change
-          if(this.model.getfileListLength() >= this.model.max)
-          {
+          if(this.model.getfileListLength() >= this.model.max){
             this.disableUpload=true;
-          }else
-          {
+          }
+          else{
             this.disableUpload=false;
           }
-
-          // if (this.model.getfileListLength() > this.model.max) {
-          //   this.validMessage = "附件数量";
-          //   if(this.model.min)
-          //   {
-          //     this.validMessage += "最少" + this.model.min + "个"+",";
-          //   }
-          //   // this.validMessage += "最多" + this.model.max+ "个";
-          //   this.valid = false;
-          //   return false;
-          // }
         }
         if (this.model.min) {
           if (this.model.getfileListLength() < this.model.min) {
             //change时需要判断有没有上传图片如果没有图片则不提示
-
-            if(eventName=='change' && this.model.getfileListLength()>0)
-            {
+            if(eventName=='change' && this.model.getfileListLength()>0){
                this.validMessage = "附件数量还差" + (parseInt(this.model.min)-this.model.getfileListLength()) + "张";
                this.valid = false;
-            }else if(eventName=='valid')
-            {
+            }
+            else if(eventName=='valid'){
                this.validMessage = "附件数量还差" + (parseInt(this.model.min)-this.model.getfileListLength()) + "张";
                this.valid = false;
-            }else if(eventName=='remove')
-            {
-              this.valid = true;
             }
-          
+            else if(eventName=='remove'){
+              this.valid = true;
+            }          
             return false;
           }
         }
-        if(eventName=='valid'&&!this.validFileClass())
-        {
+        if(eventName=='valid'&&!this.validFileClass()){
           this.validMessage="请选择附件分类";
           this.valid = false;
           return false;
@@ -267,17 +249,13 @@
         return this.valid;
       },
       //验证附件分类是否必填
-      validFileClass()
-      {
-        if(this.model.paramName)
-        {
-          if(this.model.sourceList&&this.model.sourceList.length>0)
-          {
+      validFileClass(){
+        if(this.model.paramName){
+          if(this.model.sourceList&&this.model.sourceList.length>0){
             let notClass= this.model.sourceList.filter(item=>{
-              return item.mediaLabelID==undefined||item.mediaLabelID=="";
+              return (item.mediaLabelID==undefined||item.mediaLabelID=="") && item.flagDeleted !== true;
             })
-            if(notClass.length>0)
-            {
+            if(notClass.length>0){
               return false
             }
           }

package/src/centaline/dynamicForm/index.js

@@ -1,7 +1,5 @@
 import dynamicForm from './src/dynamicForm'
 import dynamicInput from '../dynamicInput/index'
-import dynamicLabel from '../dynamicLabel/index'
-import dynamicLs from '../dynamicLs/index'
 import api from '../api/index'
 import common from '../common/index'
 import validate from '../validate/index'
@@ -9,8 +7,6 @@ import validate from '../validate/index'
 dynamicForm.install = function (Vue) {
   Vue.component(dynamicForm.name, dynamicForm);
   Vue.component(dynamicInput.name, dynamicInput);
-  Vue.component(dynamicLabel.name, dynamicLabel);
-  Vue.component(dynamicLs.name, dynamicLs);
 
   Vue.use(api);
   Vue.use(common);

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

@@ -412,7 +412,7 @@
                   else{
                     self.model.doAction(data);
                   }
-                })
+                },self.model.scripts);
               }
             }
           }
@@ -474,6 +474,14 @@
         self.model.hiddenHandle(field);
         self.model.requiredHandle(field);
         //self.model.validMrf(field);
+
+        if(field.onAfterChanged){
+          var router =self.model.actionRouters.find((v) => {
+            return v.id === field.onAfterChanged;
+          });
+          self.clickHandler(router);
+        }
+
         self.$forceUpdate();
       },
       changeCallBackHandler(field, callBackFunName, callBackPara) {
@@ -552,7 +560,7 @@
         self.$refs.Fields.forEach((f) => {
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
-              if(i===0){
+              if(i===0 && f.model.label){
                 self.$message.error('【'+f.model.label+'】不能为空！');
               }
               i++;

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

@@ -30,6 +30,12 @@
                 <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>
+                <!--可点击的列-->
+                <span v-else-if="v.router" :class="'cell'" style="display: flex;">
+                  <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].label" :rowData="scope.row"
+                                  @click="rolRouterClickHandler">
+                  </ct-tablecurrency>
+                </span>
                 <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" ref="FieldsLabel"></ct-span>
               </template>
             </el-table-column>
@@ -281,6 +287,18 @@
 
         this.$emit('tableButtonClick', button, submitData);
       },
+      rolRouterClickHandler(field, rowData,rowindex) {
+        if(this.$refs['popover'+rowindex]){
+          this.$refs['popover'+rowindex][0].doClose();
+        }
+
+        var submitData = {};        
+        field.submitListField.forEach((k) => {
+          submitData[k] = rowData[k];
+        });
+
+        this.$emit('tableButtonClick', field, submitData);
+      },
       //汇总行 计算
       getSummaries(param) {
         const self = this;

package/src/centaline/dynamicLayout/src/dynamicLayout.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading" class="ct-Layout" v-if="Layout !== null && !loading">
-    <ct-layoutchildren :ref="'layout'+rowindex" :rowindex="rowindex" :vmodel="Layout" @click="rolRouterClickHandler"></ct-layoutchildren>
+    <ct-layoutchildren :rowindex="rowindex" :vmodel="Layout" @click="clickHandler"></ct-layoutchildren>
   </div>
 </template>
 <script>
@@ -91,9 +91,7 @@
           });
         }
         var xmlDOM = this.loadXML(str);
-        console.log(xmlDOM)
         this.Layout = this.xmlToJson(xmlDOM);
-        this.model = this.loaderObj.CellLayout(this.Layout);
         this.loading = false;
       },
       getValue(data, val) {
@@ -215,193 +213,8 @@
         }
         return obj;
       },
-      rolRouterClickHandler(routerKey, rowindex, forname, forrowindex) {
-        var self = this;
-        var submitData = {};
-        var rowData = self.vmodel;
-        var actionRouter = self.actionRouter;
-        let field = actionRouter.find(b => {
-          return b.id === routerKey;
-        });
-        if (typeof forname !== "undefined") {
-          field.submitListField.forEach((k) => {
-            submitData[k] = rowData[forname][forrowindex][k];
-          });
-        }
-        else {
-          field.submitListField.forEach((k) => {
-            submitData[k] = rowData[k];
-          });
-        }
-        let action = field.action;
-        if (field.actionField) {
-          action = rowData[field.actionField];
-        }
-        this.routerClickHandler(field, submitData, action, rowindex,forname, forrowindex);
-      },
-      routerClickHandler(field, submitData, action, rowindex, forname, forrowindex) {
-        let self = this;
-        action = action || field.action;
-
-        var clickAcion = function () {
-          //若不是客户端方法，则直接访问接口
-          if (!field.isClientFuntion) {
-            // 外部框架tab页打开
-            if (field.isFormPageInTab) {
-              submitData = field.getActionPara(submitData).para;
-              if (field.pageStyle) {
-                submitData.pageStyle = field.pageStyle;
-              }
-              self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model, field.dialogWidth);
-            }
-            else if (field.isSearchPageInTab) {// 外部框架tab页打开
-              submitData = field.getActionPara(submitData).para;
-              self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
-            }
-            else if (field.isBrowserNewTab) {// 浏览器打开
-              submitData = field.getActionPara(submitData).para;
-              let query = self.$common.objectToQueryStr(submitData);
-              window.open(action + query, "_blank");
-            }
-            else {
-              //self.operationLoading = true;
-
-              //Form
-              if (field.isOpenForm) {
-                var dialogOption = {
-                  title: field.pageTitle,
-                  pane: self.$common.getParentPane(self),
-                  content: [{
-                    component: field.navToNewPageName,
-                    attrs: {
-                      //source: data.content,
-                      api: action,
-                      apiParam: field.getActionPara(submitData).para,
-                      showTitle: false,
-                      width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
-                    },
-                    on: {
-                      submit(ev) {
-                        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
-                          self.model.doAction(ev);
-                        }
-                        self.$forceUpdate();
-                        self.$refs.footer.$forceUpdate();
-                        self.$common.closeDialog(dialogOption.dialog);
-                        self.updateCurrentRow(field, ev);
-                      },
-                      refreshParent() {
-                        self.getPage(1);
-                        self.$common.closeDialog(dialogOption.dialog);
-                      },
-                      closeDialog() {
-                        self.updateCurrentRow(field);
-                      }
-                    }
-                  }]
-                };
-                self.$common.openDialog(dialogOption);
-              }
-              //SearchList
-              else if (field.isOpenList) {
-                var dialogOption = {
-                  title: field.pageTitle,
-                  pane: self.$common.getParentPane(self),
-                  content: [{
-                    component: field.navToNewPageName,
-                    attrs: {
-                      searchConditionApi: field.actionForSearchLayout,
-                      searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
-                      width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
-                    },
-                    on: {
-                      refreshParent() {
-                        self.getPage(1);
-                        self.$common.closeDialog(dialogOption.dialog);
-                      },
-                      closeDialog() {
-                        self.updateCurrentRow(field);
-                      }
-                    }
-                  }]
-                };
-                self.$common.openDialog(dialogOption);
-              }
-              //Tabs
-              else if (field.isOpenTabs) {
-                var dialogOption = {
-                  title: field.pageTitle,
-                  pane: self.$common.getParentPane(self),
-                  content: [{
-                    component: field.navToNewPageName,
-                    attrs: {
-                      searchConditionApi: field.actionForSearchLayout,
-                      searchDataApi: field.actionForSearch,
-                      apiParam: submitData,
-                      width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
-                    },
-                    on: {
-                    }
-                  }]
-                };
-                self.$common.openDialog(dialogOption);
-              }
-              else {
-                field.doAction(submitData, (data) => {
-                  self.model.doAction(data, field);
-                  if (field.actionType === 19) {
-                    self.callTelClick(self.$refs['layout' + rowindex].$refs.layoutchildren, data, forname, forrowindex)
-                  }
-                })
-              }
-            }
-          }
-          //执行客户端脚本
-          else {
-            // 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;
-            submitData.actionType = field.actionType;
-            var fun = self.$common.getDataDrivenOpts().handler[action];
-            fun(submitData, title, self.model);
-            // var fun = self.model.scripts.formData[action];
-            // fun(submitData,field);
-          }
-        }
-
-        if (field.alert) {
-          self.$common.confirm(field.alertMsg, field.alertCaption, {
-            confirmButtonText: field.alertOKButtonText,
-            cancelButtonText: field.alertCancelButtonText,
-            //type: 'warning'
-            center: field.alertCenter
-          }).then(() => {
-            clickAcion();
-          }).catch(() => {
-          });
-        }
-        else {
-          clickAcion();
-        }
-      },
-      callTelClick(VueCom, data, forname, forrowindex) {
-        if (typeof VueCom.$refs['router' + forname + forrowindex] !== "undefined") {
-          VueCom.callTelClick(data);
-          return true;
-        }
-        if (VueCom.$children.length>0) {
-          for (var i = 0; i < VueCom.$children.length; i++) {
-            var item = VueCom.$children[i];
-            var result = this.callTelClick(item, data,forname, forrowindex);
-            if (result) {
-              return result;
-            }
-          }
-        }
+      clickHandler(routerKey, rowindex, forname, forrowindex) {
+        this.$emit('click', routerKey, rowindex, forname, forrowindex);
       },
 
     },

package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue

@@ -26,7 +26,7 @@
     },
     data() {
       return {
-        forindex:0
+        forindex: 0
       };
     },
     created() {
@@ -43,5 +43,4 @@
   }
 </script>
 <style>
- 
 </style>

package/src/centaline/dynamicLayout/src/dynamicLayoutImage.vue

@@ -1,18 +1,17 @@
 <template>
   <div v-if="model.routerKey">
-    <div :ref="'router'+forname+forrowindex" :style="model.styleObject">
-      <el-popover class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'"
+    <div v-if="model.rightRouter&&model.value!=''" :ref="'router'+forname+forrowindex" :style="model.styleObject">
+      <el-popover class="Stats-popover" :placement="option.placement?option.placement:'left'"
                   v-model="visible" :trigger="option.trigger?option.trigger:''">
         <div style="border-bottom:none">
           <div style="color: #388cd3;text-align: center;">{{message}}</div>
           <img v-show="qrCode" :src="qrCode" style="margin-top: 5px;" :style="{'width':width+'px','height':height+'px'}" />
         </div>
-        <el-image :src="tellImgUrl?tellImgUrl:model.value"
-                  fit="fit" slot="reference" @click="clickHandler($event)" style="cursor:pointer;"></el-image>
+        <img :src="tellImgUrl?tellImgUrl:model.value" slot="reference" @click="clickHandler($event)" style="cursor:pointer;width:100%" />
       </el-popover>
     </div>
   </div>
-  <div v-else :style="model.styleObject">
+  <div v-else-if="model.value!=''" :style="model.styleObject">
     <el-image :src="model.value"
               fit="fit"></el-image>
   </div>

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -1,12 +1,12 @@
 <template>
   <div v-if="model.routerKey">
-    <div  :style="model.styleObject">
+    <div v-if="model.rightRouter&&model.value!=''" :style="model.styleObject">
       <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem">
         {{model.value}}
       </a>
     </div>
   </div>
-  <div v-else :style="model.styleObject" v-html="model.value">
+  <div v-else-if="model.value!=''" :style="model.styleObject" v-html="model.value">
   </div>
 </template>
 
@@ -17,7 +17,9 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
-      rowindex: Number
+      rowindex: Number,
+      forname: String,
+      forrowindex: String
     },
     data() {
       return {
@@ -29,7 +31,7 @@
    
     methods: {
       clickHandler(ev) {
-        this.$emit('click', this.model.routerKey, this.rowindex);
+        this.$emit('click', this.model.routerKey, this.rowindex, this.forname, this.forrowindex);
       }
     },
     computed: {