centaline-data-driven 1.3.14 → 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.14",
+  "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/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"
@@ -43,7 +43,7 @@
             </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>

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

@@ -213,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);
@@ -228,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];
@@ -348,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();
@@ -481,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);
+            },
           }
         }]
       };

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -1,95 +1,120 @@
+<!--
+ * @Author: linchunmei 179466780@qq.com~
+ * @Date: 2022-06-21 11:29:34
+ * @LastEditors: linchunmei 179466780@qq.com~
+ * @LastEditTime: 2022-06-24 13:49:53
+ * @FilePath: \js-sdk-v3\src\centaline\quickInputSos\src\quickInput.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <div class="ct-quickInput">
-
-     <el-popover ref="pop" placement="bottom-start" v-model="showDrop"  trigger="click" @show="searchInputHandle">
-            <div>
-              <div>
-                <el-input ref="searchInput" size="mini" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
-              </div>
-              <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
-            </div>
-            <i slot="reference" class="el-icon-more"></i> 
-      </el-popover>
+    <el-popover
+      ref="pop"
+      placement="bottom-start"
+      v-model="showDrop"
+      trigger="click"
+      @show="searchInputHandle"
+    >
+      <div>
+        <div>
+          <el-input
+            ref="searchInput"
+            size="mini"
+            suffix-icon="el-icon-search"
+            v-model="searchText"
+            @input="searchInputHandle"
+          ></el-input>
+        </div>
+        <ctSelectOptionVertical
+          :model="model"
+          @click="selectOption($event)"
+        ></ctSelectOptionVertical>
+      </div>
+      <!-- <i slot="reference" class="el-icon-more"></i> -->
+      <span slot="reference" style="font-family: Comic Sans MS; font-size: 14px"
+        ><div class="my-icon-more"></div
+      ></span>
+    </el-popover>
   </div>
 </template>
 <script>
-
-  import selectOption from '../../selectOption/src/selectOption'
-  import dynamicElement from '../../mixins/dynamicElement'
-  import ctSelectOptionVertical from '../../selectOption/src/selectOptionVertical'
-  export default {
-    name: 'ctQuickInput',
-    mixins: [dynamicElement],
-    props: {
-      pn: String,
-      action: String
+import selectOption from "../../selectOption/src/selectOption";
+import dynamicElement from "../../mixins/dynamicElement";
+import ctSelectOptionVertical from "../../selectOption/src/selectOptionVertical";
+export default {
+  name: "ctQuickInput",
+  mixins: [dynamicElement],
+  props: {
+    pn: String,
+    action: String,
+  },
+  components: {
+    ctSelectOption: selectOption,
+    ctSelectOptionVertical: ctSelectOptionVertical,
+  },
+  created() {
+    let that = this;
+    if (typeof this.vmodel === "undefined") {
+      this.model = this.loaderObj.QuickInputSos({
+        code1: "",
+        name1: "",
+        paramName1: that.pn,
+      });
+    } else {
+      this.model = this.vmodel;
+    }
+  },
+  data() {
+    return {
+      options: [],
+      searchText: "",
+      showDrop: false,
+    };
+  },
+  methods: {
+    getOptions: function () {
+      var self = this;
+      this.model.getOptions(this.action, self.searchText);
     },
-     components: {
-      'ctSelectOption': selectOption,
-      'ctSelectOptionVertical': ctSelectOptionVertical
+    searchInputHandle: function () {
+      var currentSeatch = this.searchText;
+      this.searchTickControl(currentSeatch);
     },
-     created() {
-       let that=this;
-      if (typeof this.vmodel === 'undefined') {
-        this.model = this.loaderObj.QuickInputSos(
-        {
-          code1:'',
-          name1:'',
-          paramName1:that.pn,
+    searchTickControl: function (search) {
+      var self = this;
+      setTimeout(function () {
+        if (search === self.searchText) {
+          self.getOptions(self.searchText);
         }
-        );
-      }
-      else {
-        this.model = this.vmodel;
-      }
-    },
-    data() {
-      return {
-        options:[],
-        searchText: "",
-        showDrop: false,
-       
-      };
+      }, self.model.searchTick);
     },
-    methods: {
-     
-      getOptions: function () {
-        var self = this;
-        this.model.getOptions(this.action, self.searchText);
-      
-      },
-      searchInputHandle: function () {
-        var currentSeatch = this.searchText;
-        this.searchTickControl(currentSeatch);
-      },
-      searchTickControl: function (search) {
-        var self = this;
-        setTimeout(function () {
-          if (search === self.searchText) {
-            self.getOptions(self.searchText);
-          }
-        }, self.model.searchTick);
-      },
-      selectOption(value) {
-        if (this.model.value === value) {
-          this.$set(this, 'showDrop', false);
-          return;
-        }
-        else {
-          this.model.value = value;
-        }
-        this.$set(this, 'showDrop', false);
-        this.$emit('click', value);
-      },
+    selectOption(value) {
+      if (this.model.value === value) {
+        this.$set(this, "showDrop", false);
+        return;
+      } else {
+        this.model.value = value;
+      }
+      this.$set(this, "showDrop", false);
+      this.$emit("click", value);
     },
-    mounted() {
-      
-    }
-  }
+  },
+  mounted() {},
+};
 </script>
 <style>
-  .ct-quickInput .el-icon-more:hover {
-    cursor: pointer;
-    color: #409EFF;
-  }
+.ct-quickInput .el-icon-more:hover {
+  cursor: pointer;
+  color: #409eff;
+}
+.my-icon-more {
+  width: 16px;
+  height: 20px;
+  border-top: 4px solid rgb(153, 153, 153);
+  border-bottom: 4px solid rgb(153, 153, 153);
+  background-color: rgb(153, 153, 153);
+  padding: 4px 0;
+  background-clip: content-box;
+  margin-left: 5px;
+}
 </style>

package/src/main.js

@@ -12,8 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
+  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  baseUrl: "http://10.88.23.22:9999/v1/form/router",
   // baseUrl: "http://10.88.22.69:8080/", 
   // flagRouterSelf: true,
   zindex: 999,
@@ -41,8 +41,8 @@ Vue.use(centaline, {
       return {
         oldToken: '059a0de9-385e-49d1-85a7-c04e4c1c0a18',
         originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc4N2U5ZDA1LThlMGItNDY0ZS1iMThjLTQzNjEyZWIyZDQ1ZCJ9.1W1c_YwAF9jfjAtOq9twaB6FH4KiySPuZmWIzcLSDxjfJTgXu7fcf4Cu8kyWcRC2bXrzNQoOYsHAR1vfMAQvGA',
+        EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjgxY2I1MTgzLTIyNjAtNDBkNC05N2JhLWNlZDZkZGQ5MjI2MiJ9._ZBywCAxnFXqxugFGFJvcBY1pW7OWnIghqe7F9W0BcATsnsg_80R1GapUXAuXa-55EzkHfPOGEvvhOyhzqgXRA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作