centaline-data-driven-v3 0.0.73 → 0.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.73",
+  "version": "0.0.74",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/assets/commonWeb.css

@@ -1044,4 +1044,21 @@ body {
   background-color: #ed745f;
 }
 
+.ct-location .el-location-input{
+  border: 1px solid var(--bagGray);
+  line-height: 24px;
+  padding-left: 5px;
+  color: var(--centalineBlue);
+  border-radius: 6px !important;
+  font-size: inherit;
+ }
+ .ct-location .el-location-input:hover{
+  border-color: var(--centalineBlue);
+ }
+ .ct-location .el-location-input:focus{
+  outline:0;
+ }
+ .h26{
+  height: 26px;
+}
 /*elementPlus样式重置结束*/

package/src/components/app/PhotoSelectList.vue

@@ -9,10 +9,12 @@
             <template v-if="imageList.length > 0">
                 <template v-if="layout">
                     <div style="display: flex;" v-for="(item, index) in imageList" :key="index">
-                        <van-checkbox style="margin: 0 5px;" @change="choose(item, true)" v-model="item.ischeck"
+                        <van-radio v-if="selectedMode == 1" @click="chooseRadio(item)" style="margin: 0 5px;"
+                            :checked="item.ischeck" icon-size="14px"></van-radio>
+                        <van-checkbox v-else style="margin: 0 5px;" @change="choose(item, true)" v-model="item.ischeck"
                             shape="square" icon-size="14px"></van-checkbox>
-                        <ct-layout :vmodel="item" :cellLayout="layout" :key="itemKey"  :rowindex="index" :flagMediaSelect="true"
-                            @rolRouterclick="rolRouterCellClickHandler">
+                        <ct-layout :vmodel="item" :cellLayout="layout" :key="itemKey" :rowindex="index"
+                            :flagMediaSelect="true" @rolRouterclick="rolRouterCellClickHandler">
                         </ct-layout>
                     </div>
                 </template>
@@ -39,13 +41,14 @@
                 </template>
             </template>
             <template v-else>
-                <van-empty :description="common.LocalizedString('没有数据','沒有數據')" />
+                <van-empty :description="common.LocalizedString('没有数据', '沒有數據')" />
             </template>
         </div>
         <div class="PhotoSelectList-bottom">
-            <van-checkbox @change="allchoose" v-model="allcheck" shape="square" icon-size="14px">{{common.LocalizedString('全选','全選')}}</van-checkbox>
+            <van-checkbox v-if="selectedMode != 1"  @change="allchoose" v-model="allcheck" shape="square"
+                icon-size="14px">{{ common.LocalizedString('全选', '全選') }}</van-checkbox>
             <van-button type="primary" class="van-button-app" size="small" style="display: flex;margin-left: 30%;"
-                @click="handleClick()">{{common.LocalizedString('确定','確認')}}</van-button>
+                @click="handleClick()">{{ common.LocalizedString('确定', '確認') }}</van-button>
         </div>
     </div>
     <van-popup v-model:show="showPicker" position="bottom" :safe-area-inset-bottom="true">
@@ -68,7 +71,7 @@ import { ElMessage } from 'element-plus'
 import common from '../../utils/common'
 import util from '../../utils/pub-use'
 import PhotoSelectList from '../../loader/src/PhotoSelectList';
-const emit = defineEmits(['handlePhoto','loaded', 'failLoad'])
+const emit = defineEmits(['handlePhoto', 'loaded', 'failLoad'])
 const props = defineProps({
     Selected: Array,
     api: String,
@@ -89,6 +92,7 @@ const itemKey = ref(0)
 const mediaLabelID = ref('')
 const mediaLabelName = ref('全部')
 const options = ref([])
+const selectedMode = ref(2)
 onMounted(() => {
     nextTick(function () {
         showLoadingToast({ message: '', duration: 10000 });
@@ -115,6 +119,9 @@ function load(data) {
             layout.value = data.source.content.layout;
             paramName.value = data.source.content.paramName;
             sourceRows = common.deepClone(data.source.content.mediaList);
+            if (data.source.content.selectedMode) {
+                selectedMode.value = data.source.content.selectedMode
+            }
         }
         else {
             sourceRows = common.deepClone(data.source.content);
@@ -188,6 +195,16 @@ function choose(item, flagCheckbox) {
         item.ischeck = false;
     }
 
+}
+function chooseRadio(item) {
+    let chooseItem = common.deepClone(item);
+    chooseList.value = [];
+    imageList.value.forEach((v) => {
+        v.ischeck = false;
+    });
+    item.ischeck = true;
+    chooseList.value.push(chooseItem);
+
 }
 function allchoose() {
     chooseList.value = [];

package/src/components/web/Form.vue

@@ -16,7 +16,7 @@
                         <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px">
                             <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                 :parameterAction="model.parameterAction" v-bind="col.bindPara" :fileData="getFileData(col)"
-                                @change="changeHandler" @importComplete="importComplete"
+                                @change="changeHandler" @importComplete="importComplete" @popupLocation="popupLocationHandler"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
                                 @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler" 
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -32,7 +32,7 @@
                         <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px">
                             <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                 :parameterAction="model.parameterAction" v-bind="col.bindPara"  :fileData="getFileData(col)"
-                                @change="changeHandler" @importComplete="importComplete"
+                                @change="changeHandler" @importComplete="importComplete" @popupLocation="popupLocationHandler"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
                                 @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -52,7 +52,7 @@
                                     <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px">
                                         <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                             :parameterAction="model.parameterAction" v-bind="col.bindPara" :fileData="getFileData(col)"
-                                            @change="changeHandler" @fieldClick="fieldClickHandler"
+                                            @change="changeHandler" @fieldClick="fieldClickHandler" @popupLocation="popupLocationHandler"
                                             @popupSearchList="popupSearchListHandler" @importComplete="importComplete"
                                             @popupGroupList="popupGroupListHandler" @tableButtonClick="clickHandler"
                                             @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -83,7 +83,7 @@
                                     <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px">
                                         <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                             :parameterAction="model.parameterAction" v-bind="col.bindPara" :fileData="getFileData(col)"
-                                            @change="changeHandler" @fieldClick="fieldClickHandler"
+                                            @change="changeHandler" @fieldClick="fieldClickHandler" @popupLocation="popupLocationHandler"
                                             @popupSearchList="popupSearchListHandler" @importComplete="importComplete"
                                             @popupGroupList="popupGroupListHandler" @tableButtonClick="clickHandler"
                                             @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -102,7 +102,7 @@
                             <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="model.parameterAction"
                                 v-bind="col.bindPara" @change="changeHandler" :key="itemKey" :fileData="getFileData(col)"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler" @importComplete="importComplete"
-                                @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
+                                @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler" @popupLocation="popupLocationHandler"
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
                             </component>
                         </el-col>
@@ -353,6 +353,9 @@ function validExcute() {
                                     }
                                     else if (f.$el.offsetParent.offsetParent.offsetParent.classList[0] === 'ct-dialog_wrapper') {
                                         total = f.$el.offsetTop;
+                                        if(f.$el.offsetParent){
+                                            total+=f.$el.offsetParent.offsetTop
+                                        }
                                         document.querySelector(".ct-dialog_body").children[0].scrollTop = total;
                                     }
                                     else if (f.$el.offsetParent.offsetParent.offsetParent.localName === "body") {
@@ -547,7 +550,10 @@ function importComplete(res, field) {
 }
 //弹出选择列表
 function popupSearchListHandler(singleSelectio, field, router, callBack) {
-    Form.popupSearchListHandler(singleSelectio, field, router, model.value, Fields.value, props, callBack)
+  Form.popupSearchListHandler(singleSelectio, field, router, model.value, Fields.value, props, callBack)
+}
+function popupLocationHandler(field, router, callBack) {
+  Form.popupLocationHandler(field, router, callBack,model.value,props);
 }
 //弹出分组列表
 function popupGroupListHandler(field, router, callBack) {

package/src/components/web/Location.vue

@@ -1,20 +1,18 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-            <div v-if="model !== null" class="ct-location" style="width:100%;display:flex">
-            <div
-                class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput text-justify">
+            <div v-if="model !== null" class="ct-location" style="display:flex">
+            <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput text-justify">
                 <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
                     <div slot="prepend" class="label-ellipsis" :class="[model.labelClass]" :title="model.label">
                         {{ model.label }}
                     </div>
                 </div>
-                <div style="display:inline-flex;padding-left:0px;" v-bind="model.attrs"
-                    :class="model.locked ? 'ct-is-disabled' : ''">
+                <div style="display:inline-flex;padding-left:0px;" v-bind="model.attrs" :class="model.locked ? 'ct-is-disabled' : ''">
                     <input style="text-align:left;width:100%" class="el-location-input hoverColor"
-                        :placeholder="model.attrs.placeholder1" v-model="model.value" @change="changeModel($event)" />
+                        :placeholder="model.attrs.placeholder1" v-model="model.code1" @change="changeModel($event)" />
                     <input style="text-align:left;width:100%;margin-left:5px;" class="el-location-input hoverColor"
-                        :placeholder="model.attrs.placeholder2" v-model="model.value1" @change="changeModel($event);" />
+                        :placeholder="model.attrs.placeholder2" v-model="model.code2" @change="changeModel($event);" />
                 </div>
             </div>
         </div>
@@ -22,10 +20,10 @@
         <template #Sufbutton v-if="model !== null&&model.moreActionRouter">
             <div v-if="model.moreActionRouter" style="display: inline-block;margin-left: 5px;">
                 <img v-if="model.moreActionRouter.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem"
-                    :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.label"
+                    :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.controlLabel"
                     @click="popupLocationHandler($event)" />
                 <el-button v-else size="mini" type="primary" class="h26" @click="popupLocationHandler($event)">
-                    {{ model.moreActionRouter.label }}
+                    {{ model.moreActionRouter.controlLabel }}
                 </el-button>
             </div>
         </template>
@@ -39,16 +37,17 @@ const props = defineProps({
     vmodel: Object
 })
 const model = initData(props, Location)
+console.log(model.value);
 function popupLocationHandler() {
-    emit('popupLocation', model.value, model.value.moreActionRouter, (data) => {
-          if(data){
-            model.value.value=data.lng;
-            model.value.value1=data.lat;
-          }
-        });
+  emit('popupLocation', model.value, model.value.moreActionRouter, (data) => {
+    if(data){
+      model.value.value=data.lng;
+      model.value.value1=data.lat;
+    }
+  });
 }
 function changeModel() {
-    changeHandler(model.value, emit); 
+  changeHandler(model.value, emit); 
 } 
 defineExpose({
     model

package/src/loader/src/Form.js

@@ -62,6 +62,14 @@ function loadFromModel(source, isFormList) {
           router[attrKey] = attrValue;
         }
       },
+      setbuttonRouter(id, attrKey, attrValue) {
+        var router = this.form.buttons.find((v1) => {
+          return v1.key === id;
+        });
+        if (router) {
+          router[attrKey] = attrValue;
+        }
+      },
       //获取Field的属性attrKey的值
       getValueByFieldName(id, attrKey) {
         attrKey = common.initialsToLowerCase(attrKey);
@@ -1043,6 +1051,39 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
   }
   common.openDialog(dialogOption);
 }
+function popupLocationHandler(field, router, callBack,model,props) {
+  var submitData = Form.getFileData(router,model);
+  submitData.lng=field.code1;
+  submitData.lat=field.code2;
+  submitData = router.getActionPara(submitData).para;
+
+  var dialogOption = {
+    title: router.pageTitle || router.controlLabel,
+    pane: common.getParentPane(),
+    content: [{
+      component: "ct-mapBaidu",
+      width: router.pageWidth + "px",
+      height: router.pageHeight + "px",
+      documentHeight: props.documentHeight,
+      documentWidth: props.documentWidth,
+      attrs: {
+        field: router,
+        apiParam: submitData,
+        openType : 'Location',
+        onSubmit(ev) {
+          if (callBack) {
+            callBack(ev);
+          }
+          common.closeDialog(dialogOption.dialog);
+        },
+        onCloseDialog(ev) {     
+          common.closeDialog(dialogOption.dialog);                 
+        }
+      }
+    }]
+  };
+  common.openDialog(dialogOption);
+}
 //弹出分组搜索列表
 function popupGroupListHandler(field, router, model, Fields, props, callBack) {
   let submitData = {};
@@ -1225,5 +1266,6 @@ const Form = {
   changeHandler,
   getRouterAndSubmitData,
   updateFields,
+  popupLocationHandler,
 };
 export default Form;

package/src/loader/src/LibFunction.js

@@ -216,9 +216,10 @@ const LibFunction = {
                 item.is = 'ct-customizecolumns'
                 break;
             case Enum.ControlType.Location:
-                item = Location(item);
-                item.is = 'ct-Location';
-                break;
+              moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+              item = Location(item,moreActionRouter);
+              item.is = 'ct-location';
+              break;
             case Enum.ControlType.SearchPage: //搜索列表页面
                 item = {};
                 item.is = 'ct-searchlist';

package/src/loader/src/Location.js

@@ -1,8 +1,8 @@
 import base from '../../loader/index';
 import valid from '../../utils//validate';
-const Location = function (source) {
+const Location = function (source,moreActionRouter) {
     let rtn = {
-        moreActionRouter: source.moreActionRouter,
+        moreActionRouter: moreActionRouter,
         getFormObj() {
             var rtnFormObj = {};
             Object.defineProperty(rtnFormObj, source.fieldName1, {

package/src/main.js

@@ -65,7 +65,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1-a7289bb2-9f1e-4a04-9016-1e555bf39188"}',
-                authObject: '{EmpID:"Token_8ce6c140-f584-45ed-b683-ca52837993aa",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_8ce6c140-f584-45ed-b683-ca52837993aa",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_f5be9890-db08-463b-b6c3-0874f422fac9",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_f5be9890-db08-463b-b6c3-0874f422fac9",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/request.js

@@ -15,7 +15,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
       params = params.para;
     }
     return Axios.get(url, params, {
@@ -34,7 +34,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -127,7 +127,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -150,7 +150,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url == '' || url.substr(-1) == '/' ? '' : '/') + params.action;
+      url = url + (url == '' || url.substr(-1) == '/' ? '' : '/') + (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -175,7 +175,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  (params.action.charAt(0)=='/'? params.action.substr(1):params.action);
       params = params.para;
     }
     return Axios.post(url, params, {

package/src/views/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div  class="data-driven" id="app-form" >
    
-    <ct-form :api="'/salemanage/ContractByPoint/readDetail'" :apiParam="apiParam" :flagNavbar="true"></ct-form>
+    <ct-form :api="'/PropertyPublish/getLayoutOfAudit'" :apiParam="apiParam" :flagNavbar="true"></ct-form>
    <!-- <ct-form :api="'/api/third-dept-tran/tran-comm-adjust/task'" :apiParam="apiParam"></ct-form> -->
    <!-- <ct-form :api="'/PropertyTranToActive/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-textbox :source="source"></ct-textbox> -->
@@ -10,5 +10,5 @@
 </template>
 <script lang="ts" setup>
  //const apiParam={"originalTraId":"1739561435204980737","actionType":1,"pageStyle":2,"pageTitle":"成交报告","pageOnly":true}
- const apiParam={"estateId":"2503120955255B0598513062476EB741","propertyId":"250312100237582995D2919948BDB1D2","actionType":2,"commissionMode":"1"}
+ const apiParam={"workListID":"1902920155446489088","actionType":3}
 </script>