npm - centaline-data-driven - Versions diffs - 1.1.65 → 1.1.69 - Mend

centaline-data-driven 1.1.65 → 1.1.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

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

@@ -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 CHANGED Viewed

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

package/src/Edit.vue CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,39 +1,25 @@
 <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="'/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>-->
     <!--<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: "1494180846406602752", 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: 3,
+        roomTypeID: "2202111630507BE6C40D42A44A21B7EE",
+        jsonData: {searchFields: {fields: []}}
+        },
       }
     },
     methods: {

package/src/centaline/css/max.css CHANGED Viewed

@@ -147,8 +147,8 @@
     height:6px;
 }
 .ct-selectOptionVertical::-webkit-scrollbar {
-    width: 6px!important;
-    height:6px!important;
+    width: 2px!important;
+    height:2px!important;
     background-color: #f1f1f1!important;
     display: block!important;
    }
@@ -222,11 +222,9 @@
   .details-content .ct-search-list .ct-searchtable .ct-table-content{
       padding: 0;
   }
-  .icon-more{
-    background: url(../../assets/vertical.png)no-repeat;
-    background-size: 100% 100%;
-    height: 12px;
-    width: 14px;
-    display: inline-block;
-    margin-right: 2px;
-}
+  .lableinput .ct-unitname {
+      display: contents;
+  }
+ .hyperLinkList .el-button + .el-button{
+      margin-left: 0!important;
+  }

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

@@ -16,7 +16,7 @@
                   <span>{{model.fields1Dic.PropertyNo.label}}{{model.fields1Dic.PropertyNo.value}}</span>
                   <span>{{model.fields1Dic.GovNo.label}}{{model.fields1Dic.GovNo.value}}</span>
                   <span class="mr10">{{model.fields1Dic["DistrictName"].value+model.fields1Dic.AreaName.value}}</span>
-                 <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location">
+                  <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location">
                 </div>
                 <div class="title-tags">
                   <div class="t-tag" v-for="(tag, index) in model.actionRouterLabel" :key="index"
@@ -238,25 +238,25 @@
                     <div v-if="col.appID==='Maintain'" class="el-tabs__content">
                         <div v-if="col.list" role="tabpanel" aria-labelledby="tab-first" class="el-tab-pane">
                           <div class="tab-conten">
-                            <img :src="col.list[0].maintainEmpUrl">
+                            <img :src="col.list[0].maintainEmpUrl" alt="" class="location">
                             <div class="user-name">
                               <div class="text">{{col.list[0].maintainEmpName}}</div><span class="user-but">{{col.list[0].maintainDeptName}}</span>
                             </div>
                             <div class="text">{{col.list[0].mobileNo}}</div>
                           </div>
-                          <div v-show="allIn" class="tab-conten">
-                            <img src="/static/img/user-head.d2916812.png">
+                          <div v-show="allIn" v-for="(info, i) in col.list.slice(1,col.list.legth)" :key="i" class="tab-conten">
+                            <img :src="info.maintainEmpUrl">
                             <div class="user-name">
-                              <div class="text">柳晓青1</div><span class="user-but">系统管理组</span>
+                              <div class="text">{{info.maintainEmpName}}</div><span class="user-but">{{info.maintainDeptName}}</span>
                             </div>
-                            <div class="text">13736376666</div>
+                            <div class="text">{{info.mobileNo}}</div>
                           </div>
                           <div class="open-mero" @click="allIn=!allIn">{{allIn?'收起全部':'查看全部'}}
                             <img src="../../../assets/mero.png" alt="" class="mero" >  <!--:class="allIn?'more-colose':'more-open'" -->
                           </div>
                         </div>
                     </div>
-                    <div v-else class="el-tabs__content">
+                    <div v-else class="el-tabs__content" :key="model.tags2Key">
                       <div v-for="(m, i) in col.list" class="text" :key="i">{{m.dutyEmpName}}</div>
                     </div>
                   </el-tab-pane>

package/src/centaline/dynamicFile/src/dynamicFile.vue CHANGED Viewed

@@ -28,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" v-if="model.paramName">
+          <span class="cover-list-item-span" v-if="model.lock||model.paramName">
             <!--锁定-->
             <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
               &nbsp;{{file.mediaLabelName}}

package/src/centaline/dynamicHyperLink/index.js CHANGED Viewed

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

package/src/centaline/dynamicHyperLinkList/src/dynamicHyperLinkList.vue CHANGED Viewed

@@ -1,6 +1,6 @@
 <template>
   <div class="field-top">
-    <div v-if="model !== null" class="ct-text ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
+    <div v-if="model !== null" class="ct-text ct-flex-div hyperLinkList" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
         <span>{{model.label}}</span>
       </div>

package/src/centaline/dynamicL/src/dynamicL.vue CHANGED Viewed

@@ -4,7 +4,7 @@
       <el-input v-model="model.labelValue" v-bind="model.attrs"
                 :class="[model.showLabel?'showLabel':'',!valid?'inputError':'','lableinput']"
                 :type="model.showLabel? 'text':'textarea'"
-                style="flex:1" autosize :readonly="true" :disabled="model.lock" autocomplete="on">
+                style="flex:1" autosize :readonly="true" autocomplete="on">
         <div v-if="model.showLabel && model.label" slot="prepend" class="" :class="[model.labelClass]">
           {{model.label}}
         </div>

package/src/centaline/dynamicPlaceHolder/index.js CHANGED Viewed

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

package/src/centaline/dynamicSeg/src/dynamicSeg.vue CHANGED Viewed

@@ -1,7 +1,6 @@
 <template>
   <div class="field-top">
-    <div style="width:100%;display:flex" v-if="model !== null" class="ct-Seg" :class="[model.attrs.size?'ct-Seg-'+model.attrs.size:''
-       ]">
+    <div style="width:100%;display:flex" v-if="model !== null" class="ct-Seg" :class="[model.attrs.size?'ct-Seg-'+model.attrs.size:'']">
       <div style="flex:1;" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
         <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
           {{model.label}}
@@ -38,7 +37,7 @@
     },
     mounted() {
       var self = this;
-      this.$nextTick(function () {
+      this.$nextTick(function () {
         if (self.vmodel) {
           self.load(self.vmodel);
           self.$emit('loaded');
@@ -61,16 +60,14 @@
       },
       clearClickHandle: function (event) {
         this.model.value = '';
-        //this.$emit('input', this.model.value);
-        //this.$emit('change', this.model.value);
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
+        if(this.model.autoSearch) this.$emit('click');
       },
       changeHandler1: function (event) {
-        //this.$emit('input', this.model.value);
-        //this.$emit('change', this.model.value);
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
+        if(this.model.autoSearch) this.$emit('click');
       }
     }
   }

package/src/centaline/loader/src/ctl/Detail.js CHANGED Viewed

@@ -16,10 +16,11 @@ const Detail = function (source,para ,callBack) {
         detailHeight:750,
         activeIndex1:'0',
         activeIndex2:'0',
-        searchlistKey:0,
+        searchlistKey:0,
+        tags2Key:0,
         _searchConditionApiTags1:null,
         _searchDataApiTags1:null,
-        _paramDataTags1:null,
+        _paramDataTags1:null,
         get fields1() {
             return data.fields1;
         },
@@ -222,8 +223,7 @@ const Detail = function (source,para ,callBack) {
                     function (response) {
                         if (response.rtnCode === Enum.ReturnCode.Successful) {
                             rtn.tags2[i].list=response.content;
-                            rtn.tags2[i].appID=rtn.tags2[i].appID+'1';
-                            rtn.tags2[i].key='1';
+                            rtn.tags2Key= rtn.tags2Key+1;
                         }
                     }
                 );

package/src/centaline/loader/src/ctl/HyperLinkList.js CHANGED Viewed

@@ -27,34 +27,36 @@ const HyperLinkList = function (source) {
         if (source.code1) {
           let codeList=JSON.parse(source.code1);
           codeList.forEach((f) => {
-            let col = {
-              get code() {
-                  return f.code;
-              },
-              get name() {
-                return f.name;
-              },
-              get isHyperLink() {
-                return true;
-              },
-              attrs: {
-                get placeholder() {
-                  return f.placeholder1 || '';
+            if(!f.flagDeleted){
+              let col = {
+                get code() {
+                    return f.code;
                 },
-                get style() {
-                  return f.style;
+                get name() {
+                  return f.name;
                 },
-                get size() {
-                  return  "mini";
+                get isHyperLink() {
+                  return true;
                 },
-                get class() {
-                  var size = f.size ? f.size : "mini";
-                  f.className=f.className||'ct-font-size-' + size;
-                  return f.className;
-                }
-              },
+                attrs: {
+                  get placeholder() {
+                    return f.placeholder1 || '';
+                  },
+                  get style() {
+                    return f.style;
+                  },
+                  get size() {
+                    return  "mini";
+                  },
+                  get class() {
+                    var size = f.size ? f.size : "mini";
+                    f.className=f.className||'ct-font-size-' + size;
+                    return f.className;
+                  }
+                },
+              }
+              rtn._list.push(col);
             }
-            rtn._list.push(col);
           });
         }
         return rtn._list;

package/src/centaline/loader/src/ctl/PlaceHolder.js CHANGED Viewed

@@ -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/centaline/loader/src/ctl/lib/LibFunction.js CHANGED Viewed

@@ -75,6 +75,13 @@ const LibFunction = {
       else if (field.controlType === Enum.ControlType.NumericRange) {
         field.width = field.width || 280;
       }
+      else if (field.controlType === Enum.ControlType.RadioButton) {
+        if(!field.displayLabelAfterSelected){
+          showLabel = false;
+        }
+        field.width = field.width || 300;
+        field.placeholder1 = field.placeholder1 || field.controlLabel || '';
+      }
       else {
         showLabel = false;
         field.width = field.width || 200;
@@ -288,7 +295,7 @@ const LibFunction = {
         item = HyperLink(field, moreActionRouter);
         item.is = 'ct-hyperLink';
         break;
-        case Enum.ControlType.HyperlinkListWithLabel://带标签的超链接列表
+      case Enum.ControlType.HyperlinkListWithLabel://带标签的超链接列表
           item = HyperLinkList(field);
           item.is = 'ct-hyperLinkList';
           break;

package/src/main.js CHANGED Viewed

@@ -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.22.67: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.eyJsb2dpbl91c2VyX2tleSI6IjgyYjQwNjBhLTU4NmMtNGRhYy04N2JkLTJiODQ5N2YxYzQ3MCJ9.c6FZAjNkE8cQqdArVejAWCEe-aVyxeNOVDQhVZfN2MLZCMcAMEeh4d9LSZJAvUxr8yOGZMdQVSjy69kWgE5HyQ',
+        originalRequestURL: 'http://10.88.23.22:9999',
+        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"A-%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}'
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作