centaline-data-driven 1.1.53 → 1.1.57

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.53",
+  "version": "1.1.57",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Edit.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="app">
-    <formListTable></formListTable>
+    <!-- <formListTable></formListTable> -->
+    <el-button @click="copyField">test</el-button>
   </div>
   
 </template>
@@ -21,7 +22,40 @@
       TestEdit() {
         this.$api.post('http://10.88.22.52:2828//api/values/edit', { content: this.template }, (data) => {
         });
-      }
+      },
+        copyField()
+    {
+      debugger;
+       var self = this;
+       var dialogOption = {
+        title: "复制控件",
+        content: [
+          {
+            component: "ct-form",
+            attrs: {
+              showTitle: false,
+              api: "/forminfo/readTargetDetail",
+              apiParam: {
+                formId: "1ae27876-a938-4ea5-aeab-fb2a7b067a2f",
+                actionType: 3,
+              },
+              width: "1300px",
+              height: "650px",
+            },
+            on: {
+              submit(ev) {
+                self.$common.closeDialog(dialogOption.dialog);
+              },
+              closeDialog() {
+                
+              },
+            },
+          },
+        ],
+      };
+      self.$common.openDialog(dialogOption);
+
+    },
     },
     created() {
       //this.$api.get('http://10.88.22.52:2828//api/values/test', null, (data) => {

package/src/Form.vue

@@ -1,39 +1,24 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'/property/readDetail'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--:api="'FormSample/formdata'"-->
     <!--<ct-form :source="formdata.content"></ct-form>-->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
-    <!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
-    <!-- <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'Worklist/getLayoutOfAudit'" :apiParam="apiParam"></ct-form>
-    <!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
 
 <script>
   export default {
-    name: 'DataDrivenForm',
+    name: 'App',
     data() {
       return {
-        // apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
-        // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
-        // apiParam: {SN: "13557_132", UserID: "wuhan3"},
-        // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
-        // apiParam: {chanceID: "1", actionType: 2} ,
-        apiParam: {worklistID: "1491261975253094400", actionType: 2}
-        // apiParam: {
-        //   actionType: 2,
-        //   agentId: "1450283160825425922",
-        //   estateId: "B6E6B3D8-FDF2-4AF8-91E6-B348D637E993",
-        //   pageOnly: true,
-        //   pageStyle: 2,
-        //   propertyId: "14102015-0736-9265-205A-451687BF7062",
-        //   relProId: "1475708315466829833",
-        // }
+        apiParam: {
+        actionType: 2,
+        jsonData: {searchFields: {fields: []}}
+        } ,
       }
     },
     methods: {

package/src/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
+     <ct-searchlist :searchConditionApi="'/system/menulist/getLayoutOfSearch'" :searchDataApi="'/system/menulist/getList'"></ct-searchlist>
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/SearchTree.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam"
-                 :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
+                 :searchConditionApi="'/SystemParameterCatalogList/getListOfSearchModel'"
                  :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
@@ -14,7 +14,11 @@
     data() {
       return {
         isShowSearchlist: false,
-        apiParam: {}
+        apiParam: {
+          flagSearch: true,
+          searchFields: {},
+          pageAttribute: {pageIndex: 1}
+        }
       }
     },
     methods: {

package/src/centaline/css/common.css

@@ -736,8 +736,18 @@ 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;
+}
+/* 重置弹层引用列表样式居上高度 */
+.ct-dialog_content .ct-searchtable{
+  margin-top: 0px!important;
 }

package/src/centaline/css/max.css

@@ -146,7 +146,7 @@
     width:4px;
     height:6px;
 }
-.ct-table .cell:last-child{
+.ct-table-auto{
     white-space: nowrap;
 }
 .max-cover-list-item .el-input__icon{
@@ -205,4 +205,4 @@
 .el-input-group__append, .el-input-group__prepend {
     color: #666;
     border-color:#cecece;
-  }
+  }

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">
@@ -765,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,10 @@
                :headers="headers"
                :before-upload="beforeUploadProcess"
                :on-success="handleAvatarSuccess"
-               :on-progress="uploadProcess">
+               :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 +28,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 +66,7 @@
     },
     data() {
       return {
+        imgValid:true,
       };
     },
     computed: {
@@ -107,7 +109,7 @@
       },
       handlePictureCardPreview(file) {
         if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
-          //this.$openPreview([file.mediaUrl]);
+          // this.$openPreview([file.mediaUrl]);
         }
         else {
           if (file.rightDownload) {
@@ -153,10 +155,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);

package/src/centaline/dynamicHyperLink/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicHyperLink);
 }
 
-export default dynamicHyperLink
+export default dynamicHyperLink

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/dynamicPlaceHolder/index.js

@@ -8,4 +8,4 @@ if (typeof window !== 'undefined' && window.Vue) {
   window.Vue.use(dynamicPlaceHolder);
 }
 
-export default dynamicPlaceHolder
+export default dynamicPlaceHolder

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

@@ -16,17 +16,17 @@
     data() {
       return {
         activeName: '1',
-        editableTabs: [
-          { name: '1', title: '用户管理' },
-          { name: '2', title: '配置管理' },
-          { name: '3', title: '角色管理' },
-          { name: '4', title: '定时任务补偿' },
-          { name: '5', title: '定时任务补偿2' },
-          { name: '6', title: '定时任务补偿3' },
-          { name: '7', title: '定时任务补偿4' },
-          { name: '8', title: '定时任务补偿5' },
-          { name: '9', title: '定时任务补偿6' },
-          { name: '10', title: '定时任务补偿7' }
+        editableTabs: [
+          { name: '1', title: '用户管理' },
+          { name: '2', title: '配置管理' },
+          { name: '3', title: '角色管理' },
+          { name: '4', title: '定时任务补偿' },
+          { name: '5', title: '定时任务补偿2' },
+          { name: '6', title: '定时任务补偿3' },
+          { name: '7', title: '定时任务补偿4' },
+          { name: '8', title: '定时任务补偿5' },
+          { name: '9', title: '定时任务补偿6' },
+          { name: '10', title: '定时任务补偿7' }
         ],
       }
     },

package/src/centaline/dynamicSo/src/dynamicSo.vue

@@ -26,6 +26,7 @@
           </span>
         </div>
       </div>
+      <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
       <transition name="el-fade-in">
         <span v-show="!valid" class="errorMessage">
           {{validMessage}}

package/src/centaline/dynamicSos/src/dynamicSos.vue

@@ -29,6 +29,7 @@
           </span>
         </div>
       </div>
+      <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
       <transition name="el-fade-in">
         <span v-show="!valid" class="errorMessage">
           {{validMessage}}

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/PlaceHolder.js

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const PlaceHolder = function (source) {
   var rtn = {
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
   return rtn;
 };
 
-export default PlaceHolder;
+export default PlaceHolder;

package/src/main.js

@@ -12,8 +12,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",
+  baseUrl: 'http://10.88.23.22:9999/v1/form/router',
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -21,12 +20,6 @@ Vue.use(centaline, {
     openTab: function (action) {
       alert("打开tab页:" + action)
     },
-    openDetail: function (action) {
-      alert("打开tab页:" + action)
-    },
-    openPropertyDetailRET: function (submitData, pageTitle, parentModel) {
-      alert("打开tab页:" + pageTitle)
-    },
     // 关闭当前tab
     closeTab: function () {
       alert("关闭当前tab")
@@ -34,10 +27,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '3007e478-86db-4d5a-8ce0-7253afb746b2',
-        estateId: '20210729104021C49F04B55C50F6AF58',
-        originalRequestURL: 'http://10.88.22.67:8080',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',
+        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjFiNTBiODcyLTdhZDAtNDIzZC05MDBhLTU1NzUwOTA0OTMyNSJ9.yQA99wDa3a-dZKSemFOrWZxyKZ6NtWmYVehf10OSUK8eO8Par7aZqboxCNMfEjIlXDGu5NH9u0KFcHQ7_17YMg',
+        originalRequestURL: 'http://10.88.23.22:9999',
+        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"A-%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}'
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作