centaline-data-driven 1.6.44 → 1.6.45

package/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+        "terminal.integrated.env.windows": {
+        "PATH": "C:\Users\panph.CENTALINE\AppData\Roaming\nvm\v14.21.3;${env:PATH}"
+    }
+}

package/build/centaline/centaline.path.js

@@ -14,10 +14,12 @@ const paths = {
     "dynamicMt": "./src/centaline/dynamicMt/index.js", //多行文本组件
     "dynamicSo": "./src/centaline/dynamicSo/index.js", //单选下拉菜单
     "dynamicSos": "./src/centaline/dynamicSos/index.js", //单选搜索下拉菜单
+    "dynamicSosNew": "./src/centaline/dynamicSosNew/index.js", //单选搜索下拉菜单
     "dynamicSosTt": "./src/centaline/dynamicSosTt/index.js", //电话号码编辑框
     "dynamicT": "./src/centaline/dynamicT/index.js", //文本input组件
     "dynamicL": "./src/centaline/dynamicL/index.js", //文本label组件
     "dynamicTags": "./src/centaline/dynamicTags/index.js", //多选搜索下拉菜单组件
+    "dynamicTagsNew": "./src/centaline/dynamicTagsNew/index.js", //多选搜索下拉菜单组件
     "dynamicForm": "./src/centaline/dynamicForm/index.js", //表单组件
     "dynamicDrop": "./src/centaline/dynamicDrop/index.js", //快捷下拉输入组件
     "dynamicSearchList": "./src/centaline/dynamicSearchList/index.js", //查询表单组件  

package/package.json

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

package/release-log.md

@@ -1,3 +1,12 @@
+# v1.6.45
+2024-06-12
+
+优化
+
+执行客户端脚本传参数支持queryString
+
+可搜索下拉单选框、可搜索下拉多选框 换成 element组件Select选择器
+
 # v1.6.44
 2024-05-30
 

package/src/Detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="appDetail" style="height:100%;">
     <!-- <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail> -->
-    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
+    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
     <!-- <ct-Detail :api="'Estate/readDetailForBrowse'" :apiParam="apiParam" :pageType="'EstateDetail'"></ct-Detail> -->
     <!-- <ct-Detail :api="'EstateBuilding/readDetailForBrowse'" :apiParam="apiParam" :pageType="'EstateBuildingDetail'"></ct-Detail> -->
     <ct-dialog-list></ct-dialog-list>
@@ -15,7 +15,7 @@
       return {        
         apiParam: {
           actionType: 1,
-          chanceID: "10000064",
+          chanceID: "20227983",
           estateID:'',
           buildingID:'9717',
         } ,

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/customermanage/customerReg/getCustomerInfoLayoutOfBrowse'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/estatemanage/estate/getEstateInfo'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "customerId":"f8befff6-2c2a-402f-a879-80b80653aa96","customerCode":"4412c652-702d-4286-a227-e9cd407f5aca","searchFields":{"fields":[{"fieldName1":"EmpId","groupName":"EmpId","operation":2,"searchDataType":3,"searchValue1":"2411120940038E8B1C87525447179987"},{"fieldName1":"ReceptionStatus","groupName":"ReceptionStatus","operation":2,"searchDataType":1,"searchValue1":"1"},{"fieldName1":"SearchArea","groupName":"SearchArea","operation":2,"searchDataType":1,"searchValue1":"1"}]},"pageAttribute":{"pageIndex":1},"columnName":"custName","actionType":1,"pageStyle":2,"pageOnly":true
+          
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -25,8 +25,8 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/UrgentResponsiblePersonList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/UrgentResponsiblePersonList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/MyCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/MyCustomerList/getList'"></ct-searchlist> -->
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/CustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/CustomerList/getList'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/customerfollowlist/getLayoutOfSearch'"  :searchDataApi="'/customermanage/customerfollowlist/getList'"></ct-searchlist>
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/CustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/CustomerList/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/customerfollowlist/getLayoutOfSearch'"  :searchDataApi="'/customermanage/customerfollowlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'"  :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'"  :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
@@ -35,6 +35,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/employeelist/getLayoutOfSearch'"  :searchDataApi="'/employeelist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/system/AreaList/getLayoutOfSearch'"  :searchDataApi="'/system/AreaList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/roomtypelist/getLayoutOfSearch'"  :searchDataApi="'/roomtypelist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/selectionactivitymanage/EvaluationActWorksList/getLayoutOfSearch'"  :searchDataApi="'/selectionactivitymanage/EvaluationActWorksList/getListOfSearchModel'"></ct-searchlist> -->
     <!-- CCES -->
 

package/src/centaline/css/common.css

@@ -54,13 +54,31 @@ html {
      z-index: 2000;
    }
  
+   .ct-so .el-input__inner {
+    padding: 0 30px 0 5px;
+   }
+   .ct-so .el-select {
+    display: block;
+   }
+
      .ct-so .ct-input_inner::-webkit-input-placeholder, .ct-so .ct-input_inner::-moz-placeholder,
      .ct-so .ct-input_inner:-ms-input-placeholder, .ct-so .ct-input_inner:hover, .ct-tags .ct-input_inner::-webkit-input-placeholder,
-     .ct-tags .ct-input_inner::-moz-placeholder, .ct-tags .ct-input_inner:-ms-input-placeholder, .ct-tags .ct-input_inner:hover {
+     .ct-tags .ct-input_inner::-moz-placeholder, .ct-tags .ct-input_inner:-ms-input-placeholder, .ct-tags .ct-input_inner:hover,
+     .ct-so .el-input__inner:hover {
        color: var(--bagGray);
      }
  
-     .ct-so:hover .ct-input_inner:hover, .ct-so:hover .ct-input_inner,.ct-so.isfocus .ct-input_inner:hover, .ct-so.isfocus .ct-input_inner, .ct-tags.isfocus .ct-input_inner:hover, .ct-tags.isfocus .ct-input_inner,
+     .ct-so:hover .ct-input_inner:hover, 
+     .ct-so:hover .ct-input_inner,
+     .ct-so.isfocus .ct-input_inner:hover, 
+     .ct-so.isfocus .ct-input_inner, 
+     .ct-tags.isfocus .ct-input_inner:hover, 
+     .ct-tags.isfocus .ct-input_inner,
+     .ct-so:hover .el-input__inner:hover, 
+     .ct-so:hover .el-input__inner,
+     .ct-so.isfocus .el-input__inner:hover, 
+     .ct-so.isfocus .el-input__inner, 
+     .el-input-group--prepend .el-select .el-input.is-focus .el-input__inner,
      .ct-iti .isfocus{
      border-color: var(--centalineBlue); /*border-color:#c0c4cc*/
    }
@@ -356,6 +374,7 @@ html {
  .spanMessage {
    font-size: 12px;
    padding: 0px 2px;
+   line-height: 26px;
  }
  .el-input__icon {
    height:initial;
@@ -822,6 +841,10 @@ color: var(--centalinePlaceholder);
   height: 24px!important;
   line-height: 24px!important;
  }
+ .field-top-noimportant .el-input--mini .el-input__inner{
+   height: 26px;
+   line-height: 26px;
+  } 
  .el-input--mini .el-input__inner{
   height: 26px;
   line-height: 26px;
@@ -958,3 +981,6 @@ border-bottom-left-radius: 6px;
   font-weight: 800;
 }
 
+.h26{
+  height: 26px;
+}

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

@@ -1714,7 +1714,7 @@ export default {
           // var fun = self.model.scripts.formData[action];
           // fun(submitData,field);
           let title = field.pageTitle == undefined ? field.label : field.pageTitle;
-          submitData.actionType = field.actionType;
+          submitData = field.getActionPara(submitData).para;
           var fun = self.$common.getDataDrivenOpts().handler[action];
           if (self.isIframe) {
             submitData.isIframe = self.isIframe;

package/src/centaline/dynamicSosNew/index.js

@@ -0,0 +1,14 @@
+import dynamicSosNew  from './src/dynamicSosNew';
+import api from '../api/index'
+
+dynamicSosNew.install = function (Vue) {
+  Vue.component(dynamicSosNew.name, dynamicSosNew);
+
+  Vue.use(api);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicSosNew);
+}
+
+export default dynamicSosNew;

package/src/centaline/dynamicSosNew/src/dynamicSosNew.vue

@@ -0,0 +1,164 @@
+<template>
+  <div class="field-top">
+    <div style="width:100%;display:flex">
+      <div style="flex:1;" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
+       ]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
+        <div :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}}
+          </div>
+          <el-select ref="refselect" :key="model.itemKey" v-model="model.value" :no-data-text="nodatatext"
+            :disabled="model.locked" :placeholder="soPlaceholder" :clearable="model.clearable"
+            :filter-method="getOptions" :filterable="model.filterable" :multiple="model.multiple" 
+            @change="soChange" @clear="clearClickHandle" @focus="clickHandle" @visible-change="visibleChange"
+            @compositionstart="handleCompositionStart" @compositionend="handleCompositionEnd">                  
+            <el-option v-for="item in model.options" :key="item.value" :label="item.label" :value="item.value">
+              <el-tooltip :disabled="!item.toolTip" :content="item.toolTip" placement="right">
+                <span v-html="item.displayName || item.name"></span>
+              </el-tooltip>
+            </el-option>
+          </el-select>
+        </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}}
+        </span>
+      </transition>
+      <div v-if="!model.lock && model.popupSearchListType === 1">
+        <el-button v-if="!model.moreActionBtnName" size="mini" class="h26" type="primary" icon="el-icon-search" @click="popupSearchListHandle"></el-button>
+        <el-button v-else size="mini" type="primary" class="h26" @click="popupSearchListHandle">{{model.moreActionBtnName}}</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  export default {
+    name: 'ct-sosNew',
+    mixins: [dynamicElement],
+    components: {
+    },
+    props: {
+      api: String,
+      vmodel: Object,
+      popShow: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        focus: false,
+        showDrop: false,
+        showClear: false,
+        nodatatext:'    ',
+        open:false,
+        isComposing: false,
+      }
+    },
+    created() {
+      if (typeof this.vmodel === 'undefined') {
+        this.model = this.loaderObj.SosNew(this.source);
+      }
+      else {
+        this.model = this.vmodel;
+      }
+      this.model.$self=this;
+    },
+    destroyed (){
+      this.model = null;
+      this.$el = null;
+    },
+    computed: {
+      soPlaceholder: {
+        get: function () {
+          if (this.model.value !== '') {
+            return '';
+          }
+          else {
+            return this.model.attrs.placeholder;
+          }
+        },
+        set: function (v) {
+
+        }
+      },
+    },
+    mounted() {
+    },
+    methods: {
+      getOptions: function (query) {
+        if(!this.isComposing){
+          this.model.getOptions(this.api, query);
+        }
+      },
+      handleCompositionStart() {
+        this.isComposing = true;
+      },
+      handleCompositionEnd() {
+        this.isComposing = false;
+      },
+      visibleChange() {
+        if (this.model.popupSearchListType === 1){
+          this.$refs.refselect.popperElm.hidden = true
+        }
+      },
+      soChange: function (value) {
+        this.inputHandler(this.model.value);
+        this.changeHandler(this.model.value);
+        if(this.model.autoSearch) this.$emit('click');
+      },
+      clickHandle: function () {
+        if (this.model.lock) {
+          return false;
+        }
+        if (this.model.paramName) {          
+          this.getOptions();
+        }
+        else if (this.model.popupSearchListType === 1) {
+          this.popupSearchListHandle();
+        }
+        else if ((this.model.popupSearchListType === 0)) {
+          this.$message({
+            message: "请配置参数paramName1",
+            type: 'warning',
+            showClose:true,
+          });
+        }
+      },
+      popupSearchListHandle: function () {
+        var self = this;
+       
+        self.$emit('popupSearchList', true, self.model, self.model.moreActionRouter, (option) => {
+          if (option) {
+            self.model.code1 = option.code;
+            self.model.name1 = option.name;
+            option.value=option.code;
+            option.label=self.model.prefix +option.name;
+            self.model.options.push(option);
+
+            self.soChange();
+          }
+        });
+      },
+      clearClickHandle: function (event) {
+        this.model.reset();
+        this.soChange();
+      },
+      mouseOverHandle: function () {
+        if (this.model.value !== '' && this.model.clearable) {
+          this.$set(this, 'showClear', true);
+        }
+      },
+      mouseOutHandle: function () {
+        this.$set(this, 'showClear', false);
+      },
+    }
+  }
+</script>
+<style>
+
+</style>

package/src/centaline/dynamicTagsNew/index.js

@@ -0,0 +1,13 @@
+import dynamicTagsNew from './src/dynamicTagsNew'
+import api from '../api/index'
+
+dynamicTagsNew.install = function (Vue) {
+  Vue.component(dynamicTagsNew.name, dynamicTagsNew);
+  Vue.use(api);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicTagsNew);
+}
+
+export default dynamicTagsNew;