centaline-data-driven-v3 0.0.66 → 0.0.68

package/package.json

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

package/src/assets/commonWeb.css

@@ -128,6 +128,9 @@ body {
   line-height: 26px;
   color: var(--centalineGray);
 }
+.el-input__suffix{
+  font-size: 12px;
+}
 
 .button-initial {
   margin-top: 8px;

package/src/components/common/video.vue

@@ -2,8 +2,8 @@
     <div class="alert fade in" role="alert"
         style="padding:0px;border-bottom:none;display: table-caption;margin-left: 5px;">
         <video :src="submitData[router.submitFormField]" controls="true" autoplay controlslist="nodownload"
-            :height="router.dialogHeight ? router.dialogHeight - 10 : '40'"
-            :width="router.dialogWidth ? router.dialogWidth - 10 : '100%'">您的浏览器不支持 video 标签。
+            :height="router.pageHeight ? router.pageHeight - 10 : '40'"
+            :width="router.pageWidth ? router.pageWidth - 10 : '100%'">您的浏览器不支持 video 标签。
         </video>
     </div>
 </template>

package/src/components/web/ComboBox.vue

@@ -1,12 +1,13 @@
 <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"
                 @click="clickHandler" :class="[model.moreActionRouter ? 'selectmore' : '', open ? 'open' : '']"
-                :filter-method="getOptions">
+                :filter-method="debouncedRemoteMethod" @compositionstart="handleCompositionStart"
+                @compositionend="handleCompositionEnd">
                 <template #default="{ item }">
                     <el-tooltip :disabled="!item.toolTip" :content="item.toolTip" placement="right">
                         <span v-html="item.displayName || item.name"></span>
@@ -43,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';
@@ -56,7 +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) {
@@ -79,8 +83,16 @@ function visibleChange(visible) {
 }
 //获取数据列表
 function getOptions(key) {
-    if (!model.value.moreActionRouter) {
-        model.value.getOptions(props.parameterAction, key, function (data) {
+    if (cancelTokenSource) {
+        // 取消上一次未完成的请求
+        cancelTokenSource.cancel('取消上一次请求');
+      }
+
+      // 创建新的取消令牌
+      cancelTokenSource = Axios.CancelToken.source();
+    if (!isComposing.value &&!model.value.moreActionRouter) {
+        model.value.getOptions(props.parameterAction, key,cancelTokenSource, function (data) {
+          if(data){
             data.forEach((v) => {
                 let item = model.value.globalOptions.find((v1) => {
                     return v1.code === v.code && v1.locked;
@@ -113,17 +125,32 @@ function getOptions(key) {
             nextTick(function () {
                 setminWidth()
             });
+          }
         })
     }
 
 }
+// 防抖函数
+function debounce(func, delay) {
+    let timer = null;
+    return function () {
+        const context = this;
+        const args = arguments;
+        clearTimeout(timer);
+        timer = setTimeout(() => {
+            func.apply(context, args);
+        }, delay);
+    };
+}
+// 创建防抖后的远程搜索方法，延迟 300 毫秒
+const debouncedRemoteMethod = debounce(getOptions, 300);
 //选中值发生变化时触发
 function change(val) {
     if (typeof val == 'undefined') {
         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)
@@ -131,6 +158,13 @@ function change(val) {
     if (model.value.autoSearch) emit('search');
 
 }
+function handleCompositionStart() {
+    isComposing.value = true;
+}
+
+function handleCompositionEnd() {
+    isComposing.value = false;
+}
 //弹出选择列表
 function popupSearchListHandle() {
     emit('popupSearchList', false, model, model.value.moreActionRouter, (optionArr) => {

package/src/components/web/FormList.vue

@@ -68,6 +68,9 @@
                 </div>
             </template>
             <template v-else>
+                <div v-if="model.controlLabel" class="list-title">
+                    <h5>{{ model.controlLabel }}</h5>
+                </div>
                 <div class="list-button">
                     <component v-if="model.selectRouter !== null" :is="model.selectRouter.is"
                         :vmodel="model.selectRouter" @click="popupSearchListHandle(model.selectRouter)"></component>
@@ -79,33 +82,37 @@
                 <el-table :data="model.tableData" border :show-summary="model.showSummary"
                     :summary-method="getSummaries" style="width: 100%" highlight-current-row>
                     <template v-if="model.rowActionRoutersAlign === 1">
-                      <el-table-column label="操作"
-                        v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :width="'100%'">
-                        <template #header="{ column, $index }">
-                            {{ setcolumnminWidth(column) }}
-                            <span style="width:auto; white-space: nowrap;">{{ column.label }}</span>
-                        </template>
-                        <template #default="scope">
-                            <el-tag :disable-transitions="true" v-if="scope.row.edit || scope.row.isSet" type="success"
-                                @click="saveRow(scope.row, scope.$index, true)" style="cursor: pointer;">{{
-                                    scope.row.isSet
-                                        ?
-                                        '保存' :
-                                        "修改" }}</el-tag>
-                            <el-tag :disable-transitions="true" v-if="scope.row.delete && !scope.row.isSet"
-                                style="cursor: pointer;" type="danger"
-                                @click="deleteRow(scope.$index, scope.row.$sourceIndex)">删除</el-tag>
-                            <el-tag :disable-transitions="true" v-else-if="scope.row.isSet"
-                                @click="saveRow(scope.row, scope.$index, false)" style="cursor: pointer;">取消</el-tag>
-                            <template v-for="(v, i) in model.buttons">
-                                <el-tag
-                                    v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
-                                    style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }} 1</el-tag>
-
+                        <el-table-column label="操作"
+                            v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0"
+                            :width="'100%'">
+                            <template #header="{ column, $index }">
+                                {{ setcolumnminWidth(column) }}
+                                <span style="width:auto; white-space: nowrap;">{{ column.label }}</span>
                             </template>
+                            <template #default="scope">
+                                <el-tag :disable-transitions="true" v-if="scope.row.edit || scope.row.isSet"
+                                    type="success" @click="saveRow(scope.row, scope.$index, true)"
+                                    style="cursor: pointer;">{{
+                                        scope.row.isSet
+                                            ?
+                                            '保存' :
+                                            "修改" }}</el-tag>
+                                <el-tag :disable-transitions="true" v-if="scope.row.delete && !scope.row.isSet"
+                                    style="cursor: pointer;" type="danger"
+                                    @click="deleteRow(scope.$index, scope.row.$sourceIndex)">删除</el-tag>
+                                <el-tag :disable-transitions="true" v-else-if="scope.row.isSet"
+                                    @click="saveRow(scope.row, scope.$index, false)"
+                                    style="cursor: pointer;">取消</el-tag>
+                                <template v-for="(v, i) in model.buttons">
+                                    <el-tag
+                                        v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
+                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}
+                                        1</el-tag>
 
-                        </template>
-                      </el-table-column>
+                                </template>
+
+                            </template>
+                        </el-table-column>
                     </template>
                     <template v-for="(v, i) in model.rows[0].field" :key="i">
                         <el-table-column :prop="v.fieldName1" :label="v.controlLabel" :width="v.width"
@@ -137,33 +144,37 @@
                         </el-table-column>
                     </template>
                     <template v-if="model.rowActionRoutersAlign !== 1">
-                      <el-table-column label="操作"
-                        v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :width="'100%'">
-                        <template #header="{ column, $index }">
-                            {{ setcolumnminWidth(column) }}
-                            <span style="width:auto; white-space: nowrap;">{{ column.label }}</span>
-                        </template>
-                        <template #default="scope">
-                            <el-tag :disable-transitions="true" v-if="scope.row.edit || scope.row.isSet" type="success"
-                                @click="saveRow(scope.row, scope.$index, true)" style="cursor: pointer;">{{
-                                    scope.row.isSet
-                                        ?
-                                        '保存' :
-                                        "修改" }}</el-tag>
-                            <el-tag :disable-transitions="true" v-if="scope.row.delete && !scope.row.isSet"
-                                style="cursor: pointer;" type="danger"
-                                @click="deleteRow(scope.$index, scope.row.$sourceIndex)">删除</el-tag>
-                            <el-tag :disable-transitions="true" v-else-if="scope.row.isSet"
-                                @click="saveRow(scope.row, scope.$index, false)" style="cursor: pointer;">取消</el-tag>
-                            <template v-for="(v, i) in model.buttons">
-                                <el-tag
-                                    v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
-                                    style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }} 1</el-tag>
-
+                        <el-table-column label="操作"
+                            v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0"
+                            :width="'100%'">
+                            <template #header="{ column, $index }">
+                                {{ setcolumnminWidth(column) }}
+                                <span style="width:auto; white-space: nowrap;">{{ column.label }}</span>
                             </template>
+                            <template #default="scope">
+                                <el-tag :disable-transitions="true" v-if="scope.row.edit || scope.row.isSet"
+                                    type="success" @click="saveRow(scope.row, scope.$index, true)"
+                                    style="cursor: pointer;">{{
+                                        scope.row.isSet
+                                            ?
+                                            '保存' :
+                                            "修改" }}</el-tag>
+                                <el-tag :disable-transitions="true" v-if="scope.row.delete && !scope.row.isSet"
+                                    style="cursor: pointer;" type="danger"
+                                    @click="deleteRow(scope.$index, scope.row.$sourceIndex)">删除</el-tag>
+                                <el-tag :disable-transitions="true" v-else-if="scope.row.isSet"
+                                    @click="saveRow(scope.row, scope.$index, false)"
+                                    style="cursor: pointer;">取消</el-tag>
+                                <template v-for="(v, i) in model.buttons">
+                                    <el-tag
+                                        v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
+                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}
+                                        1</el-tag>
+
+                                </template>
 
-                        </template>
-                      </el-table-column>
+                            </template>
+                        </el-table-column>
                     </template>
                     <template #empty>
                         {{ common.LocalizedString('暂无数据', '暫無數據') }}
@@ -425,7 +436,7 @@ function fieldsValidExcute() {
                             if (i === 0) {
                                 if (f.displayValidMessage) {
                                     model.value.displayValidMessage = f.displayValidMessage;
-                                } 
+                                }
                             }
                             i++;
                             rtnBool = false;
@@ -577,6 +588,12 @@ defineExpose({
 })
 </script>
 <style scoped>
+.list-title {
+    padding-bottom: 5px;
+    text-align: left;
+    display: inline-table;
+}
+
 .list-button {
     padding-bottom: 5px;
     text-align: right;
@@ -591,6 +608,7 @@ defineExpose({
     width: 100%;
 }
 
+
 .ct-form-repeat .list-title {
     padding-bottom: 5px;
     text-align: left;

package/src/components/web/RadioButton.vue

@@ -25,8 +25,15 @@ const props = defineProps({
 const model = initData(props, RadioButton)
 
 function change() {
-    changeHandler(model.value, emit);
-    if (model.value.autoSearch) emit('search');
+  if(model.value.code1){
+    model.value.selectItems1.forEach((v) => {
+      if(model.value.code1===v.code){
+        model.value.name1=v.name;
+      }
+    });
+  }
+  changeHandler(model.value, emit);    
+  if (model.value.autoSearch) emit('search');
 }
 function clearClickHandle() {
     model.value.reset()

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

@@ -38,8 +38,8 @@
                         </button>
                         <video ref="video" :src="rowData[router.submitFormField]" controls="true"
                             controlslist="nodownload" @timeupdate="saveVoiceHistoryHandler" @ended="voiceEndedHandler"
-                            :height="router.dialogHeight ? router.dialogHeight : '40'"
-                            :width="router.dialogWidth ? router.dialogWidth : '100%'">您的浏览器不支持 video 标签。
+                            :height="router.pageHeight ? router.pageHeight : '40'"
+                            :width="router.pageWidth ? router.pageWidth : '100%'">您的浏览器不支持 video 标签。
                         </video>
                     </div>
                     <img v-if="router.imgUrl && isShowImg" slot="reference"
@@ -107,7 +107,7 @@ const option = ref({
 const tooltipModel = ref({});
 const labelColor = ref('')
 const video = ref()
-const label = computed(() => {
+const label = computed(() => {  
     return (typeof props.colValue === "undefined" || props.colValue === '') ? props.router.controlLabel : props.colValue
 })
 const isShowLabel = computed(() => {
@@ -127,6 +127,7 @@ const isShowLabel = computed(() => {
     }
     return flag;
 })
+
 isVisited()
 function isVisited() {
     var key = props.router.action + props.rowData.chanceID;

package/src/components/web/SearchScreen.vue

@@ -22,7 +22,7 @@
                             @SaveSearchWhere="SaveSearchWhere" @SearchWhereManage="SearchWhereManage"
                             @clickSearchWhere="clickSearchWhere"></component>
                         <br v-else-if="col.controlType === Enum.ControlType.LineFeed" />
-                        <component v-else :from="from" class="list-field" ref="Fields" v-bind="col.listBind"
+                        <component v-else :from="from" class="list-field" v-bind="col.listBind"
                             :is="col.is" :vmodel="col" :parameterAction="model.parameterAction"
                             @search="searchHandler(col)" @change="changeHandler(col)">
                         </component>

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

@@ -111,6 +111,7 @@ function loadFromModel(source, isFormList) {
             if (attrKey == 'name1') {
               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

@@ -135,16 +135,16 @@ function loadSearchScreenModel(source, prevParam) {
             var advIndex = rtn.sourceFieldsArr.findIndex((v) => {
                 return v.controlType === Enum.ControlType.ButtonAdvancedSearch;
             });
-            // if (advIndex === -1) {
-            //     advIndex = rtn.sourceFieldsArr.findIndex((v) => {
-            //         return v.controlType === Enum.ControlType.ButtonReset;
-            //     });
-            // }
-            // if (advIndex === -1) {
-            //     advIndex = rtn.sourceFieldsArr.findIndex((v) => {
-            //         return v.controlType === Enum.ControlType.ButtonSearch;
-            //     });
-            // }
+            if (advIndex === -1) {
+                advIndex = rtn.sourceFieldsArr.findIndex((v) => {
+                    return v.controlType === Enum.ControlType.ButtonReset;
+                });
+            }
+            if (advIndex === -1) {
+                advIndex = rtn.sourceFieldsArr.findIndex((v) => {
+                    return v.controlType === Enum.ControlType.ButtonSearch;
+                });
+            }
             var screens = rtn.sourceFieldsArr.filter((v, i) => {
                 return (advIndex !== -1 && i > advIndex) && v.controlType !== Enum.ControlType.From;
             });

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_052cca91-c75e-45cc-b549-90730d12f6bc",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_052cca91-c75e-45cc-b549-90730d12f6bc",Platform:"IOS"}',
+                authObject: '{EmpID:"Token_00f32936-8123-45d4-b1b2-2206150ab06e",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_00f32936-8123-45d4-b1b2-2206150ab06e",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

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;