centaline-data-driven-v3 0.0.67 → 0.0.68

package/package.json

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

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/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,7 +171,7 @@ const ComboBox = function (source) {
                     key: searchText
                 }
             };
-            request.postHandler(common.globalUri(), params).then((response) => {
+            request.postTokenHandler(common.globalUri(), params,cancelTokenSource).then((response) => {
                 if (response.rtnCode === 200) {
                     if (CallBack) {
                         CallBack(response.content)

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/utils/request.js

@@ -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) {
@@ -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 + 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;