centaline-data-driven-v3 0.0.67 → 0.0.69

package/package.json

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

package/src/components/Layout/Layout.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="ct-Layout" v-if="Layout !== null && !loading">
+    <div class="ct-Layout" v-if="Layout !== null && !loading" @click="rowClickHandle" :style="{ 'background-color': selectIndex === rowindex?selectedRowBackColor:'' }">
         <ct-layoutchildren :rowindex="rowindex" :actionRouter="actionRouter" :rowdata="vmodel" :vmodel="LayoutList"
             :flagflex="true" :fields="fields" :parameterAction="parameterAction"
             :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler"
@@ -9,7 +9,7 @@
 <script setup lang="ts">
 import { ref, nextTick } from 'vue'
 import common from '../../utils/common'
-const emit = defineEmits(['rolRouterclick', 'changeHandler'])
+const emit = defineEmits(['rolRouterclick', 'changeHandler','rowclick'])
 const props = defineProps({
     action: String,
     cellLayout: String,
@@ -20,6 +20,8 @@ const props = defineProps({
     apiParam: Object,
     parameterAction: String,
     fields: Array,
+    selectIndex:Number,
+    selectedRowBackColor:String,
     formListactionRouter: {
         type: Array,
         default: [],
@@ -315,6 +317,9 @@ function changeHandler(field) {
         emit("changeHandler", field, props.vmodel.$sourceIndex);
     }
 }
+function rowClickHandle(){
+    emit("rowclick", props.rowindex);
+}
 </script>
 <style scoped>
 .ct-Layout {

package/src/components/app/ComboBox.vue

@@ -98,6 +98,7 @@
 </template>
 <script lang="ts" setup>
 import { ref } from 'vue'
+import Axios from 'axios';
 import { initData, changeHandler } from '../../utils/mixins';
 import ComboBox from '../../loader/src/ComboBox';
 const emit = defineEmits(['click', 'input', 'change', 'popupSearchList'])
@@ -110,19 +111,29 @@ const model = initData(props, ComboBox)
 const showPicker = ref(false)
 const searchText = ref('')
 const checkboxRefs = ref([])
+let cancelTokenSource = null; // 用于存储取消令牌
 function visibleChange() {
-    if(model.value.locked){
+    if (model.value.locked) {
         return;
     }
-    model.value.getOptions(props.parameterAction, searchText.value, function (data) {
+    getOptions();
+}
+function getOptions() {
+    if (cancelTokenSource) {
+        // 取消上一次未完成的请求
+        cancelTokenSource.cancel('取消上一次请求');
+    }
+
+    // 创建新的取消令牌
+    cancelTokenSource = Axios.CancelToken.source();
+    model.value.getOptions(props.parameterAction, searchText.value, cancelTokenSource, function (data) {
         model.value.options = data
         showPicker.value = true
     })
 }
-
 function change(item) {
     showPicker.value = false;
-  
+
     model.value.value = item.code;
     model.value.setcode(item.code)
     if (model.value.isList) {
@@ -145,9 +156,7 @@ function onConfirm() {
     changeHandler(model.value, emit)
 }
 function searchInputHandle() {
-    model.value.getOptions(props.parameterAction, searchText.value, function (data) {
-        model.value.options = data;
-    })
+    getOptions();
 }
 function itemOnClick(index, item) {
     if (model.value.locked || item.locked) {

package/src/components/app/PhotoSelect.vue

@@ -2,7 +2,7 @@
     <div class="van-uploader" style="margin:10px 10px 0 10px; " v-if="model">
         <div class="van-uploader__wrapper">
             <div ref="uploadImgItem">
-                <template v-for="(element, index) in  model.fileList" :key="element.mediaCode">
+                <template v-for="(element, index) in model.fileList" :key="element.mediaCode">
                     <div class="van-uploader__preview" style="display:inline-block;"
                         @click="viewerfile(model.fileList, index)">
                         <div class="van-image van-uploader__preview-image">
@@ -117,7 +117,7 @@ function handleOpen() {
         chooseList.push(n);
     });
     var dialogOption = {
-        title: common.LocalizedString('选择','選擇') + model.value.controlLabel || common.LocalizedString('选择图片','選擇圖片'),
+        title: common.LocalizedString('选择', '選擇') + model.value.controlLabel || common.LocalizedString('选择图片', '選擇圖片'),
         pane: common.getParentPane(),
         content: [{
             component: "ct-photoselectlist",
@@ -166,16 +166,21 @@ function selfValidExcute(eventName) {
 }
 
 function viewerfile(list, index) {
+    var file = list[index];
+    if (file && file.mediaTypeID == 4 && !common.isVideoFile(file.mediaUrl) && common.getDataDrivenOpts().handler.openUrlInBrowse) {
+        common.getDataDrivenOpts().handler.openUrlInBrowse(file.mediaUrl)
+    }
+    else {
+        var MediaAlbum = [{ albumName: model.value.controlLabel || "媒体", medias: [] as any }];
 
-    var MediaAlbum = [{ albumName: model.value.controlLabel || "媒体", medias: [] as any }];
-
-    let fileList = list.filter((item) => {
-        return item.flagDeleted !== true;
-    });
-    fileList.forEach((v) => {
-        MediaAlbum[0].medias.push(v);
-    });
-    common.viewerfile((model.value.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.value.mediaViewPageType);
+        let fileList = list.filter((item) => {
+            return item.flagDeleted !== true;
+        });
+        fileList.forEach((v) => {
+            MediaAlbum[0].medias.push(v);
+        });
+        common.viewerfile((model.value.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.value.mediaViewPageType);
+    }
 }
 
 

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

@@ -181,7 +181,9 @@ function load(data) {
     model.value.flagApp = true
     tableError.value = false
     tableLoading.value = false
-    model.value.$vue = { loadStats, updateCurrentRow, doAction, itemKey, emit, tableError, refreshTableColumns, getPage, setTableHeight };
+    model.value.scripts.formData = model.value.formData;
+    model.value.scripts.formData.formTable = model.value;
+    model.value.$vue = { loadStats, updateCurrentRow, doAction, itemKey,toolbarClickHandler, emit, tableError, refreshTableColumns, getPage, setTableHeight };
     emit("loaded");
     if (model.value.rowCount == model.value.$total) {
         finished.value = true;

package/src/components/app/searchScreen.vue

@@ -220,7 +220,7 @@ function open(field) {
     field.showLabel = false;
     field.isList = true;
     if (field.is == 'ct-combobox') {
-        field.getOptions(model.value.parameterAction, '', function (data) {
+        field.getOptions(model.value.parameterAction, '',null, function (data) {
             field.options = data
         })
     }

package/src/components/web/ComboBox.vue

@@ -1,7 +1,7 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-            <el-select-v2 ref="refselect" :key="itemKey" v-model="model.value" :options="model.options"
+            <el-select-v2 ref="refselect" :key="model.itemKey" v-model="model.value" :options="model.options"
                 :props="model.optionAttrs" v-bind="model.attrs" :disabled="model.locked" clearable @change="change"
                 :placeholder="model.placeholder" @visible-change="visibleChange" @clear="clear"
                 :filterable="model.filterable" :multiple="model.multiple" class="fieldControl" :height="300"
@@ -44,6 +44,7 @@
     </ct-field>
 </template>
 <script lang="ts" setup>
+import Axios from 'axios';
 import { ref, nextTick } from 'vue'
 import { Search } from '@element-plus/icons-vue'
 import { initData, changeHandler } from '../../utils/mixins';
@@ -57,8 +58,9 @@ const props = defineProps({
 const model = initData(props, ComboBox)
 const refselect = ref()
 const open = ref(false)
-const itemKey = ref(Math.random())
 const isComposing = ref(false);
+model.value.itemKey=Math.random();
+let cancelTokenSource = null; // 用于存储取消令牌
 
 //下拉框出现/隐藏时触发
 function visibleChange(visible) {
@@ -81,8 +83,15 @@ function visibleChange(visible) {
 }
 //获取数据列表
 function getOptions(key) {
+    if (cancelTokenSource) {
+        // 取消上一次未完成的请求
+        cancelTokenSource.cancel('取消上一次请求');
+      }
+
+      // 创建新的取消令牌
+      cancelTokenSource = Axios.CancelToken.source();
     if (!isComposing.value &&!model.value.moreActionRouter) {
-        model.value.getOptions(props.parameterAction, key, function (data) {
+        model.value.getOptions(props.parameterAction, key,cancelTokenSource, function (data) {
           if(data){
             data.forEach((v) => {
                 let item = model.value.globalOptions.find((v1) => {
@@ -141,7 +150,7 @@ function change(val) {
         if (model.value.defaultCode1) {
             val = model.value.defaultCode1
             model.value.value = val
-            itemKey.value = Math.random()
+            model.value.itemKey = Math.random()
         }
     }
     model.value.setcode(val)

package/src/components/web/Form.vue

@@ -242,7 +242,7 @@ function init() {
 function load(data) {
     model.value = data
     model.value.parentModelForm = props.parentModelForm
-    model.value.$vue = { fieldClickHandler, clickHandler, validExcute, emit, getFormObj, changeCallBackHandler, getFileData, Form, load, init, updateFields, itemKey,downloadUrl };
+    model.value.$vue = { fieldClickHandler, clickHandler, validExcute, emit, getFormObj, changeCallBackHandler, getFileData, Form, load, init, updateFields, itemKey,downloadUrl,doAction };
     model.value.$vue.openType = props.openType
     model.value.isIframe = props.isIframe
     if (model.value.scripts) {
@@ -269,7 +269,9 @@ function failLoad() {
 function getFileData(field) {
     return Form.getFileData(field, model.value);
 }
-
+function doAction(data) {
+  Form.doAction(data)
+}
 //判断是否有滚动条
 function getisScroll() {
     if (Fields.value) {

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

@@ -206,7 +206,8 @@
             <div v-else>
                 <div v-for="(row, rowindex) in model.listData" :key="rowindex">
                     <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex" :key="itemKey"
-                        @rolRouterclick="rolRouterCellClickHandler" :actionRouter="model.actionRouter">
+                        @rolRouterclick="rolRouterCellClickHandler" :actionRouter="model.actionRouter"
+                        :selectIndex="model.selectIndex" :selectedRowBackColor="model.selectedRowBackColor" @rowclick="rowLayoutClickHandle">
                     </ct-layout>
                 </div>
             </div>
@@ -350,7 +351,7 @@ onActivated(() => {
     })
 })
 onDeactivated(() => {
-  downloadUrl.value=''
+    downloadUrl.value = ''
 })
 
 //查询数据
@@ -376,7 +377,7 @@ function searchComplate(m, defaultSearch) {
 //初始化数据
 function load(data) {
     model.value = data;
-    model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage,toolbarClickHandler };
+    model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage, toolbarClickHandler };
     model.value.isIframe = props.isIframe
     //自动查询 调用合并列
     if (model.value.listData.length > 0) {
@@ -588,18 +589,18 @@ function importComplete(res, field) {
     }
     else {
         if (field && field.callBackFunName) {
-          changeCallBackHandler(field, field.callBackFunName, res.content);
+            changeCallBackHandler(field, field.callBackFunName, res.content);
         }
         else {
-          doAction(res)
+            doAction(res)
         }
     }
 }
 function changeCallBackHandler(field, callBackFunName, callBackPara) {
-  if (callBackFunName) {
-      model.value.scripts.$fd = field.id;
-      common.excuteFunStr.call(model.value.scripts, callBackFunName, callBackPara);
-  }
+    if (callBackFunName) {
+        model.value.scripts.$fd = field.id;
+        common.excuteFunStr.call(model.value.scripts, callBackFunName, callBackPara);
+    }
 }
 //计算数据合并行
 function tdRowspan(column, row) {
@@ -678,6 +679,9 @@ function rowClickHandle(ev, index) {
     ev.cancelBubble = true;
     ev.stopPropagation();
 }
+function rowLayoutClickHandle(index) {
+    model.value.selectIndex = index;
+}
 
 //表单列表操作
 function rolRouterClickHandler(field, rowData, rowindex, visible, columnName) {

package/src/components/web/SearchList.vue

@@ -138,6 +138,7 @@ onActivated(() => {
             if (RefSideRight.value.detailSearchlist) {
                 RefSideRight.value.detailSearchlist.refreshPage(listHeight.value);
             }
+            resizeSearchList();
         }
     })
 })

package/src/loader/src/ComboBox.js

@@ -160,7 +160,7 @@ const ComboBox = function (source) {
             }
             return source.code1 === '' ? [] : [{ value: source.code1, label: source.name1 }]
         },
-        getOptions(paramsAction, searchText, CallBack) {
+        getOptions(paramsAction, searchText, cancelTokenSource, CallBack) {
             var apiAddrs = paramsAction;
             var params = {
                 action: apiAddrs,
@@ -171,13 +171,24 @@ const ComboBox = function (source) {
                     key: searchText
                 }
             };
-            request.postHandler(common.globalUri(), params).then((response) => {
-                if (response.rtnCode === 200) {
-                    if (CallBack) {
-                        CallBack(response.content)
+            if (cancelTokenSource) {
+                request.postTokenHandler(common.globalUri(), params, cancelTokenSource).then((response) => {
+                    if (response.rtnCode === 200) {
+                        if (CallBack) {
+                            CallBack(response.content)
+                        }
                     }
-                }
-            });
+                });
+            }
+            else{
+                request.postHandler(common.globalUri(), params).then((response) => {
+                    if (response.rtnCode === 200) {
+                        if (CallBack) {
+                            CallBack(response.content)
+                        }
+                    }
+                });
+            }
         },
     };
     rtn = base.copy(source, rtn);

package/src/loader/src/Form.js

@@ -109,9 +109,9 @@ function loadFromModel(source, isFormList) {
               rtn1["options"][0]["value"] = attrValue
             }
             if (attrKey == 'name1') {
-              rtn1["name1"] = attrValue;
               rtn1["options"][0]["label"] = attrValue
             }
+            if(rtn1.itemKey)rtn1.itemKey=Math.random()
           }
           hiddenHandle(rtn1, this.form);
           requiredHandle(rtn1, this.form);

package/src/loader/src/FormList.js

@@ -490,7 +490,7 @@ function addRow(model) {
                             "buttonType": Enum.ButtonType.Submit
                         }
                     ],
-                    actionRouters: model.actionRouters,
+                    actionRouters: model.source.actionRouters,
                 },
                 parentModelForm: model.parentModel,
                 relationParentFormFields:model.getRelationParentFormFields(),

package/src/loader/src/SearchScreen.js

@@ -320,8 +320,6 @@ 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: false,//是否app端
+    flagApp: true,//是否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_00f32936-8123-45d4-b1b2-2206150ab06e",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_00f32936-8123-45d4-b1b2-2206150ab06e",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_15dc3fe3-b962-4bd2-85e2-2ce843676353",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_15dc3fe3-b962-4bd2-85e2-2ce843676353",Platform:"IOS"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/mixins.js

@@ -342,7 +342,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                             cancelButtonText: '取消',
                                             type: 'warning'
                                         }).then(() => {
+                                            field.disabled = true;
                                             field.doAction(model.$vue.getFormObj({ flagHaveAlert: '1' }), (res) => {
+                                                field.disabled = false;
                                                 if (res.rtnCode === Enum.ReturnCode.Successful) {
                                                     if (res.notification === Enum.ActionType.Router) {
                                                         if (common.dialogList && common.dialogList.List.value.length > 0
@@ -358,6 +360,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                 }
                                             });
                                         }).catch(() => {
+                                            field.disabled = false;
                                         });
                                     }
                                 }, model.scripts);

package/src/utils/request.js

@@ -15,7 +15,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + params.action;
+      url = url + (url=='' || url.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 + params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  params.action;
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -119,7 +119,7 @@ const request = {
       return Promise.reject(response);
     }
     //返回给下一个链式调用
-    return Promise.resolve(response.data,response.headers);
+    return Promise.resolve(response.data, response.headers);
   },
   postHandler(url, params, scripts) {
     if (params.action.indexOf('http://') > -1 || params.action.indexOf('https://') > -1) {
@@ -127,7 +127,7 @@ const request = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -168,6 +168,33 @@ const request = {
       return Promise.resolve(ex);//错误处理了，直接返回成功，要判断response.rtnCode=200再处理
     });
   },
+  //有新请求关闭上一次请求
+  postTokenHandler(url, params, cancelTokenSource) {
+    if (params.action.indexOf('http://') > -1 || params.action.indexOf('https://') > -1) {
+      url = params.action;
+      params = params.para;
+    }
+    else if (common.flagRouterSelf()) {
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') +  params.action;
+      params = params.para;
+    }
+    return Axios.post(url, params, {
+      headers: common.getDataDrivenOpts().handler.getRequestHeaders(),
+      cancelToken: cancelTokenSource.token, // 传递取消令牌
+    }).then((response) => {
+      return this.postThenHandler(response);
+    }).catch((ex) => {
+      if (!Axios.isCancel(ex)) {
+        if (ex.message) {
+          common.message(ex.message, 'error')
+        }
+        else if (typeof ex.data === "string") {
+          common.message(ex.data, 'error')
+        }
+      }
+      return Promise.resolve(ex.data ? ex.data : ex);//错误处理了，直接返回成功，要判断response.rtnCode=200再处理
+    });
+  },
 };
 request.install = function (app) {
   app.config.globalProperties.$request = request;

package/src/views/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div  class="data-driven" id="app-form" >
    
-    <ct-form :api="'/PropertyPublish/readDetail'" :apiParam="apiParam" :flagNavbar="true"></ct-form>
+    <ct-form :api="'/admin/SchoolTeachingPlanActivityExamAnswer/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={"actionType":2,propertyCode: "B9D0D330-95B2-4D5D-B6DB-EB0D62B7BF5A",sitePlatformID: "10"}
+ const apiParam={"rowId":"1900912713408843776","actionType":3}
 </script>