centaline-data-driven 1.5.39 → 1.5.41

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -1,18 +1,55 @@
 <template>
   <div class="ct-form-repeat">
-      <el-button v-if="model.create&&model.tableData.length<model.max" type="success" style="float: right; " class=" max-btn-add" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
-        {{model.createText}}
-      </el-button>
-    <div class="el-col el-col-24 ct-form-repeat-el-col" v-for="(v, i) in model.tableData" :key="v.guid" v-if="!v.deleted">
+    <el-button
+      v-if="model.create&&model.tableData.length<model.max"
+      type="success"
+      style="float: right; "
+      class=" max-btn-add"
+      size="mini"
+      icon="el-icon-circle-plus-outline"
+      @click="addRow"
+    >
+      {{model.createText}}
+    </el-button>
+    <div
+      class="el-col el-col-24 ct-form-repeat-el-col"
+      v-for="(v, i) in model.tableData"
+      :key="v.$sourceIndex"
+      v-if="!v.deleted"
+    >
       <el-row v-if="v.field.length > 0">
-        <el-col v-for="(col, index) in v.field" :key="col.guid" v-if="col.show !== false&&col.type!=13" :span="col.colspan" style="padding:5px">
-          <component ref="Fields" :is="col.is" :vmodel="col" :api="model.OptApi" v-bind="col.bindPara"
-                     @click="fieldClickHandler(col,index,i)" @change="changeHandler(col,index,i)"
-                     @input="inputHandler(col,index,i)"></component>
+        <el-col
+          v-for="(col, index) in v.field"
+          :key="col.rowKey"
+          v-if="col.show !== false&&col.type!=13"
+          :span="col.colspan"
+          style="padding:5px"
+        >
+          <component
+            ref="Fields"
+            :is="col.is"
+            :vmodel="col"
+            :api="model.OptApi"
+            v-bind="col.bindPara"
+            @click="fieldClickHandler(col,index,i)"
+            @change="changeHandler(col,index,i,v.$sourceIndex)"
+            @popupSearchList="popupSearchListHandler(col,i)"
+            @input="inputHandler(col,index,i)"
+          ></component>
         </el-col>
       </el-row>
-      <div class="list-button" v-if="i>0">
-        <el-button v-if="v.delete" type="success" class=" max-btn-add" size="mini" icon="el-icon-delete" @click="deleteRow(i)">
+      <div
+        class="list-button"
+        v-if="i>0"
+      >
+        <el-button
+          v-if="v.delete"
+          type="success"
+          class=" max-btn-add"
+          size="mini"
+          icon="el-icon-delete"
+          @click="deleteRow(i)"
+        >
           删除
         </el-button>
       </div>
@@ -22,157 +59,331 @@
 </template>
 
 <script>
-  //Form内表格
-  var ctSpan = {//临时的span组件对象，用于vue双向绑定，强制更新
-    props: {
-      vmodel: Object,
-      rowNum: Number,
-    },
-    data: function () {
-      return {
-        
+//Form内表格
+var ctSpan = {
+  //临时的span组件对象，用于vue双向绑定，强制更新
+  props: {
+    vmodel: Object,
+    rowNum: Number,
+  },
+  data: function () {
+    return {};
+  },
+  methods: {
+    getClass() {
+      if (this.vmodel.is === "ct-inputNumber") {
+        return "ct-table-inputnumber";
       }
     },
-    methods: {
-      getClass() {
-        if (this.vmodel.is === "ct-inputNumber") {
-          return 'ct-table-inputnumber';
+  },
+  template:
+    '<div :class="getClass()">{{vmodel.labelValue}}{{vmodel.unitName}}</div>',
+};
+
+export default {
+  name: "ct-repeat",
+  components: {
+    "ct-span": ctSpan,
+  },
+  props: {
+    vmodel: Object,
+    api: String,
+  },
+  data() {
+    return {
+      model: null,
+      foucus: false,
+      itemKey: Math.random(),
+      activeName: ["0"],
+    };
+  },
+  created() {
+    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;
+    });
+    this.model.tableData.forEach((v, i) => {
+      v.field.forEach((f, n) => {
+        self.model.hiddenHandle(f, i);
+        self.model.requiredHandle(f, i);
+      });
+      //联动组件处理 todo:去掉，使用form方式
+      var hasParent = self.model.tableData[i].field.filter((v1) => {
+        return typeof v1.parentName !== "undefined";
+      });
+
+      hasParent.forEach((v1, index) => {
+        var arr = v1.parentName.split(",");
+        for (var j = 0; j < arr.length; j++) {
+          var parent = self.model.tableData[i].field.find((v2) => {
+            return v2.id === arr[j];
+          });
+          if (parent) {
+            parent.child = parent.child ? parent.child : [];
+            parent.child.push(v1);
+            v.parent = parent;
+          }
         }
-      }
-    },
-    template: '<div :class="getClass()">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
-  }
+      });
+    });
+  },
+  methods: {
+    //添加
+    addRow() {
+      var app = this;
+      if (app.fieldsValidExcute()) {
+        let newRow = app.model.getCloneRowData(0);
+        app.model.tableData.push(newRow);
+        app.model.addSourceRow(newRow.$sourceIndex);
+        app.model.tableData[app.model.tableData.length - 1].field.forEach(
+          (f, n) => {
+            app.model.hiddenHandle(f, app.model.tableData.length - 1);
+            app.model.requiredHandle(f, app.model.tableData.length - 1);
+          }
+        );
+        //联动组件处理 todo:去掉，使用form方式
+        var hasParent = app.model.tableData[
+          app.model.tableData.length - 1
+        ].field.filter((v1) => {
+          return typeof v1.parentName !== "undefined";
+        });
 
-  export default {
-    name: 'ct-repeat',
-    components: {
-      'ct-span': ctSpan
-    },
-    props: {
-      vmodel: Object,
-      api: String
-    },
-    data() {
-      return {
-        model: null,
-        foucus: false,
-        itemKey: Math.random(),
-        activeName: ['0'],
+        hasParent.forEach((v1, index) => {
+          var arr = v1.parentName.split(",");
+          for (var j = 0; j < arr.length; j++) {
+            var parent = app.model.tableData[
+              app.model.tableData.length - 1
+            ].field.find((v2) => {
+              return v2.id === arr[j];
+            });
+            if (parent) {
+              parent.child = parent.child ? parent.child : [];
+              parent.child.push(v1);
+            }
+          }
+        });
       }
     },
-    created() {
-      let self = this;
-      this.model = this.vmodel;
-      this.model.OptApi = this.api;
-      this.$nextTick(function () {
-        self.model.refField = this.$refs.Fields;
-        self.model.refFieldsLabel = this.$refs.FieldsLabel;
+    //删除
+    deleteRow(index) {
+      var self = this;
+      this.model.deleteRow(index + 1, () => {
+        if (self.model.tableData[index].isNewFlag) {
+          self.model.tableData.splice(index, 1);
+        } else {
+          self.model.tableData[index].deleted = true;
+        }
+        self.$forceUpdate();
+        self.model.change = self.model.formListChange;
+        self.$emit("change");
       });
     },
-    methods: {
-      //添加
-      addRow() {
-        var app = this;
-        if (app.fieldsValidExcute()) {
-          let newRow = app.model.getCloneRowData(0)
-          app.model.tableData.push(newRow);
-          app.model.addSourceRow();
-        }
-      },
-      //删除
-      deleteRow(index) {
-        var self = this;
-        this.model.deleteRow(index + 1, () => {
-          if (self.model.tableData[index].isNewFlag) {
-            self.model.tableData.splice(index, 1);
-          }
-          else {
-            self.model.tableData[index].deleted = true;
+    fieldsValidExcute() {
+      var self = this;
+      var rtnBool = true;
+      if (typeof self.$refs.Fields !== "undefined") {
+        self.$refs.Fields.forEach((f) => {
+          if (typeof f.validExcute !== "undefined") {
+            if (!f.validExcute()) {
+              rtnBool = false;
+            }
           }
-          self.$forceUpdate();
-          self.model.change = self.model.formListChange;
-          self.$emit('change');
         });
-      },
-      fieldsValidExcute() {
-        var self = this;
-        var rtnBool = true;
-        if (typeof self.$refs.Fields !== 'undefined') {
-          self.$refs.Fields.forEach((f) => {
-            if (typeof f.validExcute !== 'undefined') {
+      }
+      return rtnBool;
+    },
+    validExcute() {
+      var self = this;
+      var rtnBool = true;
+      if (this.model.show) {
+        if (!self.fieldsValidExcute()) {
+          rtnBool = false;
+        } else if (this.model.tableData.length < this.model.min) {
+          self.$message({
+            message: this.model.title + " 最少需要" + this.model.min + "条数据",
+            type: "warning",
+            showClose: true,
+          });
+          rtnBool = false;
+        }
+        if (
+          rtnBool &&
+          self.model.required &&
+          this.model.tableData.length === 0
+        ) {
+          self.$message({
+            message: this.model.title + " 表格不能为空",
+            type: "warning",
+            showClose: true,
+          });
+          rtnBool = false;
+        }
+      }
+      return rtnBool;
+    },
+    fieldClickHandler() {},
+    changeHandler(field, rowindex, index, guid) {
+      var self = this;
+      self.model.hiddenHandle(field, index);
+      self.model.requiredHandle(field, index);
+      self.model.change = field.change;
+      self.model.input = field.input; //当前小组件事件作为大组件事件
+      self.model.currentRowIndex = this.model.source.rows.findIndex(
+        (v) => v.$sourceIndex === guid
+      );
+      self.model.currentEventField = field;
+      self.model.currentRow.data = self.model.getCurrentRowData(guid);
+      self.model.currentRow.index = index;
+
+      self.$emit("change");
+      if (field.type !== 19) {
+        self.$forceUpdate();
+      }
+    },
+    inputHandler(field, rowindex, index) {
+      var self = this;
+      self.model.input = field.input; //当前小组件事件作为大组件事件
+      self.$emit("input");
+    },
+
+    popupSearchListHandler(field, index) {
+      var self = this;
+      var submitData = {};
+      var verified = true;
+      var flagSearchlist = false;
+      var tempFormData = self.model.getFormObj();
+      var router = field.moreActionRouter;
+      var check = true;
+      var checkMsg;
+      router.submitFormField.forEach((v) => {
+        self.model.tableData[index].field.forEach((f) => {
+          if (f.model && f.model.id === v) {
+            if (typeof f.validExcute !== "undefined") {
               if (!f.validExcute()) {
-                rtnBool = false;
+                if (f.validMessage) {
+                  if (f.validMessage == "必填") {
+                    self.$message({
+                      message: "【" + f.model.label + "】" + f.validMessage,
+                      type: "error",
+                      showClose: true,
+                    });
+                  } else {
+                    self.$message({
+                      message: f.validMessage,
+                      type: "error",
+                      showClose: true,
+                    });
+                  }
+                } else {
+                  self.$message({
+                    message: "【" + f.model.label + "】不能为空！",
+                    type: "error",
+                    showClose: true,
+                  });
+                }
+                verified = false;
+                return;
               }
             }
-          });
-        }
-        return rtnBool;
-      },
-      validExcute() {
-        var self = this;
-        var rtnBool = true;
-        if (this.model.show) {
-          if (!self.fieldsValidExcute()) {
-            rtnBool = false;
-          }
-          else if (this.model.tableData.length < this.model.min) {
-            self.$message({
-              message: this.model.title + " 最少需要" + this.model.min + "条数据",
-              type: 'warning',
-              showClose: true,
-            });
-            rtnBool = false;
           }
-          if (rtnBool && self.model.required && this.model.tableData.length === 0) {
-            self.$message({
-              message: this.model.title + " 表格不能为空",
-              type: 'warning',
-              showClose: true,
-            });
-            rtnBool = false;
+        });
+        if (!verified) {
+          return;
+        }
+        submitData[v] = self.$common.getDataOfUpperLower(
+          tempFormData[self.model.id][index],
+          v
+        );
+        if (!submitData[v]) {
+          var row = self.model.tableData[index].field.filter((value) => {
+            return self.$common.initialsToLowerCase(value.id) === v;
+          });
+          if (row[0].value == "") {
+            checkMsg = "请先录入" + row[0].label;
+          } else {
+            checkMsg = "未读取到表单项(" + v + ")的值";
           }
+          check = false;
         }
-        return rtnBool;
-      },
-      changeHandler(field, rowindex,index) {
-        var self = this;
-        this.model.change = field.change;
-        self.$emit('change');
-      },
-      inputHandler(field, rowindex, index) {
-        var self = this;
-        this.model.input = field.input;//当前小组件事件作为大组件事件
-        self.$emit('input');
-      },
-    }
-  }
-</script>
-<style> 
-  .ct-form-repeat {
-    display: table;
-    background: aliceblue;
-    padding:10px;
-  }
-
-    .ct-form-repeat .list-title {
-      padding-bottom: 5px;
-      text-align: left;
-      display: inline-table;
-      width: 45%;
-    }
+      });
+      if (!verified) {
+        return;
+      }
 
-    .ct-form-repeat .list-button {
-      padding-bottom: 5px;
-      text-align: right;
-      display: inline-table;
-      float: right;
-    }
-    .ct-form-repeat .ct-form-repeat-el-col {
-      border-bottom: 1px dashed #f1706b;
-    }
-      .ct-form-repeat .ct-form-repeat-el-col:last-child {
-        border-bottom: none;
+      if (!check) {
+        self.$message({
+          message: checkMsg,
+          type: "warning",
+          showClose: true,
+        });
+        return;
+      }
+      if (router.id.indexOf("_") === 0) {
+        flagSearchlist = true;
       }
 
+      submitData = router.getActionPara(submitData).para;
+      var dialogOption = {
+        title: router.pageTitle,
+        pane: self.$common.getParentPane(self),
+        content: [
+          {
+            component: flagSearchlist ? "ct-searchlist" : "ct-popupSearchList",
+            attrs: {
+              searchConditionApi: router.actionForSearchLayout,
+              searchFormApi: router.actionForSearchLayout,
+              searchDataApi: router.actionForSearch,
+              apiParam: submitData,
+              singleSelectio: true,
+              width: router.dialogWidth + "px",
+              height: (router.dialogHeight || 500) + "px",
+              documentHeight: self.documentHeight,
+              documentWidth: self.documentWidth,
+              flagPopupSearchlist: flagSearchlist,
+            },
+            on: {
+              submit(option) {
+                field.value = option[field.optionAttrs.value];
+                field.text = option[field.optionAttrs.label];
+                field.options.push(option);
+              },
+            },
+          },
+        ],
+      };
+      this.$common.openDialog(dialogOption);
+    },
+  },
+};
+</script>
+<style>
+.ct-form-repeat {
+  display: table;
+  background: aliceblue;
+  padding: 10px;
+  width: 100%;
+}
+
+.ct-form-repeat .list-title {
+  padding-bottom: 5px;
+  text-align: left;
+  display: inline-table;
+  width: 45%;
+}
 
+.ct-form-repeat .list-button {
+  padding-bottom: 5px;
+  text-align: right;
+  display: inline-table;
+  float: right;
+}
+.ct-form-repeat .ct-form-repeat-el-col {
+  border-bottom: 1px dashed #f1706b;
+}
+.ct-form-repeat .ct-form-repeat-el-col:last-child {
+  border-bottom: none;
+}
 </style>

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -16,7 +16,7 @@
       @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop" :flagAppMode="flagAppMode"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" @closeSideBar="closeSideBar" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
-      @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler"></ct-searchtable>      
+      @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler"></ct-searchtable>      
     </div>
     <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
@@ -380,6 +380,10 @@
         this.selectIndex=-1;
         this.rowClickHandle();
       },
+      simpleRouterRefreshHandler() {
+        this.selectIndex=-1;
+        this.rowClickHandle();
+      },
       saveShortcut(){
         this.$refs.table.getPage(1);
       },

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -7,8 +7,13 @@
           <component v-else class="list-field max-list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" :key="col.keyScreen" :actionRouters="model.actionRouters"
                      @click="clickHandler(col)" @change="changeHandler(col,$event)"></component>
         </template>
-        <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" :actionRouters="model.actionRouters"
-                   @click="clickHandler(col)" @change="changeHandler(col,$event)" @SaveSearchWhere="SaveSearchWhere" @SearchWhereManage="SearchWhereManage" @clichSearchWhere="clichSearchWhere"></component>
+        <template v-for="(col, index) in model.btnScreen" v-if="col.show !== false">
+          <component v-if="col.type===16 || col.type===17 || col.type===18" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" :actionRouters="model.actionRouters"
+            @click="clickHandler(col)" @change="changeHandler(col,$event)" @SaveSearchWhere="SaveSearchWhere" @SearchWhereManage="SearchWhereManage" @clichSearchWhere="clichSearchWhere"></component>
+          <br v-else-if="col.is === 'ct-linefeed'" />
+          <component v-else class="list-field max-list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" :key="col.keyScreen" :actionRouters="model.actionRouters"
+            @click="clickHandler(col)" @change="changeHandler(col,$event)"></component>
+        </template>        
       </div>
       <div class="shortcutFollow max-shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
         <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut" :openType="'detail'"></ct-form>
@@ -17,7 +22,8 @@
         <div style="width:100%">
           <template v-for="(col, index) in highScreenRow" v-if="col.show !== false">
             <br v-if="col.is === 'ct-linefeed'" />
-            <component v-else class="list-field" v-bind="col.listBind" :key="col.keyScreen" :is="col.is" :vmodel="col" :api="model.optionApi" :actionRouters="model.actionRouters" @click="clickHandler(col)"></component>
+            <component v-else class="list-field" v-bind="col.listBind" :key="col.keyScreen" :is="col.is" :vmodel="col" :api="model.optionApi" :actionRouters="model.actionRouters" 
+              @click="clickHandler(col)" @change="changeHandler(col,$event)"></component>
           </template>
         </div>
       </div>
@@ -456,33 +462,33 @@ import dynamicElement from '../../mixins/dynamicElement';
                 }
                 else {
                   if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
-                    //var tempwindow = window.open('about:blank');
-                    //tempwindow.location = field.action;
-                    if (field.action.indexOf("?") > -1) {
-                      self.downloadUrl = field.action + "&" + Math.random();
+                    if(field.action.indexOf(".zip") > -1){
+                      window.location.href = encodeURI(field.action);
                     }
-                    else {
-                      self.downloadUrl = field.action + "?" + Math.random();
+                    else{
+                      if (field.action.indexOf("?") > -1) {
+                        self.downloadUrl = field.action + "&" + Math.random();
+                      }
+                      else {
+                        self.downloadUrl = field.action + "?" + Math.random();
+                      }
                     }
-                    // document.body.addEventListener('click', function() {
-                    //   window.open(field.action, "_blank");
-                    // });
                   }
                   else {
                     field.doAction(submitData, (data) => {
                       if (data.content) {
                         if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
-                          //var tempwindow = window.open('about:blank');
-                          //tempwindow.location = data.content;
-                          if (data.content.indexOf("?") > -1) {
-                            self.downloadUrl = data.content + "&" + Math.random();
+                          if(data.action.indexOf(".zip") > -1){
+                            window.location.href = encodeURI(data.action);
                           }
-                          else {
-                            self.downloadUrl = data.content + "?" + Math.random();
+                          else{                          
+                            if (data.content.indexOf("?") > -1) {
+                              self.downloadUrl = data.content + "&" + Math.random();
+                            }
+                            else {
+                              self.downloadUrl = data.content + "?" + Math.random();
+                            }
                           }
-                          // document.body.addEventListener('click', function() {
-                          //   window.open(data.content, "_blank");
-                          // });
                         }
                         else {
                         }