centaline-data-driven-v3 0.0.99 → 0.1.1

package/package.json

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

package/src/components/web/photo.vue

@@ -205,13 +205,12 @@ function load(data) {
 watch(
   () => model.value, // 监听的源
   (newValue, oldValue) => {
-    console.log('Model changed:', newValue);
-    console.log('Old value:', oldValue);
-    if (newValue?.file && newValue?.file != oldValue?.file) {
+    if (newValue?.file?.raw&& newValue?.file != oldValue?.file) {
       // 处理文件上传
       var options = {
         file: newValue.file.raw
       }
+      model.value.file = [];
       SliceUpload(options);
     }
   },

package/src/loader/src/File.js

@@ -303,9 +303,9 @@ function getOptions(model, callBack) {
     if (!model.paramName1) {
         return false;
     }
-    if (model.optionModel.isInit) {
-        return model.optionModel.options;
-    }
+    // if (model.optionModel.isInit) {
+    //     return model.optionModel.options;
+    // }
 
     var params = {
         action: model.optionApi,

package/src/loader/src/Form.js

@@ -119,6 +119,25 @@ function loadFromModel(source, isFormList) {
               this.form.$vue.loaded(this.form)
             }
           }
+          if (rtn1.controlType === Enum.ControlType.File
+            || rtn1.controlType === Enum.ControlType.SliceUpload) {
+            if (attrKey.toLowerCase() == 'paramName1'.toLowerCase()) {
+              rtn1.mediaLabe.mediaLabelName = ''
+              rtn1.mediaLabe.mediaLabelID = ''
+              if (rtn1.fileList) {
+                rtn1.fileList.forEach((v) => {
+                  v.mediaLabelID = ''
+                  v.mediaLabelName = ''
+                })
+              }
+              if (rtn1.fileSourceList) {
+                rtn1.fileSourceList.forEach((v) => {
+                  v.mediaLabelID = ''
+                  v.mediaLabelName = ''
+                })
+              }
+            }
+          }
           hiddenHandle(rtn1, this.form);
           requiredHandle(rtn1, this.form);
         }

package/src/loader/src/Router.js

@@ -75,6 +75,10 @@ const Router = function (source) {
       return source.buttonType === Enum.ButtonType.openFileDialog;
     },
 
+    get isButton() {
+      return source.buttonType === Enum.ButtonType.Button;
+    },
+
     //是否需要警示标志
     get flagAlert() {
       return source.flagAlert;

package/src/main.js

@@ -22,7 +22,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 
 app.use(centaline, {
     //baseUrl:"https://uplink.centaline.com.cn/xian/",
-    baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    baseUrl:"https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
     //baseUrl: "http://10.88.22.66:6060/xian/",
@@ -30,10 +30,10 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
-    showRequestErrorMessage: false,
+    showRequestErrorMessage: true,
     language: 'HK',
     handler: {
         // 打开tab页
@@ -67,12 +67,12 @@ app.use(centaline, {
             return {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
-                //authObject: '{token:"1-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
-                authObject: '{EmpID:"Token_4abee9c9-2616-4cb5-beda-1f94dc7d8a96",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4abee9c9-2616-4cb5-beda-1f94dc7d8a96",Platform:"IOS"}',
+                authObject: '{token:"1647-1927532276019761152",platform:"WEB"}',
+                //authObject: '{EmpID:"Token_4abee9c9-2616-4cb5-beda-1f94dc7d8a96",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4abee9c9-2616-4cb5-beda-1f94dc7d8a96",Platform:"IOS"}',
             };
         },
         getToken() {
-            return "1647-1907319603235786752"
+            return "wufw-1926816278719369216"
         },
         // 请求完成事件，可判断是否登录过期执行响应操作
         requestComplete: function (response) {

package/src/utils/mixins.js

@@ -124,7 +124,7 @@ function validExcuteMessage(validtemp, model) {
 }
 
 //路由操作事件
-export function RouterClickHandler(field, submitData, action, model, source, callBack,flagMouseenter) {
+export function RouterClickHandler(field, submitData, action, model, source, callBack, flagMouseenter) {
     if (source == 'form') {
         model.scripts.$fd = field.id;
         model.scripts.$result = [];
@@ -144,7 +144,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                         //action有值，提交到后台
                         if (field.action) {
                             if (common.flagApp()) {
-                                showLoadingToast({ message:common.LocalizedString('正在处理', '正在處理') , forbidClick: true, duration: 100000 });
+                                showLoadingToast({ message: common.LocalizedString('正在处理', '正在處理'), forbidClick: true, duration: 100000 });
                             }
                             field.disabled = true;//提交按钮禁用
                             model.pageDisabled = true;
@@ -424,20 +424,20 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
                 }
                 else if (field.isOpenUrlInBrowse) {// 浏览器打开
-                    if(common.getDataDrivenOpts().handler.openUrlInBrowse){
+                    if (common.getDataDrivenOpts().handler.openUrlInBrowse) {
                         common.getDataDrivenOpts().handler.openUrlInBrowse(submitData[field.submitFormField]);
                     }
-                    else{
+                    else {
                         window.open(submitData[field.submitFormField], "_blank");
                     }
                 }
                 else if (field.isBrowserNewTab) {// 浏览器打开
                     submitData = field.getActionPara(submitData).para;
                     let query = common.objectToQueryStr(submitData);
-                    if(common.getDataDrivenOpts().handler.openUrlInBrowse){
+                    if (common.getDataDrivenOpts().handler.openUrlInBrowse) {
                         common.getDataDrivenOpts().handler.openUrlInBrowse(action + query);
                     }
-                    else{
+                    else {
                         window.open(action + query, "_blank");
                     }
                 }
@@ -520,10 +520,10 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                             },
                         ],
                     };
-                    if(flagMouseenter&&callBack){
+                    if (flagMouseenter && callBack) {
                         callBack(dialogOption.content[0])
                     }
-                    else{
+                    else {
                         common.openDialog(dialogOption);
                     }
                 }
@@ -664,10 +664,10 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                         else {
                             field.loading = true;
                             if (!field.flagAlert && field.content) {
-                                common.message( field.content, 'info',1500,true)
+                                common.message(field.content, 'info', 1500, true)
                             }
                             field.doBlobAction(submitData, (data, headers) => {
-                                field.loading=false;
+                                field.loading = false;
                                 if (data.type == "application/json") {
                                     const reader = new FileReader();
                                     reader.readAsText(data, 'utf-8');
@@ -772,10 +772,10 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                             },
                         }]
                     };
-                    if(flagMouseenter&&callBack){
+                    if (flagMouseenter && callBack) {
                         callBack(dialogOption.content[0])
                     }
-                    else{
+                    else {
                         common.openDialog(dialogOption);
                     }
                 }
@@ -798,10 +798,10 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                             },
                         }]
                     };
-                    if(flagMouseenter&&callBack){
+                    if (flagMouseenter && callBack) {
                         callBack(dialogOption.content[0])
                     }
-                    else{
+                    else {
                         common.openDialog(dialogOption);
                     }
                 }
@@ -846,20 +846,30 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                             },
                         }]
                     };
-                    if(flagMouseenter&&callBack){
+                    if (flagMouseenter && callBack) {
                         callBack(dialogOption.content[0])
                     }
-                    else{
+                    else {
                         common.openDialog(dialogOption);
                     }
                 }
                 else {
                     if (source == 'table') {
-                      model.$vue.operationLoading = true
+                        model.$vue.operationLoading = true
                     }
                     else {
-                      submitData = field.getActionPara(submitData).para;
+                        submitData = field.getActionPara(submitData).para;
+                        if (field.is == 'ct-button' && field.isButton) {
+                            field.loading = true;
+                            var fieldButton = model.fields.find((v) => {
+                                return v.fieldName1 === field.key;
+                            });
+                            if (fieldButton) {
+                                fieldButton.loading = true;
+                            }
+                        }
                     }
+
                     field.doAction(submitData, (data) => {
                         if (source == 'table') {
                             model.$vue.operationLoading = false
@@ -904,6 +914,15 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                             }
                         }
                         else {
+                            if (field.is == 'ct-button' && field.isButton) {
+                                field.loading = false;
+                                var fieldButton = model.fields.find((v) => {
+                                    return v.fieldName1 === field.key;
+                                });
+                                if (fieldButton) {
+                                    fieldButton.loading = false;
+                                }
+                            }
                             if (data.rtnCode === Enum.ReturnCode.Successful || data.isSuccess) {
                                 if (callBack) {
                                     callBack(data);

package/src/views/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div  class="data-driven" id="app-form" >
    
-    <ct-form :api="'/admin/SchoolTeachingPlanExam/readDetail'" :apiParam="apiParam" :flagNavbar="true"></ct-form>
+    <ct-form :api="'/EmployeeAttendanceBillApply/getLayoutOfNew'" :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={"actionType":2,"teachingPlanId":"1"}
+ const apiParam={"actionType":2}
 </script>