centaline-data-driven-v3 0.1.58 → 0.1.59

package/package.json

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

package/src/components/app/FormList.vue

@@ -31,8 +31,8 @@
             </div>
         </template>
         <template v-else>
-            <div v-if="model.controlLabel" class="list-title">
-                <h5>{{ model.controlLabel }}</h5>
+            <div v-if="model.title" class="list-title">
+                <h5>{{ model.title }}</h5>
             </div>
             <div class="list-button">
                 <component v-if="model.selectRouter !== null" :is="model.selectRouter.is" size="small"
@@ -48,7 +48,7 @@
                             <thead ref="tableHead" class="right-no-fixation-th">
                                 <tr class="ct-tr" ref="headTr">
                                     <th class="ct-th th-edit"
-                                        v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)">
+                                        v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0">
                                         <span>操作</span>
                                     </th>
                                     <template v-for="(column, i) in model.rows[0].field" :key="i">
@@ -65,7 +65,7 @@
                                     <tr v-for="(row, rowindex) in model.tableData" :key="rowindex"
                                         :ref="'rows.' + rowindex" class="ct-tr">
                                         <template
-                                            v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)">
+                                            v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0">
                                             <td class="ct-td td-edit" align="center" valign="middle">
                                                 <van-image v-if="row.edit || row.isSet"
                                                     style="cursor: pointer;margin-right: 5px;" width="20" height="20"
@@ -87,14 +87,8 @@
                                         <template v-for="(column, i) in model.rows[0].field" :key="i">
                                             <td v-if="column.show" class="ct-td" :rowspan="column.rowspan"
                                                 :colspan="column.colspan">
-                                                <span v-if="column.router" :class="'cell'" style="display: flex;">
-                                                    <Tablecurrency :router="column.router"
-                                                        :colValue="row[column.fieldName1].code1" :rowData="row"
-                                                        @click="rolRouterClickHandler">
-                                                    </Tablecurrency>
-                                                </span>
-                                                <ct-span v-else-if="row[column.fieldName1]"
-                                                    :vmodel="row[column.fieldName1]" :rowData="row"></ct-span>
+                                                <ct-span v-if="row[column.fieldName1]" :vmodel="row[column.fieldName1]"
+                                                    :rowData="row"></ct-span>
                                             </td>
                                         </template>
                                     </tr>
@@ -102,7 +96,7 @@
                                 <template v-else>
                                     <tr class="ct-tr" ref="headTr">
                                         <td class="ct-td" :colspan="colspansum" style="text-align: center;">
-                                            <span> {{ common.LocalizedString('暂无数据', '暫無數據') }}</span>
+                                            <span>  {{common.LocalizedString('暂无数据','暫無數據')}}</span>
                                         </td>
                                     </tr>
                                 </template>
@@ -141,8 +135,6 @@ import Enum from '../../utils/Enum'
 import common from '../../utils/common'
 import util from '../../utils/pub-use'
 import draggable from "vuedraggable";
-import Tablecurrency from './SearchList/Tablecurrency.vue';
-
 const emit = defineEmits(['click', 'input', 'change', 'popupSearchList', 'tableButtonClick'])
 const props = defineProps({
     parameterAction: String,
@@ -175,7 +167,7 @@ function Init() {
     model.value.validExcute = () => {
         var rtn = fieldsValidExcute();
         if (!rtn) {
-            model.value.displayValidMessage = common.LocalizedString('请填写', '請填寫') + '[' + model.value.controlLabel + ']'
+            model.value.displayValidMessage = common.LocalizedString('请填写','請填寫')+'[' + model.value.controlLabel + ']'
         }
         return fieldsValidExcute();
     }
@@ -238,7 +230,7 @@ function fieldsValidExcute() {
         if (model.value.form && model.value.form.fields) {
             const currentIndex = model.value.form.fields.findIndex(v => v.fieldName1 === model.value.fieldName1);
             if (currentIndex - 1 >= 0) {
-                if (model.value.form.fields[currentIndex - 1].controlType == Enum.ControlType.Group) {
+                if (model.value.form.fields[currentIndex - 1].controlType == Enum.ControlType.Group){
                     controlLabel = model.value.form.fields[currentIndex - 1].controlLabel;
                 }
             }
@@ -292,14 +284,11 @@ function changeHandler(field, index) {
     model.value.currentEventField = field;
     emit('change', model.value);
 }
-function rolRouterClickHandler(field, rowData, rowindex) {
-    buttonClick(rowData, field);
-}
 
 function buttonClick(row, button) {
     var submitData = {};
     button.submitFormField.forEach((v) => {
-        submitData[v] = common.getDataOfUpperLower(row, v).code1;
+        submitData[v] = row[common.initialsToUpperCase(v)].code1;
     });
     model.value.currentRowIndex = model.value.source.rows.findIndex(v => v.$sourceIndex === row.$sourceIndex);
 

package/src/loader/src/Form.js

@@ -675,7 +675,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.buttons.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl || '') + v.action;
+            if (v.action) {
+              v.action = (appRootUrl || '') + v.action;
+            }
             var button = Router(v);
             button.is = "ct-button";
             rtn._buttons.push(button);
@@ -696,7 +698,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.captionBarButtons.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl || '') + v.action;
+            if (v.action) {
+              v.action = (appRootUrl || '') + v.action;
+            }
             var button = Router(v);
             button.is = "ct-button";
             rtn._captionBarButtons.push(button);
@@ -717,7 +721,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.links.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl || '') + v.action;
+            if (v.action) {
+              v.action = (appRootUrl || '') + v.action;
+            }
             var button = Router(v);
             button.is = "ct-button";
             rtn._links.push(button);
@@ -738,7 +744,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
           source.actionRouters.forEach((v) => {
             v.buttonType = common.getEnumValue(Enum.ButtonType, v.buttonType);
             v.actionType = common.getEnumValue(Enum.ActionType, v.actionType);
-            v.action = (appRootUrl || '') + v.action;
+            if (v.action) {
+              v.action = (appRootUrl || '') + v.action;
+            }
             var button = Router(v);
             button.is = "ct-button";
             rtn._actionRouters.push(button);
@@ -935,7 +943,9 @@ function loadFromModel(source, isFormList, appRootUrl) {
       }
     },
     getRtnRouter(v) {
-      v.action = (appRootUrl || '') + v.action;
+      if (v.action) {
+        v.action = (appRootUrl || '') + v.action;
+      }
       var button = Router(v);
       button.is = "ct-button";
       return button;

package/src/main.js

@@ -21,7 +21,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
+    baseUrl: "http://10.88.22.66/IBS.Mvc/api/",
     //baseUrl:"http://10.88.22.66:7080/ibs-api/",
     //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
@@ -29,7 +29,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: false,//是否app端
+    flagApp: true,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -66,7 +66,7 @@ app.use(centaline, {
             return {
                 
              //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyaWQiOiIyNTEyMTUxNzQyMTg5QzI4MTgwRDkxRTk0MDhEOTA0QSIsImxvZ2luX3VzZXJfa2V5IjoiN2MzYzNjNjAtNWVjMy00MzdkLWExMDYtOWYxZTMwYjU0Mjg2In0.daG9mS98Gg8KmHSUjYHktMcO2Jk7SVtCcqm2sRB0I8Y2N0TuonIrVUDcHdNdDiuD3v6qO_f010tQWlBsAQ1dqg',
-              authobject: '{token:"1647-2061280781548081152",platform:"WEB"}',
+              authobject: '{EmpID:"Token_eb197a2a-06d4-4258-af95-90a6d3541b12",MachineCode:"1d6b7fc9-90ff-4a68-9504-1174fa72db7b",SSO_Token:"SSOToken_eb197a2a-06d4-4258-af95-90a6d3541b12",Platform:"WEB"}',
               //authobject: '{EmpID:"Token_946d56e1-7972-4382-9d10-4a72496aab39",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_946d56e1-7972-4382-9d10-4a72496aab39",Platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',

package/src/views/Form.vue

@@ -1,10 +1,10 @@
 <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="'/Order/view-layout'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/PropertyTender/readDetail'" :apiParam="apiParam"></ct-form>
     <ct-dialoglist></ct-dialoglist>
   </div>  
   </template>
 <script lang="ts" setup>
- const apiParam={"originalOrderId":"2014640778344816640","actionType":1}
+ const apiParam={"tenderID":"2013190230941741056","actionType":3}
 </script>

package/src/views/SearchList.vue

@@ -1,6 +1,5 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-  <span @click="clickHandle">aa</span>
     <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/ccesmanage/AppUseSummaryList/getLayoutOfSearch'"
       
     :searchDataApi="'/ccesmanage/AppUseSummaryList/getList'"></ct-searchlist> -->
@@ -8,9 +7,10 @@
       <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
       
     :searchDataApi="'/propertyPublishList/getListOfSearchModel'" :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
-       <ct-searchlist :apiParam="apiParam" ref="reflist" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'"
+       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'"
       :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModelForMy'"></ct-searchlist>
 
+ 
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>
@@ -18,12 +18,6 @@
   
 <script lang="ts" setup>
 import { ref, nextTick } from 'vue'
-
 const apiParam = {}
-const reflist=ref()
-function clickHandle(){
- reflist.value.refScreen.model.formData.setValueByFieldName('b_date','code1','2026-05-20')
-  reflist.value.search()
-}
 
 </script>