centaline-data-driven 1.2.12 → 1.2.13

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

package/src/Detail.vue

@@ -7,10 +7,10 @@
 
 <script>
   export default {
-    name: 'DataDrivendetail',
+    name: 'App',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "2"} ,
+        apiParam: {actionType: 1,chanceID: "1"} ,
       }
     },
     mounted() {

package/src/Edit.vue

@@ -1,27 +1,71 @@
 <template>
   <div id="app">
-    <formListTable></formListTable>
+       <viewer :images="pics">
+            <img v-for="src in pics" :src="src" :key="src">
+      </viewer>
   </div>
   
 </template>
 
 <script>
   import formListTable from './centaline/dynamicForm/src/dynamicFormListTable'
+ import Viewer from 'v-viewer'
+ import 'viewerjs/dist/viewer.css'
+ import Vue from 'vue'
+ Vue.use(Viewer)
   export default {
     name: 'App',
     components: {
-      'formListTable': formListTable
+      'formListTable': formListTable,
     },
     data() {
       return {
-        template: ""
+        template: "",
+         pics:[
+           'https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943',
+           'https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943',
+           'https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943',
+       ],
       }
     },
     methods: {
       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,40 +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="'/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="'PropertyRealLook/getLayoutOfNew'" :apiParam="para"></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: "1494206747714392064", actionType: 2}
-        para: {chanceID: "1", 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

@@ -2,7 +2,7 @@
   <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="'/estatemanage/estatlist/getLayoutOfSearch'" :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist>
     <!-- <ct-searchlist :searchConditionApi="'/WorklistList/getLayoutOfSearch'" :searchDataApi="'/WorklistList/getListOfSearchModel'" :searchCategoryApi="'/WorklistList/getLayoutOfSearchCategory'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
@@ -12,7 +12,6 @@
                    ></ct-searchlist> -->
 
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
-    <ct-searchlist :searchConditionApi="'/PropertyStatusList/getLayoutOfSearch'" :searchDataApi="'/PropertyStatusList/getListOfSearchModel'"  :apiParam="para"></ct-searchlist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -24,8 +23,7 @@
     data() {
       return {
         //para: { agentId: "1424932685198864386", estateId: "L201402181627000007233", estateName: "271医院宿舍区", pageOnly: "true", pageTitle: "销控房源列表" }
-        // para: {}
-        para: {paramKey: "PropertyStatusID", code: "002.001", name: "盘源状态", paramName: "盘源状态"}
+        para: {}
       }
     },
     mounted() {

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/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/dynamicT/src/dynamicT.vue

@@ -24,15 +24,19 @@
           {{validMessage}}
         </span>
       </transition>
-      <ct-quick-input v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @input="model.value=$event"></ct-quick-input>
+      <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @click="model.value=$event"></ctQuickInputSos>
     </div>
   </div>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
+  import ctQuickInputSos from '../../quickInputSos/src/quickInput'
   export default {
     name: 'ct-text',
     mixins: [dynamicElement],
+     components: {
+      'ctQuickInputSos': ctQuickInputSos,
+    },
     props: {
       vmodel: Object
     },

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -8,7 +8,7 @@
 
         <template v-if="pageType=='form'">
           <div style="height: calc(100vh - 120px);">
-            <div style="border:1px solid red" :style="{'width':(width?width+'px':'auto'),'height':(height?height+'px':'auto')}">
+            <div class="ct-form" :style="{'width':(width?width+'px':'auto'),'height':(height?height+'px':'auto')}">
               <ct-form :api="formApi" :api-param="apiParam" :width="width" :height="height"></ct-form>
             </div>
           </div>
@@ -99,4 +99,10 @@
     #app-Tree .el-main .ct-table-content {
       padding: 0;
     }
+
+#app-Tree .el-main ct-form{border: 1px solid #cfcece; 
+    -webkit-box-shadow: #cfcece 0px 7px 9px 0px!important;
+    border-radius: 6px !important; 
+    margin-top: 14px;}
+    
 </style>

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/centaline/loader/src/ctl/QuickInputSos.js

@@ -0,0 +1,127 @@
+import base from '../../index';
+import Base from './Base';
+import valid from '../../../validate/index';
+import Axios from 'axios';
+import common from '../../../common';
+import Vue from 'vue';
+const QuickInput = function (source, moreActionRouter) {
+  var rtn = {
+    options: [{ code: source.code1, name: source.name1 }],
+    get text() {
+      if (source.isList && source.name1 && rtn.attrs.placeholder && rtn.displayLabelAfterSelected) {
+        return rtn.attrs.placeholder + ":" + source.name1;
+      }
+      return source.name1;
+    },
+    set text(v) {
+      if(source.displayName1)
+      {
+        source.displayName1 = v;
+      }else
+      {
+        source.name1 = v;
+      }
+    },
+    get optionColCount() {
+      return parseInt(source.optCount) || 5;
+    },
+    set optionColCount(v) {
+      source.optCount = v;
+    },
+    get parentName() {
+      return source.parentField;
+    },
+    reset() {
+      this.value = this.defaultValue;
+      this.text = this.defaultText;
+    },
+    defaultText: source.defaultName1,
+    get labelValue() {
+      if (source.name1) {
+        return source.name1;
+      }
+      else {
+        return '';
+      }
+    },
+    optionAttrs: {
+      value: 'code',
+      label: 'name',
+      displayLabel:'displayName',
+      actionType: 'actionType',
+      flagDeleted: 'flagDeleted'
+    },
+    attrs: {
+      style: {
+        width: '100%'
+      },
+      clearable: true,
+      filterable: true,
+      remote: true
+    },
+    apiParams: {
+      paramName: 'k',
+      parentName: 'pk',
+      parentValue: 'pv',
+      search: 't'
+    },
+    get clearable() {
+      if (typeof source.clear === 'undefined') {
+        return true;
+      }
+      if (source.clear) {
+        return true;
+      }
+      else {
+        return false;
+      }
+    },
+    set clearable(v) {
+      source.clear = v;
+    },
+    get searchTick() {
+      return parseInt(source.searchTick) || 250;
+    },
+    set searchTick(v) {
+      source.searchTick = v;
+    },
+    getOptions(paramsAction,key) {     
+      var self = this;
+      var apiAddrs = paramsAction || this.api;
+      var params = {
+        action: apiAddrs,
+        para: {
+          paramName: self.paramName,
+          parentValue: rtn.getFormParentFieldPara(),
+          key: key,
+        }
+      };
+      Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
+        if (response.rtnCode === 200) {
+          self.options = response.content;
+        }
+      });
+    },
+    moreActionRouter: moreActionRouter,//更多高级查询
+    //弹出SearchList类型，0不弹框，1点按钮弹框，2直接点搜索框弹框
+    get popupSearchListType() {
+      if (moreActionRouter) {
+        return 1;
+      }
+
+      return 0;
+    },
+    get moreActionBtnName() {
+      if (moreActionRouter) {
+        return moreActionRouter.label;
+      }
+
+      return null;
+    },
+  };
+  rtn = base.copy(Base(source), rtn);
+  rtn = base.copy(rtn, valid.Init(rtn));
+  return rtn;
+}
+
+export default QuickInput;

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

@@ -35,6 +35,7 @@ const loader = {
   Detail: require("./ctl/Detail.js").default,
   PhotoSelect: require("./ctl/PhotoSelect.js").default,
   PhotoSelectList: require("./ctl/PhotoSelectList.js").default,
+  QuickInputSos: require("./ctl/QuickInputSos.js").default,
 };
 
 export default loader;

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

@@ -3,7 +3,7 @@
     <el-dropdown @command="handleCommand" @visible-change="getOptions">
       <i class="el-icon-more"></i>
       <el-dropdown-menu ref="dropdown" slot="dropdown">
-        <el-dropdown-item v-for="(op, index) in options" :key="index" :command="op.Code">{{op.Name}}</el-dropdown-item>
+        <el-dropdown-item v-for="(op, index) in options" :key="index" :command="op.code">{{op.name}}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
   </div>
@@ -30,7 +30,7 @@
           var params = {
             action: this.action,
             para: {
-              paramName: this.paramName1
+              paramName: this.pn
             }
           };
           this.$api.postHandler(this.$common.globalUri(), params).then((response) => {

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

@@ -0,0 +1,96 @@
+<template>
+  <div class="ct-quickInput">
+
+     <el-popover ref="pop" placement="bottom-start" v-model="showDrop"  trigger="click">
+            <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>
+  </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
+    },
+     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;
+      }
+      this.searchInputHandle();
+    },
+    data() {
+      return {
+        options:[],
+        searchText: "",
+        showDrop: false,
+       
+      };
+    },
+    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);
+      },
+    },
+    mounted() {
+      
+    }
+  }
+</script>
+<style>
+  .ct-quickInput .el-icon-more:hover {
+    cursor: pointer;
+    color: #409EFF;
+  }
+</style>

package/src/main.js

@@ -8,12 +8,12 @@ import App from './App';
 import router from './router';
 import centaline from './centaline/index';
 
+
 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 +21,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 +28,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.eyJsb2dpbl91c2VyX2tleSI6ImJhMjA1MWJmLTM3MTQtNGQ2Yi1iMmMzLTM0YzBlOWE4ZjBiNSJ9.Aery7bMGAE_HTh1yX3vFFczELt0dB97ca5jwXXcp8hdhJ_2o8XTrQi314GVz4YoM2dfh8i9qFiU0FCr7TJgZyA',
+        originalRequestURL: 'http://10.88.23.22:9999',
+        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"A-%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}'
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作