centaline-data-driven 1.1.52 → 1.1.56

package/build/centaline/webpack.centaline.conf.js

@@ -79,7 +79,7 @@ module.exports = {
       amd: 'vue'
     },
     'element-ui': 'Element',
-    'element-ui/packages/image/src/image-viewer': 'image-viewer'
+    // 'element-ui/packages/image/src/image-viewer': 'image-viewer'
   },
   devtool: '#eval-source-map'
 }

package/package.json

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

package/src/Form.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/roomtype/readDetail'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--:api="'FormSample/formdata'"-->
     <!--<ct-form :source="formdata.content"></ct-form>-->
@@ -17,7 +17,7 @@
       return {
         apiParam: {
         actionType: 2,
-        propertyID: "1"
+        jsonData: {searchFields: {fields: []}}
         } ,
       }
     },

package/src/centaline/css/common.css

@@ -736,3 +736,14 @@ html {
 .ct-dialog_body .el-card__body{
   padding: 0px 3px 10px 10px!important;
 }
+.ct-text .ct-font-size-mini{
+  padding-left: 5px!important;
+}
+.ct-text .ct-font-size-mini span{
+  display: inline-block;
+  margin-top: 1px;
+  color: #388cd3;
+}
+.lableinput .el-input__inner{
+  border: none !important;
+}

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -33,7 +33,7 @@
            
             <div class="head-but">
               <button type="button" class="el-button f-wb el-button--default el-button--mini max-default">去出租 &gt;&gt;</button>
-              <button type="button" class="el-button el-button--info el-button--mini max-report">
+              <button type="button" class="el-button el-button--info el-button--mini max-report rel">
                 <img src="../../../assets/dian.png" alt="" class="report">
                 <ul class="report-cont">
                    <li>举报房源</li>
@@ -753,14 +753,14 @@
           }
           .report-cont{
             display: none;
-            width: 80px;
+            width: 115px;
             background: #fff;
             -webkit-box-shadow: 0 0 10px 0 rgb(0 0 0 / 15%);
             box-shadow: 0 0 10px 0 rgb(0 0 0 / 15%);
             border-radius: 5px;
             list-style: none;
             position: absolute;
-            left: -22px;
+            left: -61px;
             top: 26px;
             padding: 5px 0;
             color: #333;

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

@@ -38,7 +38,7 @@
                 :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi"></component>                
               </div>
               <div class="mt5">
-                <button type="button" class="el-button el-button--info el-button--mini max-report"
+                <button type="button" class="el-button el-button--info el-button--mini max-report rel"
                 v-if="model.actionRoutersMoreList !== null">
                   <img src="../../../assets/dian.png" alt="" class="report">
                   <ul class="report-cont">
@@ -144,9 +144,7 @@
                     <div class="row-i"><span>装修：</span><span>豪装</span></div>
                     <div class="row-i"><span>租赁期：</span><span>半年</span></div>
                     <div class="row-i"><span>付款方式：</span><span>一次性全款</span></div>
-                    <div class="row-i">
-                      <span>可否注册公司：</span><span>是</span>
-                    </div>
+                    <div class="row-i"><span>可否注册公司：</span><span>是</span></div>
                   </div>
               </div>
               <div class="info-conten-b" v-show="allInfo">
@@ -767,14 +765,14 @@
           }
           .report-cont{
             display: none;
-            width: 80px;
+            width: 115px;
             background: #fff;
             -webkit-box-shadow: 0 0 10px 0 rgb(0 0 0 / 15%);
             box-shadow: 0 0 10px 0 rgb(0 0 0 / 15%);
             border-radius: 5px;
             list-style: none;
             position: absolute;
-            left: -22px;
+            left: -61px;
             top: 26px;
             padding: 5px 0;
             color: #333;

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

@@ -13,9 +13,9 @@
                :headers="headers"
                :before-upload="beforeUploadProcess"
                :on-success="handleAvatarSuccess"
-               :on-progress="uploadProcess">
+               >
       <i slot="default" class="el-icon-plus"></i>
-      <div slot="tip" class="el-upload__tip errorMessage" v-show="!valid">{{validMessage}}</div>
+      <div slot="tip" class="el-upload__tip errorMessage" v-show="!imgValid">{{validMessage}}</div>
       <div slot="file" slot-scope="{file}" :title="file.fileName">
         <div class="cover-list-item">
           <el-image fit="fill" :src="file.url"
@@ -27,7 +27,7 @@
           <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
             <i class="el-icon-delete" @click="handleRemove(file)"></i>
           </span>
-          <span class="cover-list-item-span">
+          <span class="cover-list-item-span" v-if="model.paramName">
             <!--锁定-->
             <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
               &nbsp;{{file.mediaLabelName}}
@@ -65,6 +65,7 @@
     },
     data() {
       return {
+        imgValid:true,
       };
     },
     computed: {
@@ -107,7 +108,7 @@
       },
       handlePictureCardPreview(file) {
         if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
-          //this.$openPreview([file.mediaUrl]);
+          // this.$openPreview([file.mediaUrl]);
         }
         else {
           if (file.rightDownload) {
@@ -153,10 +154,14 @@
       },
       //上传之前的钩子
       beforeUploadProcess(files) {
+        let that=this;
         if (this.model.max) {
           if (this.model.getfileListLength() >= this.model.max) {
             this.validMessage = "附件最多" + this.model.max + "个";
-            this.valid = false;
+            this.imgValid = false;
+            setTimeout(() => {
+              that.imgValid = true;
+             }, 3000) 
             return false;
           }
         }

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

@@ -33,7 +33,7 @@
         </el-tabs>
         <!--分组-->
         <el-collapse v-else v-model="collapseActiveNames" @change="collapseHandleChange">
-          <el-collapse-item v-for="(item, index) in collapse" v-if="item.show !== false" :key="index" :title="item.label" :name="index">
+          <el-collapse-item v-for="(item, index) in collapse" v-if="item.show !== false" :key="index" :title="item.label" :name="index" :disabled="item.lock">
             <template slot="title">
               <i class="sign"></i>
               {{item.label}}
@@ -167,7 +167,7 @@
           }
           else if (v.is === 'ct-group') {
             self.collapse.push(v);
-            if (v.isExpand) {
+            if (v.lock || v.isExpand) {
               realCollapseActiveNames.push(self.collapse.length - 1);
             }
             self.collapseActiveNames.push(self.collapse.length - 1);
@@ -217,6 +217,16 @@
         var router = this.model.buttons.find((v) => {
           return v.id === field.id;
         });
+        if(router==undefined){
+            router = this.model.links.find((v) => {
+            return v.id === field.id;
+          });
+        }
+        if(router==undefined){
+            router = this.model.actionRouters.find((v) => {
+            return v.id === field.id;
+          });
+        }
         this.clickHandler(router);
       },
       clickHandler(field, submitData) {
@@ -224,61 +234,139 @@
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
         
-        var clickAcion = function (field) {  
-          if (field.isSubmit) {
-            let verified = true;
-            if (self.validExcute()) {
+        var clickAcion = function (field) {
+          //若不是客户端方法，则直接访问接口
+          if (!field.isClientFuntion) {
+            if (field.isSubmit) {
+              let verified = true;
+              if (self.validExcute()) {
+                if (typeof field.onClick !== 'undefined') {
+                  verified = self.$common.excute.call(self.model.scripts, field.onClick);
+                }
+
+                if (verified) {
+                  //action有值，提交到后台
+                  if (field.action) {
+                    field.disabled = true;//提交按钮禁用
+                    self.model.pageDisabled= true;
+                    field.doAction(self.getFormObj(), (data) => {
+                      if (data.rtnCode === 200) {
+                        if (self.model.flagAlertClose) {
+                          self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning'
+                          }).then(() => {
+                            //如果没有弹框 则关闭tab页
+                            if (self.$common.dialogList && self.$common.dialogList.List.length === 0) {
+                              if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
+                                self.$common.getDataDrivenOpts().handler.closeTab();
+                              }
+                            }
+                            self.$emit('submit', { formData: self.model, responseData: data });
+                          }).catch(() => {
+                            self.init();
+                          });
+                        }
+                        else {
+                          self.$emit('submit', { formData: self.model, responseData: data });
+                        }
+                        if (self.parentModel) {
+                          self.parentModel.$vue.closeTabThen(data);
+                        }
+                      }
+                      field.disabled = false;                    
+                      self.model.pageDisabled= false;
+                    });
+                  }
+                  //无值，触发submit事件
+                  else {
+                    self.$emit('submit', { formData: self.model, responseData: {} });
+                  }
+                }
+              }
+            }
+            else {
               if (typeof field.onClick !== 'undefined') {
                 verified = self.$common.excute.call(self.model.scripts, field.onClick);
               }
 
-              if (verified) {
-                //action有值，提交到后台
-                if (field.action) {
-                  field.disabled = true;//提交按钮禁用
-                  self.model.pageDisabled= true;
-                  field.doAction(self.getFormObj(), (data) => {
-                    if (data.rtnCode === 200) {
-                      if (self.model.flagAlertClose) {
-                        self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
-                          confirmButtonText: '确定',
-                          cancelButtonText: '取消',
-                          type: 'warning'
-                        }).then(() => {
-                          //如果没有弹框 则关闭tab页
-                          if (self.$common.dialogList && self.$common.dialogList.List.length === 0) {
-                            if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
-                              self.$common.getDataDrivenOpts().handler.closeTab();
-                            }
-                          }
-                          self.$emit('submit', { formData: self.model, responseData: data });
-                        }).catch(() => {
-                          self.init();
+              if (!submitData) {
+                submitData = {};
+                var tempFormData = self.model.getFormObj();
+                field.submitFormField.forEach((v) => {
+                  submitData[v] = tempFormData[v];
+                });
+              }
+
+              if (field.isOpenForm) {
+                var dialogOption = {
+                  title: field.pageTitle,
+                  pane: self.$common.getParentPane(self),
+                  content: [{
+                    component: 'ct-form',
+                    attrs: {
+                      //ssource: data.content,
+                      api: field.action,
+                      apiParam: field.getActionPara(submitData).para,
+                      showTitle: false,
+                      width: field.dialogWidth + 'px',
+                      height: field.dialogHeight + 'px'
+                    },
+                    on: {
+                      submit(ev) {
+                        self.model.updateFields(ev, () => {
+                          self.$refs.Fields.forEach((fd) => {
+                            fd.$forceUpdate();
+                          });
                         });
+                        self.$common.closeDialog(dialogOption.dialog);
                       }
-                      else {
-                        self.$emit('submit', { formData: self.model, responseData: data });
-                      }
-                      if (self.parentModel) {
-                        self.parentModel.$vue.closeTabThen(data);
+                    }
+                  }]
+                };
+                self.$common.openDialog(dialogOption);
+              }
+              else if (field.isOpenList) {
+                var dialogOption = {
+                  title: field.pageTitle,
+                  pane: self.$common.getParentPane(self),
+                  content: [{
+                    component: 'ct-searchlist',
+                    attrs: {
+                      searchConditionApi: field.actionForSearchLayout,
+                      searchDataApi: field.actionForSearch,
+                      apiParam: submitData,
+                      width: field.dialogWidth + 'px',
+                      height: field.dialogHeight + 'px'
+                    },
+                    on: {
+                      submit(ev) {
+                        self.model.updateFields(ev, () => {
+                          self.$refs.Fields.forEach((fd) => {
+                            fd.$forceUpdate();
+                          });
+                        });
+                        self.$common.closeDialog(dialogOption.dialog);
                       }
                     }
-                    field.disabled = false;                    
-                    self.model.pageDisabled= false;
-                  });
-                }
-                //无值，触发submit事件
-                else {
-                  self.$emit('submit', { formData: self.model, responseData: {} });
-                }
+                  }]
+                };
+                self.$common.openDialog(dialogOption);
+              }
+              else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
+                submitData = field.getActionPara(submitData).para;
+                self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
+              }
+              else if (field.isBrowserNewTab) {// 浏览器打开
+                submitData = field.getActionPara(submitData).para;
+                let query = self.$common.objectToQueryStr(submitData);
+                window.open(field.action + query, "_blank");
               }
             }
           }
+          //执行客户端脚本
           else {
-            if (typeof field.onClick !== 'undefined') {
-              verified = self.$common.excute.call(self.model.scripts, field.onClick);
-            }
-
             if (!submitData) {
               submitData = {};
               var tempFormData = self.model.getFormObj();
@@ -286,71 +374,11 @@
                 submitData[v] = tempFormData[v];
               });
             }
-
-            if (field.isOpenForm) {
-              var dialogOption = {
-                title: field.pageTitle,
-                pane: self.$common.getParentPane(self),
-                content: [{
-                  component: 'ct-form',
-                  attrs: {
-                    //ssource: data.content,
-                    api: field.action,
-                    apiParam: field.getActionPara(submitData).para,
-                    showTitle: false,
-                    width: field.dialogWidth + 'px',
-                    height: field.dialogHeight + 'px'
-                  },
-                  on: {
-                    submit(ev) {
-                      self.model.updateFields(ev, () => {
-                        self.$refs.Fields.forEach((fd) => {
-                          fd.$forceUpdate();
-                        });
-                      });
-                      self.$common.closeDialog(dialogOption.dialog);
-                    }
-                  }
-                }]
-              };
-              self.$common.openDialog(dialogOption);
-            }
-            else if (field.isOpenList) {
-              var dialogOption = {
-                title: field.pageTitle,
-                pane: self.$common.getParentPane(self),
-                content: [{
-                  component: 'ct-searchlist',
-                  attrs: {
-                    searchConditionApi: field.actionForSearchLayout,
-                    searchDataApi: field.actionForSearch,
-                    apiParam: submitData,
-                    width: field.dialogWidth + 'px',
-                    height: field.dialogHeight + 'px'
-                  },
-                  on: {
-                    submit(ev) {
-                      self.model.updateFields(ev, () => {
-                        self.$refs.Fields.forEach((fd) => {
-                          fd.$forceUpdate();
-                        });
-                      });
-                      self.$common.closeDialog(dialogOption.dialog);
-                    }
-                  }
-                }]
-              };
-              self.$common.openDialog(dialogOption);
-            }
-            else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
-              submitData = field.getActionPara(submitData).para;
-              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
-            }
-            else if (field.isBrowserNewTab) {// 浏览器打开
-              submitData = field.getActionPara(submitData).para;
-              let query = self.$common.objectToQueryStr(submitData);
-              window.open(field.action + query, "_blank");
-            }
+            submitData = field.getActionPara(submitData).para;
+            let title=field.pageTitle==undefined ?field.label:field.pageTitle;
+            submitData.actionType=field.actionType;
+            var fun =self.$common.getDataDrivenOpts().handler[field.action];
+            fun(submitData,title,self.model);
           }
         }
 

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -2,7 +2,7 @@
   <div class="field-top">
     <div class="ct-text" style="width:100%;display:flex" v-if="model !== null">
       <el-input v-model="model.labelValue" v-bind="model.attrs"
-                :class="[model.showLabel?'showLabel':'',!valid?'inputError':'']"
+                :class="[model.showLabel?'showLabel':'',!valid?'inputError':'','lableinput']"
                 :type="model.showLabel? 'text':'textarea'"
                 style="flex:1" autosize :readonly="true" :disabled="model.lock" autocomplete="on">
         <div v-if="model.showLabel && model.label" slot="prepend" class="" :class="[model.labelClass]">

package/src/centaline/formData/index.js

@@ -231,7 +231,6 @@ const formData = {
     //获取后台数据，并返回脚本。
     execServerScript(action, object, successCallback) {
         let formData = this;//作用域保存
-debugger;
         //是否是行内触发的
         let data = this.getListField(this.form.scripts.$fd, null, null);
         object.editMode = data ? 1 : 0;

package/src/centaline/imgPreview/src/imgPreview.vue

@@ -5,7 +5,7 @@
 </template>
 <script>
   //该组件打包被排除（会导致包大很多），不排除的话无法使用，todo待更新
-  //import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+  // import ElImageViewer from "element-ui/packages/image/src/image-viewer";
   export default {
     name: 'ctImgPreview',
     data() {
@@ -15,7 +15,7 @@
       };
     },
     components: {
-      //ElImageViewer
+      // ElImageViewer
     },
     methods: {
       closeViewer() {

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

@@ -27,6 +27,7 @@ const box = function (source, fileSourceList, router, optionApi) {
       },
       _fileList: [],
       get fileList() {
+        debugger
         if (this._fileList.length !== 0) {
           return rtn._fileList;
         }
@@ -41,6 +42,7 @@ const box = function (source, fileSourceList, router, optionApi) {
         return rtn._fileList;
       },
       getfileListLength() {
+        debugger;
         return rtn.fileList.length;
       },
       optionModel: {
@@ -210,6 +212,7 @@ const box = function (source, fileSourceList, router, optionApi) {
         classify.file.source.mediaLabelID = classify.option[rtn.optionModel.optionAttrs.value];
       },
       handleAvatarSuccess(res, file, fileList) {
+        debugger;
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
           fileSourceList.push(res.content[0]);
@@ -238,6 +241,7 @@ const box = function (source, fileSourceList, router, optionApi) {
         }
       },
       deleteFile(file, forceDelete) {
+        debugger;
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {
             if (forceDelete) {

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

@@ -118,6 +118,23 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           return rtn._links;
         }
       },
+      _actionRouters: null,
+      get actionRouters() {
+        if (rtn._actionRouters !== null) {
+          return rtn._actionRouters;
+        }
+        else {
+          rtn._actionRouters = [];
+          if (source.actionRouters) {
+            source.actionRouters.forEach((v) => {
+              var button = Router(v);
+              button.is = "ct-btn";
+              rtn._actionRouters.push(button);
+            });
+          }
+          return rtn._actionRouters;
+        }
+      },
       get optionApi() {
         return source.parameterAction;
       },

package/src/main.js

@@ -12,7 +12,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: 'http://10.88.22.13:7070/v1/form/router',
+  baseUrl: 'http://10.88.22.67:9999/v1/form/router',
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -27,10 +27,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImI4Mzg3ZjkwLTI3YWItNDA4Yy1hNjRjLTE3ODIxNDM1M2FiNyJ9.4EFMLNBVU1ZCoJ5o-CjXum7IC-Lb2ljZsi-qCNAQcfdw8NIYp7Ul93in3iZCI69sLZz2N6F7Gnxh6Hbj5JLEJg',
-        oldToken: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQwY2ExYmMyLWNiNzMtNDI2Mi05NmM0LThiYjg0NDBkODE3ZCJ9.AIXWKaRyCwxYiPAqGhT0A01YN7tpX_nW9oU5YDwuC3GIRSn5DQS82Kh1Q7u6eHIz1BySWc-SOEqSTB3283_Z7A',
-        estateId: '201509230915485D942241BBA30FF49F',
-        originalRequestURL: 'http://localhost:8080'
+        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjFiNTBiODcyLTdhZDAtNDIzZC05MDBhLTU1NzUwOTA0OTMyNSJ9.yQA99wDa3a-dZKSemFOrWZxyKZ6NtWmYVehf10OSUK8eO8Par7aZqboxCNMfEjIlXDGu5NH9u0KFcHQ7_17YMg',
+        originalRequestURL: 'http://10.88.22.67:9999',
+        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"A-%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}'
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作