centaline-data-driven 1.3.12 → 1.3.15

package/README.md

@@ -73,6 +73,15 @@ Vue.use(centaline, {
 */
 getValueByFieldName(id, attrKey)
 
+/**
+* @method 表单列表弹层编辑时，弹层formData添加获取父表单数据方法
+* @param {string} id 指定Field的fieldName1
+* @param {string} attrKey 指定Field的属性attrKey
+* @desc 获取指定Field的指定Field的值
+* @returns {string} 指定Field的指定Field的值
+*/
+getValueByFieldNameFromParent(id, attrKey)
+
 /**
 * @method
 * @param {string} id 指定Field的fieldName1
@@ -103,6 +112,18 @@ getListCount(tableName)
   */
 getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue)
 
+/**
+  * @method 表单列表弹层编辑时，弹层formData添加获取父表单数据方法
+  * @param {String} tableName 表fieldName1 默认当前表
+  * @param {Number} rowNum 行号 默认当前行号（注意 这里第0行是列头）
+  * @param {String} fiedlId 列fieldName1 默认当前列fieldName1
+  * @param {String} attrName 需要获取attr，如code1,code2 默认code1
+  * @param {String} defaultValue 默认值，若该行被删除时，则直接返回这个值，可空
+  * @desc 获取指定列表中的指定Field的指定属性值
+  * @returns {String} 指定列表中的指定Field的指定属性值
+  */
+getListFieldValueFromParent(tableName, rowNum, fiedlId, attrName, defaultValue)
+
 /**
   * @method
   * @param {String} value 设置的值

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.12",
+  "version": "1.3.15",
   "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="'/salemanage/adjust/point/readDetail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,11 +14,7 @@
     data() {
       return {
         apiParam:{
-actionType: 3,
-originalTraId: "1530076554013306882",
-pageOnly: true,
-pageStyle: 2,
-pageTitle: "成交报告",
+actionType: 2,
           }
       }
     },

package/src/centaline/css/common.css

@@ -812,5 +812,7 @@ html {
 .shortcutFollow .ct-form .el-card__body .el-col{
   padding:0px 5px 0 0 !important;
 }
-
+.shortcutFollow .el-collapse{
+  border-bottom: none;
+}
 

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

@@ -66,56 +66,14 @@
         </div>
         <div class="head-but">
           <div>
-            <component
-              v-if="model.otherTradeActionRouter !== null"
-              v-bind="model.otherTradeActionRouter"
+            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter"
               class="max-default w93"
-              :is="model.otherTradeActionRouter.is"
-              :vmodel="model.otherTradeActionRouter"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.otherTradeActionRouter, $event)"
-            ></component>
-            <img
-              v-if="parentModel && parentModel.$refs && parentModel.$refs.table"
-              :class="{
-                domDisabled:
-                  parentModel &&
-                  parentModel.$refs.table &&
-                  parentModel.$refs.table.model.selectIndex <= 0,
-              }"
-              @click="clickPrevHandler"
-              src="../../../assets/T.png"
-              alt=""
-              style="
-                width: 26px;
-                height: 26px;
-                vertical-align: bottom;
-                margin-left: 20px;
-                cursor: pointer;
-              "
-            />
-            <img
-              v-if="parentModel && parentModel.$refs && parentModel.$refs.table"
-              :class="{
-                domDisabled:
-                  parentModel &&
-                  parentModel.$refs.table &&
-                  parentModel.$refs.table.model.listData &&
-                  parentModel.$refs.table.model.selectIndex ===
-                    parentModel.$refs.table.model.listData.length - 1,
-              }"
-              @click="clickNextHandler"
-              src="../../../assets/B.png"
-              alt=""
-              style="
-                width: 26px;
-                height: 26px;
-                vertical-align: bottom;
-                margin-left: 15px;
-                margin-right: 13px;
-                cursor: pointer;
-              "
-            />
+              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi"
+              @click="fieldClickHandler(model.otherTradeActionRouter, $event)"></component>
+            <img :class="{domDisabled:flagDisabledPrev,}" @click="clickPrevHandler"
+              src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 20px;cursor: pointer;"/>
+            <img :class="{domDisabled:flagDisabledNext,}" @click="clickNextHandler"
+              src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 15px;margin-right: 13px;cursor: pointer;"/>
           </div>
           <div class="mt5">
             <component
@@ -140,19 +98,8 @@
             ></component>
           </div>
           <div class="mt5">
-            <button
-              type="button"
-              class="
-                el-button el-button--info el-button--mini
-                max-report
-                rel
-                w93
-              "
-              v-if="
-                model.actionRoutersMoreList !== null &&
-                model.actionRoutersMoreList.length > 0
-              "
-            >
+            <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"
+              v-if="model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length > 0">
               <img src="../../../assets/dian.png" alt="" class="report" />
               <ul class="report-cont">
                 <li
@@ -336,23 +283,13 @@
           <div class="tablist-info base-box">
             <div class="details-tabs-box">
               <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
-                <el-tab-pane
-                  v-for="(col, index) in model.tags1"
-                  :key="col.appID"
-                  :index="index.toString()"
-                  :name="index.toString()"
-                >
+                <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()" :name="index.toString()">
                   <div slot="label" v-html="col.appName"></div>
                 </el-tab-pane>
               </el-tabs>
-              <ct-searchlist
-                v-if="model.searchConditionApiTags1"
-                :key="'list' + listKey.toString() + refershKey"
-                :apiParam="model.paramDataTags1"
-                :flagFocus="false"
-                :searchConditionApi="model.searchConditionApiTags1"
-                :searchDataApi="model.searchDataApiTags1"
-              ></ct-searchlist>
+              <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey" style="min-height: 420px;"
+                :apiParam="model.paramDataTags1" :flagFocus="false" :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
+              </ct-searchlist>
             </div>
           </div>
           <div
@@ -657,16 +594,33 @@ export default {
       allIn: false,
       refershKey: 0,
       listKey: 0,
+      flagDisabledPrev:false,
+      flagDisabledNext:false,
     };
   },
   mounted() {
     var self = this;
     this.$nextTick(function () {
+      if(self.parentModel && self.parentModel.$refs && self.parentModel.$refs.table){
+        if(self.parentModel.$refs.table.model.selectIndex <= 0){
+          self.flagDisabledPrev=true;
+        }
+        if(self.parentModel.$refs.table.model.listData && self.parentModel.$refs.table.model.selectIndex ===self.parentModel.$refs.table.model.listData.length - 1){
+          self.flagDisabledNext=true;
+        }
+      }
+      else{
+        self.flagDisabledPrev=true;
+        self.flagDisabledNext=true;
+      }
+
       if (self.vmodel) {
         self.load(self.vmodel);
-      } else if (typeof self.source !== "undefined") {
+      } 
+      else if (typeof self.source !== "undefined") {
         self.loaderObj.Detail(self.source, null, self.load);
-      } else if (typeof self.api !== "undefined") {
+      } 
+      else if (typeof self.api !== "undefined") {
         self.loaderObj.Detail(self.api, self.apiParam, self.load);
       }
     });
@@ -881,7 +835,8 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          } else if (field.isOpenList) {
+          } 
+          else if (field.isOpenList) {
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -909,7 +864,8 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          } else if (field.isFormPageInTab) {
+          } 
+          else if (field.isFormPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
@@ -921,24 +877,29 @@ export default {
                 self.model,
                 field.dialogWidth
               );
-          } else if (field.isSearchPageInTab) {
+          } 
+          else if (field.isSearchPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
               .handler.openTabSearch(field, submitData);
-          } else if (field.isBrowserNewTab) {
+          } 
+          else if (field.isBrowserNewTab) {
             // 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(field.action + query, "_blank");
-          } else if (field.isOpenUrlInBrowse) {
+          } 
+          else if (field.isOpenUrlInBrowse) {
             // 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
-          } else if (field.isSeeVoice) {
+          } 
+          else if (field.isSeeVoice) {
             //看视频
             self.$common.browseVideo(field, submitData);
-          } else {
+          } 
+          else {
             field.doAction(submitData, (data) => {
               self.model.doAction(data, field);
               if (callBack) {
@@ -950,8 +911,7 @@ export default {
         //执行客户端脚本
         else {
           submitData = field.getActionPara(submitData).para;
-          let title =
-            field.pageTitle == undefined ? field.label : field.pageTitle;
+          let title = field.pageTitle == undefined ? field.label : field.pageTitle;
           submitData.actionType = field.actionType;
           var fun = self.$common.getDataDrivenOpts().handler[field.action];
           fun(submitData, title, null);
@@ -974,7 +934,8 @@ export default {
             clickAcion(field, submitData);
           })
           .catch(() => {});
-      } else {
+      } 
+      else {
         clickAcion(field, submitData);
       }
     },

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

@@ -24,7 +24,7 @@
                        v-for="(item, index) in collapse" v-if="item.show !== false" :key="index">
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
@@ -35,15 +35,15 @@
         </el-tabs>
 
         <!--分组-->
-        <el-collapse v-else v-model="collapseActiveNames" @change="collapseHandleChange">
+        <el-collapse v-else v-model="collapseActiveNames" @change="collapseHandleChange" :class="model.flagHideSaveLine?'el-collapse-saveLine':''">
           <el-collapse-item v-for="(item, index) in collapse" v-if="item.show !== false" :key="index" :title="item.label" :name="index" :disabled="item.lock" :class="item.lock?'ct-collapse-item-title':''">
             <template slot="title">
               <i class="sign"></i>
-              {{item.label}}
+              <span :class="[item.labelClass]">{{item.label}}</span>
             </template>
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
@@ -681,7 +681,7 @@
           }
         }
         return submitData;
-      },  
+      },
     }
   }
 </script>
@@ -689,8 +689,10 @@
 .el-collapse{
   border-top: none;
 }
-.ct-collapse-item-title .el-collapse-item__header
-{
+.ct-collapse-item-title .el-collapse-item__header{
   color:#303133 !important; 
 }
+.el-collapse-saveLine .ct-collapse-item-title:last-child .el-collapse-item__wrap{
+  border-bottom:none; 
+}
 </style>

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

@@ -94,7 +94,8 @@
     },
     props: {
       vmodel: Object,
-      api: String
+      api: String,
+      parentModel: Object,
     },
     data() {
       return {
@@ -107,6 +108,7 @@
       let self = this;
       this.model = this.vmodel;
       this.model.OptApi = this.api;
+      this.model.$self=self;
 
       this.$nextTick(function () {
         self.model.refField = this.$refs.Fields;

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

@@ -160,6 +160,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
       get saveButtonAction() {
         return source.saveButtonAction;
       },
+      get flagShowSaveLine() {
+        return source.flagShowSaveLine;
+      },
+      get flagHideSaveLine() {
+        return source.flagHideSaveLine;
+      },
       //获取新的初始化的方法
       _scripts: null,
       get scripts() {
@@ -207,6 +213,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 return rtn1.source[attrKey];
             }
         },
+        getValueByFieldNameFromParent(id, attrKey) {
+          if(this.form && this.form.self && this.form.self.$parent){
+            return this.form.self.$parent.vmodel.content[0].on.getValueByFieldName(id, attrKey);
+          }
+          return null;
+        },
         //设置Field的属性attrKey的值
         setValueByFieldName(id, attrKey, attrValue) {
           attrKey = this.common.initialsToLowerCase(attrKey);
@@ -222,6 +234,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 }
             }
         },
+        setValueByFieldNameFromParent(id, attrKey, attrValue) {
+          if(this.form && this.form.self && this.form.self.$parent){
+            return this.form.self.$parent.vmodel.content[0].on.setValueByFieldName(id, attrKey, attrValue);
+          }
+          return null;
+        },
         //设置Field的v1、v2的值
         setV1AndV2ByField1(id, code1, code2) {
           var rtn1 = this.fieldsDic[id];
@@ -342,6 +360,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                 return data.field.source[attrName];
             }
         },
+        getListFieldValueFromParent(tableName, rowNum, fiedlId, attrName, defaultValue) {
+          if(this.form && this.form.self && this.form.self.$parent){
+            return this.form.self.$parent.vmodel.content[0].on.getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue);
+          }
+          return null;
+        },
         //设置表格某行某列的值
         setListFieldValue(value, tableName, rowNum, fiedlId, attrName) {
             value = value==undefined?"":value.toString();
@@ -475,6 +499,92 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           });
         },
       },
+      getValueByFieldName(id, attrKey) {
+          attrKey = common.initialsToLowerCase(attrKey);
+          var rtn1 = this.fieldsDic[id];
+          if (rtn1) {
+              return rtn1.source[attrKey];
+          }
+      },
+      setValueByFieldName(id, attrKey, attrValue) {
+        attrKey = common.initialsToLowerCase(attrKey);
+          var rtn1 = this.fieldsDic[id];
+          if (rtn1) {
+              rtn1.source[attrKey] = attrValue;
+              this.self.hatchHandle(id, attrKey, attrValue, rtn1);
+
+              //用于处理源数据改动,强制更新视图数据 todo
+              if (rtn1.self.$forceUpdate) {
+                  rtn1.self.$forceUpdate();
+              }
+          }
+      },
+      getListField(tableName, rowNum, fiedlId) {        
+        let listData = this.fields.find((v) => {
+            return v.id === tableName;
+        });
+        if (listData) {
+            let field = null;
+            //正在编辑的Field
+            if (rowNum === null && (fiedlId === null || listData.currentEventField.id === fiedlId)) {
+                field = listData.currentEventField;
+            }
+            //正在编辑的行
+            else if (rowNum === null && listData.currentRowIndex === 0) {
+                let fields = listData.currentRow.data;
+                field = fields[fiedlId];
+            }
+            //源数据
+            else {
+              if (rowNum === null && listData.currentRowIndex) {
+                rowNum = listData.currentRowIndex;
+              }
+
+              if (rowNum === 0 || (rowNum && fiedlId)) {
+                try {
+                    let fields = listData.rows[rowNum].field;
+                    field = fields.find((v) => {
+                      return v.id === fiedlId;
+                    });
+                } catch (e) {
+                    if (listData.rows.length <= rowNum) {
+                    var checkMsg = "获取列表行索引超出界限";
+                    this.message(checkMsg);
+                    }
+                }
+              }
+            }
+
+            return { listData: listData, field: field };
+        }
+      },
+      getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue) {
+        tableName = tableName ? tableName : this.scripts.$fd;
+        let data = this.getListField(tableName, rowNum, fiedlId);
+
+        attrName = common.initialsToLowerCase(attrName);
+        attrName = attrName ? attrName : 'code1';
+
+        if (!fiedlId) {
+            fiedlId = data.listData.currentEventField.id;
+        }
+        if (fiedlId && rowNum === null && fiedlId === data.listData.currentEventField.id) {
+            data.field = data.listData.currentEventField;
+        }
+        rowNum = rowNum !== null ? rowNum : data.listData.currentRowIndex;
+
+        //若该行正在编辑，则取编辑状态的。
+        if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
+        && data.listData.currentRow.data.$sourceIndex === rowNum && data.listData.currentRow.isSet) {
+            return data.listData.currentRow.data[fiedlId].source[attrName];
+        }
+        else if (data && data.field) {
+            if (typeof defaultValue !== 'undefined' && data.listData.rows[rowNum].deleted) {//若该行被删除时，则直接返回默认值
+                return defaultValue;
+            }
+            return data.field.source[attrName];
+        }
+      },
       getFormObj() {
         var rtnFormObj = {};
         rtn.fields.forEach((f) => {

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

@@ -309,6 +309,7 @@ const FormList = function (source, master) {
     },
     editRow(index, callback) {
       var self = this;
+      self.currentRowIndex=index;
       var dialogOption = {
         title: '修改',
         pane: common.getParentPane(self),
@@ -353,7 +354,16 @@ const FormList = function (source, master) {
                 common.closeDialog(dialogOption.dialog);
                 callback();
               }
-            }
+            },
+            getValueByFieldName:function(id, attrKey){
+              return self.$self.parentModel.getValueByFieldName(id, attrKey);
+            },
+            setValueByFieldName:function(id, attrKey, attrValue){
+              return self.$self.parentModel.setValueByFieldName(id, attrKey, attrValue);
+            },
+            getListFieldValue:function(tableName, rowNum, fiedlId, attrName, defaultValue){
+              return self.$self.parentModel.getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue);
+            },
           }
         }]
       };
@@ -425,7 +435,16 @@ const FormList = function (source, master) {
                 common.closeDialog(dialogOption.dialog);
                 callback();
               }
-            }
+            },
+            getValueByFieldName:function(id, attrKey){
+              return self.$self.parentModel.getValueByFieldName(id, attrKey);
+            },
+            setValueByFieldName:function(id, attrKey, attrValue){
+              return self.$self.parentModel.setValueByFieldName(id, attrKey, attrValue);
+            },
+            getListFieldValue:function(tableName, rowNum, fiedlId, attrName, defaultValue){
+              return self.$self.parentModel.getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue);
+            },
           }
         }]
       };