centaline-data-driven-v3 0.0.69 → 0.0.71

package/package.json

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

package/src/components/web/ComboBox.vue

@@ -167,7 +167,7 @@ function handleCompositionEnd() {
 }
 //弹出选择列表
 function popupSearchListHandle() {
-    emit('popupSearchList', false, model, model.value.moreActionRouter, (optionArr) => {
+    emit('popupSearchList', !model.value.multiple, model, model.value.moreActionRouter, (optionArr) => {
         selectOptionArr(optionArr);
     });
 }

package/src/components/web/File.vue

@@ -74,9 +74,6 @@
           </el-dropdown>
         </span>
 
-
-
-
         <template #file="{ file }">
           <div :title="file.fileName">
             <div class="cover-list-item">
@@ -536,7 +533,6 @@ function CheckQRCodeStatus() {
   }
 }
 function GetQRCodeUploadPhoto() {
-
   clearInterval(model.value.qrtimer);
   File.getQRCode(model.value, function (data) {
     model.value.qrCodeImg = data.qrCode;
@@ -624,13 +620,10 @@ function addClass(el, className) {
 
 
 //预览文件
-
 function viewerfile(file) {
   File.viewerfile(file, model.value)
 }
 
-
-
 function PasteUpload(event) {
   if (!model.value.locked && !model.value.disableUpload) {
     // 获取粘贴板中的图片

package/src/components/web/FormList.vue

@@ -57,7 +57,7 @@
                                     </el-col>
                                 </template>
                             </el-row>
-                            <div class="list-button" v-if="i > 0">
+                            <div class="list-delbutton" v-if="i > 0">
                                 <el-button v-if="v.delete" type="success" size="small" class="btn-del" :icon="Delete"
                                     @click="deleteRow(i, v.$sourceIndex)">
                                     删除
@@ -136,7 +136,8 @@
                                 </span>
                                 <!--可点击的列-->
                                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">
-                                    <span>{{ scope.row.isSet }}</span>
+                                  <Tablecurrency :router="v.router" :colValue="scope.row[v.fieldName1].code1" :rowData="scope.row" @click="rolRouterClickHandler">
+                                  </Tablecurrency>
                                 </span>
                                 <ct-span v-else-if="scope.row[v.fieldName1]" :vmodel="scope.row[v.fieldName1]"
                                     :rowNum="scope.row.$sourceIndex" :rowData="scope.row"></ct-span>
@@ -191,6 +192,7 @@ import { ElMessage } from 'element-plus'
 import Enum from '../../utils/Enum'
 import common from '../../utils/common'
 import FormList from '../../loader/src/FormList'
+import Tablecurrency from './SearchList/Tablecurrency.vue';
 import { initData } from '../../utils/mixins';
 import draggable from "vuedraggable";
 const emit = defineEmits(['click', 'input', 'change', 'popupSearchList', 'tableButtonClick'])
@@ -275,6 +277,7 @@ function addRow() {
         model.value.currentRow.isNew = true;
         model.value.currentRow.index = model.value.tableData.length - 1;
         if (model.value.flagRepeat) {
+            model.value.addSourceRow(newRow);
             FormList.allhiddenHandle(newRow, newRow.$sourceIndex, model.value)
         }
     }
@@ -491,12 +494,15 @@ function setcolumnminWidth(column) {
 function buttonClick(row, button) {
     var submitData = {};
     button.submitFormField.forEach((v) => {
-        submitData[v] = row[common.initialsToUpperCase(v)].code1;
+        submitData[v] = row[v].code1;
     });
     model.value.currentRowIndex = model.value.source.rows.findIndex(v => v.$sourceIndex === row.$sourceIndex);
 
     emit('tableButtonClick', button, submitData);
 }
+function rolRouterClickHandler(field, rowData,rowindex) {
+  buttonClick(rowData, field);
+}
 function insertOrUpdateRow(row) {
     FormList.insertOrUpdateRow(row, true, model.value);
 }
@@ -616,11 +622,10 @@ defineExpose({
     width: 45%;
 }
 
-.ct-form-repeat .list-button {
+.ct-form-repeat .list-delbutton {
     padding-bottom: 5px;
-    text-align: right;
-    display: inline-table;
-    float: right;
+    justify-content: right;
+    display: flex;
 }
 
 .ct-form-repeat .ct-form-repeat-el-col {

package/src/components/web/RadioButton.vue

@@ -2,12 +2,15 @@
     
     <ct-field :vmodel="model" v-if="model">
         <template #Control>
-            <div class="ct-Radio">
+            <div class="ct-Radio"  :class="[model.code1 !== '' && !model.locked ? 'hasValue' : '']">
                 <el-radio-group v-model="model.code1" @change="change">
                     <el-radio v-bind="model.attrs" v-for="(item, index) in model.selectItems1" :key="index"
                         :label="item.code" :disabled="model.locked">
                         {{ item.name }}
                     </el-radio>
+                    <el-icon @click="clearClickHandle" class="el-range__close-icon" style="margin-left: 10px;" v-if="!common.flagHK()">
+                    <CircleClose />
+                </el-icon>
                 </el-radio-group>
             </div>
         </template>
@@ -16,6 +19,7 @@
 <script lang="ts" setup>
 import { initData, changeHandler } from '../../utils/mixins';
 import RadioButton from '../../loader/src/RadioButton';
+import common from '../../utils/common'
 const emit = defineEmits(['click', 'change','search'])
 const props = defineProps({
     parameterAction: String,

package/src/components/web/SearchList/SearchTable.vue

@@ -216,7 +216,7 @@
             v-if="!isLoading && model && !model.isLayout"></Tabletip>
         <Tabletip ref="refFooter" class="ct-search-table-footer" style="width: 100%;"
             :tip="model.footer + model.companyName" v-if="!isLoading && model && !model.isLayout"></Tabletip>
-        <div ref="popupButton" v-if="flagPopupSearchlist"
+        <div ref="refPopupButton" v-if="flagPopupSearchlist"
             style="margin-top: 10px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">
             <el-button size="mini" @click="popupClickHandler()" class="max-search-btn" style="float:right;"
                 type="primary">
@@ -324,6 +324,7 @@ const refListHeader = ref()
 const refListFooter = ref()
 const refTableStats = ref()
 const refTableParent = ref()
+const refPopupButton = ref()
 const refRows = ref<HTMLElement[]>([]);
 const getRowsRef = (el, index) => {
     if (el) {
@@ -809,14 +810,18 @@ function setTableHeight() {
             if (refTableStats.value && refTableStats.value.tableStatistics) {
                 h7 = refTableStats.value.tableStatistics.offsetHeight + 10 | 0;
             }
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - 16;
+            var h8 = 0;
+            if (refPopupButton.value) {
+              h8 = refPopupButton.value.offsetHeight + 21 | 0;
+            }
+
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 16;
             model.value.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             nextTick(() => {
                 getScrollAttr();
             });
         }
     })
-
 }
 //表头拖动开始
 function thMouseMoveHandle(ev) {

package/src/components/web/Tree.vue

@@ -4,7 +4,7 @@
             <ct-searchscreen ref="reftreescreen" :from="'tree'" :api="searchConditionApi" :screenPara="screenPara"
                 @search="search" @loaded="screenload" ></ct-searchscreen>
         </div>
-        <tree ref="reftree" :api="searchDataApi"  @loaded="loaded" :treeHeight="treeHeight">
+        <tree v-if="loadTree" ref="reftree" :api="searchDataApi"  @loaded="loaded" :treeHeight="treeHeight">
         </tree>
 
 
@@ -14,6 +14,7 @@
 import { ref, nextTick, watch, onMounted } from 'vue'
 import Tree from './Tree/Tree.vue';
 const emit = defineEmits(['loaded'])
+const loadTree=ref(false)
 
 const props = defineProps({
     searchConditionApi: String,
@@ -54,6 +55,7 @@ function loaded(data) {
     } catch (e) { }
 }
 function screenload(data) {
+    loadTree.value=true
     setTreeHeight();
 }
 onMounted(() => {

package/src/components/web/dialog.vue

@@ -19,6 +19,9 @@ onActivated(() => {
 })
 function close() {
     emit('close', props);
+    if (props.vmodel.content[0].attrs && typeof props.vmodel.content[0].attrs["onCloseDialog"] === "function") {
+      props.vmodel.content[0].attrs["onCloseDialog"]();
+    }
 }
 function scrollHandle(ev) {
     contentTop.value = content.value.scrollTop;

package/src/loader/src/File.js

@@ -376,6 +376,8 @@ function setPublicClassify(classify, model) {
 function setClassify(classify, model) {
     classify.file.mediaLabelName = classify.option[model.optionModel.optionAttrs.label];
     classify.file.mediaLabelID = classify.option[model.optionModel.optionAttrs.value];
+    classify.file.source.mediaLabelName = classify.option[model.optionModel.optionAttrs.label];
+    classify.file.source.mediaLabelID = classify.option[model.optionModel.optionAttrs.value];
 }
 //上传成功
 function handleAvatarSuccess(res, file, fileList, model) {

package/src/loader/src/Form.js

@@ -71,7 +71,7 @@ function loadFromModel(source, isFormList) {
         }
       },
       getValueByFieldNameFromParent(id, attrKey) {
-        if(this.form && this.form.parentModelForm){
+        if (this.form && this.form.parentModelForm) {
           return this.form.parentModelForm.getValueByFieldName(id, attrKey);
         }
         return null;
@@ -111,14 +111,14 @@ function loadFromModel(source, isFormList) {
             if (attrKey == 'name1') {
               rtn1["options"][0]["label"] = attrValue
             }
-            if(rtn1.itemKey)rtn1.itemKey=Math.random()
+            if (rtn1.itemKey) rtn1.itemKey = Math.random()
           }
           hiddenHandle(rtn1, this.form);
           requiredHandle(rtn1, this.form);
         }
       },
       setValueByFieldNameFromParent(id, attrKey, attrValue) {
-        if(this.form && this.form.parentModelForm){
+        if (this.form && this.form.parentModelForm) {
           return this.form.parentModelForm.setValueByFieldName(id, attrKey, attrValue);
         }
         return null;
@@ -411,24 +411,24 @@ function loadFromModel(source, isFormList) {
         common.message(message, type, center, duration, showClose, dangerouslyUseHTMLString)
       },
 
-    },    
+    },
     getValueByFieldName(id, attrKey) {
       attrKey = common.initialsToLowerCase(attrKey);
       var rtn1 = this.fieldsDic[id];
       if (rtn1) {
-          return rtn1[attrKey];
+        return rtn1[attrKey];
       }
     },
     setValueByFieldName(id, attrKey, attrValue) {
       attrKey = common.initialsToLowerCase(attrKey);
       var rtn1 = this.fieldsDic[id];
       if (rtn1) {
-        if(attrKey=='code1' && rtn1.controlType===4 
-          && attrValue!=undefined && attrValue!=null && attrValue!=''){
-            if(rtn1.decimals1 != undefined && rtn1.decimals1 != null && rtn1.decimals1>-1){
-              attrValue = Number(attrValue).toFixed(rtn1.decimals1)
-            }
+        if (attrKey == 'code1' && rtn1.controlType === 4
+          && attrValue != undefined && attrValue != null && attrValue != '') {
+          if (rtn1.decimals1 != undefined && rtn1.decimals1 != null && rtn1.decimals1 > -1) {
+            attrValue = Number(attrValue).toFixed(rtn1.decimals1)
           }
+        }
         rtn1[attrKey] = attrValue;
         // this.self.hatchHandle(id, attrKey, attrValue, rtn1);
 
@@ -727,7 +727,7 @@ function loadFromModel(source, isFormList) {
             Object.assign(rtnFormObj, customizeColumnsObj);
           }
           else {
-            if(f.hasOwnProperty('getFormObj') && typeof f.getFormObj === "function"){
+            if (f.hasOwnProperty('getFormObj') && typeof f.getFormObj === "function") {
               Object.assign(rtnFormObj, f.getFormObj());
             }
           }
@@ -758,7 +758,7 @@ function loadFromModel(source, isFormList) {
       return submitData;
     },
     //获取父级关联数据
-    getParentFieldPara(parentFieldNameArr,model) {
+    getParentFieldPara(parentFieldNameArr, model) {
       let submitData = {};
       var tempFormData = rtn.getFormObj();
       parentFieldNameArr.forEach((v) => {
@@ -886,7 +886,7 @@ function requiredHandle(item, model) {
 //清除关联当前组件的组件值
 function clearRelatedHandle(field, fields) {
   var f = fields.filter((v) => {
-    return v.parentField && field.fieldName1 && (','+v.parentField+',').indexOf(','+field.fieldName1+',') > -1;
+    return v.parentField && field.fieldName1 && (',' + v.parentField + ',').indexOf(',' + field.fieldName1 + ',') > -1;
   });
   f.forEach((v) => {
     if (v.reset) {
@@ -931,12 +931,16 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
 
   let check = true;
   let checkMsg;
+  var i = 0;
   router.submitFormField.forEach((v) => {
     Fields.forEach((f) => {
       if (f.model && f.model.fieldName1 === v) {
         if (typeof f.model.validExcute !== 'undefined') {
           if (!f.model.validExcute()) {
-            common.message(f.model.displayValidMessage)
+            if (i == 0) {
+              common.message(f.model.displayValidMessage)
+            }
+            i++;
             verified = false;
             return;
           }
@@ -1018,9 +1022,9 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
               callBack(option);
             }
             if (typeof option === 'object' && option !== null && option.flagAlert) {
-              common.confirm(option.content, option.caption? option.caption : "提示", {
-                confirmButtonText: option.confirmButtonText? option.confirmButtonText : "确定",
-                cancelButtonText: option.cancelButtonText? option.cancelButtonText : "取消",
+              common.confirm(option.content, option.caption ? option.caption : "提示", {
+                confirmButtonText: option.confirmButtonText ? option.confirmButtonText : "确定",
+                cancelButtonText: option.cancelButtonText ? option.cancelButtonText : "取消",
                 center: Enum.HalignType.Center
               }).then(() => {
                 model.$vue.changeCallBackHandler(field, router.callBackFunName, option);

package/src/loader/src/FormList.js

@@ -314,10 +314,11 @@ function FormListModel(source, master,actionRouters) {
                 if(form.fieldsDic[f]){
                   let newField={...form.fieldsDic[f]};
                   newField.is='ct-label';
-                  newField.type=Enum.ControlType.Label;
+                  newField.controlType=Enum.ControlType.Label;
                   newField.colspan=24;
                   newField.required=false;
                   newField.labelClass='';
+                  newField.value=newField.code1;
                   relfields.push(newField);
                 }
               });

package/src/loader/src/SearchScreen.js

@@ -320,6 +320,8 @@ function isHandle(type) {
     let result = false;
     switch (type) {
         case Enum.ControlType.CheckBoxList://复选列表
+        case Enum.ControlType.MultiSelectNoSearch:
+        case Enum.ControlType.MultiSelectWithSearch:
             result = true;
             break;
         default:

package/src/main.js

@@ -26,7 +26,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
     flagRouterSelf: true,
-    flagApp: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -64,7 +64,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_15dc3fe3-b962-4bd2-85e2-2ce843676353",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_15dc3fe3-b962-4bd2-85e2-2ce843676353",Platform:"IOS"}',
+                authObject: '{EmpID:"Token_2e493771-28ae-485d-afea-0e6dcef23f64",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_2e493771-28ae-485d-afea-0e6dcef23f64",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/mixins.js

@@ -837,9 +837,11 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     common.openDialog(dialogOption);
                 }
                 else {
-                    submitData = field.getActionPara(submitData).para;
                     if (source == 'table') {
-                        model.$vue.operationLoading = true
+                      model.$vue.operationLoading = true
+                    }
+                    else{
+                      submitData = field.getActionPara(submitData).para;
                     }
                     field.doAction(submitData, (data) => {
                         if (source == 'table') {
@@ -1657,10 +1659,10 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
             fun(submitData, title, model);
         }
     }
+    if (typeof field.onChanged !== 'undefined') {
+        common.excute.call(model.scripts, field.onChanged)
+    }
     if (field.isSubmit && field.flagVerifyData) {
-        if (typeof field.onChanged !== 'undefined') {
-            common.excute.call(model.scripts, field.onChanged)
-        }
         if (source == 'form' && !model.$vue.validExcute()) {
             return;
         }

package/src/views/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div  class="data-driven" id="app-form" >
    
-    <ct-form :api="'/admin/SchoolTeachingPlanActivityExamAnswer/readDetail'" :apiParam="apiParam" :flagNavbar="true"></ct-form>
+    <ct-form :api="'/salemanage/ContractByPoint/readDetail'" :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={"rowId":"1900912713408843776","actionType":3}
+ const apiParam={"estateId":"2503120955255B0598513062476EB741","propertyId":"250312100237582995D2919948BDB1D2","actionType":2,"commissionMode":"1"}
 </script>