centaline-data-driven-v3 0.1.55 → 0.1.57

package/package.json

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

package/src/components/app/File.vue

@@ -70,6 +70,8 @@ import common from '../../utils/common'
 import File from '../../loader/src/File';
 import util from '../../utils/pub-use'
 import draggable from "vuedraggable";
+import axios from 'axios';  // 如未引入，需安装 axios
+
 const emit = defineEmits(['loaded', "change", "click"])
 const props = defineProps({
     api: String,
@@ -137,13 +139,14 @@ function beforeUploadProcess(file) {
 }
 //文件上传时的钩子
 function uploadProcess(file) {
-    if (file.length && file.length > 0) {
-        file.forEach((v) => {
-            SliceUpload(v);
-        });
-    } else {
-        SliceUpload(file);
+  const files = Array.isArray(file) ? file : [file];
+  files.forEach((v) => {
+    if (model.value.controlType == 51) {
+      SliceUpload(v);           // 分片上传（原有）
+    } else if (model.value.controlType == 25) {
+      normalUpload(v);          // 普通上传（新增）
     }
+  });
 }
 //删除
 function handleRemove(file) {
@@ -242,6 +245,71 @@ function uploadpro(uploadOptions, res, xhr, flagError) {
     }
 
 }
+
+async function normalUpload(options) {
+        const { file, onProgress, onSuccess, onError } = options;
+
+  // 生成唯一标识，与分片上传保持一致
+  const uid = File.uploadguid();
+  file.uid = uid;
+
+  // 先加入文件列表（进度环状态）
+  addfileItem(file);
+  const index = model.value.fileList.findIndex(v => v.uid === uid);
+
+  const formData = new FormData();
+  formData.append('file', file);          // 字段名需与后台一致
+  const customHeaders = common.getDataDrivenOpts().handler.getRequestHeaders();
+
+  try {
+    const res = await axios.post(model.value.action, formData, {
+       headers: {
+        ...customHeaders,                      // 先合并自定义头
+        'Content-Type': 'multipart/form-data', // 再保证 multipart 类型
+      },
+        onUploadProgress: (progressEvent) => {
+        const percent = Math.round(
+          (progressEvent.loaded * 100) / progressEvent.total
+        );
+        // 直接更新列表中的进度，进度环会自动响应
+        if (index !== -1) {
+          model.value.fileList[index].loadProgress = percent;
+        }
+      },
+    });
+
+    // 模拟原有 handleAvatarSuccess 的处理
+    if (res.data.rtnCode === 200) {
+      // 将后台返回的媒体信息整合
+      const media = res.data.content[0];  // 根据实际返回结构调整
+      media.mediaLabelID = file.mediaLabelID || model.value.mediaLabe?.mediaLabelID || '';
+      media.mediaLabelName = file.mediaLabelName || model.value.mediaLabe?.mediaLabelName || '';
+
+      // 写入原始数据源
+      model.value.fileSourceList.push(media);
+
+      // 构造最终文件对象（复用已有方法）
+      const data = File.getFileData(media);
+      data.progressFlag = false;
+      data.loadProgress = 100;
+      data.uid = uid;
+
+      // 替换列表项，结束进度状态
+      if (index !== -1) {
+        model.value.fileList[index] = data;
+      }
+
+      handleChange(); // 触发 change 事件
+    } else {
+      // 上传失败，移除进度项
+      if (index !== -1) model.value.fileList.splice(index, 1);
+      showToast(res.data.rtnMsg || '上传失败');
+    }
+  } catch (error) {
+    if (index !== -1) model.value.fileList.splice(index, 1);
+    showToast('网络错误');
+  }
+}
 function addfileItem(file) {
     let awaitfile = {
         "url": "",

package/src/components/app/FormList.vue

@@ -31,8 +31,8 @@
             </div>
         </template>
         <template v-else>
-            <div v-if="model.title" class="list-title">
-                <h5>{{ model.title }}</h5>
+            <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" 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">
+                                        v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.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">
+                                            v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.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,8 +87,14 @@
                                         <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">
-                                                <ct-span v-if="row[column.fieldName1]" :vmodel="row[column.fieldName1]"
-                                                    :rowData="row"></ct-span>
+                                                <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>
                                             </td>
                                         </template>
                                     </tr>
@@ -96,7 +102,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>
@@ -135,6 +141,8 @@ 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,
@@ -167,7 +175,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();
     }
@@ -230,7 +238,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;
                 }
             }
@@ -284,11 +292,14 @@ 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] = row[common.initialsToUpperCase(v)].code1;
+        submitData[v] = common.getDataOfUpperLower(row, v).code1;
     });
     model.value.currentRowIndex = model.value.source.rows.findIndex(v => v.$sourceIndex === row.$sourceIndex);
 

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

@@ -0,0 +1,154 @@
+<template>
+    <div :class="isOperationalColumn ? 'subdiv_allinline' : ''" v-if="isShowLabel"
+        @click="isOperationalColumn ? clickHandler($event) : null">
+            <div v-if="isShowVoice" style="line-height: 16px;padding-top: 3px;">
+                <video ref="video"
+                    v-if="rowData[router.submitFormField] && (!router.rightField || rowData[router.rightField] == 1)"
+                    :src="rowData[router.submitFormField]" controls="true" controlslist="nodownload"
+                    @timeupdate="saveVoiceHistoryHandler" @ended="voiceEndedHandler" height="20" width="100%">您的浏览器不支持
+                    video
+                    标签。
+                </video>
+                <span v-else-if="!rowData[router.submitFormField]"></span>
+                <span v-else>没有权限听录音</span>
+            </div>
+           
+            <div v-else>
+                <a href="javascript:void(0);" class="ct-tablecurrencyItem" :class="labelColor"
+                    @click="!isOperationalColumn ? clickHandler($event) : null" v-html="label">
+                </a>
+            </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+import Enum from '../../../utils/Enum';
+const emit = defineEmits(['click', 'mouseenter'])
+const props = defineProps({
+    router: Object,
+    rowData: Object,
+    colValue: String,
+    rowindex: Number,
+    columnName: String,
+    columnGroupId: String,
+    isOperationalColumn: {
+        type: Boolean,
+        default: false
+    },
+    isShowImg: {
+        type: Boolean,
+        default: true
+    },
+    isShowVoice: {
+        type: Boolean,
+        default: false
+    },
+    eventTriggerType: {
+        type: Number,
+        default: 2
+    },
+})
+
+const visible = ref(false)
+const listenSeconds = ref(-1)
+const option = ref({
+    isHidden: true,//是否开启操作栏隐藏设置，默认开启
+    showNum: 3,//如果isHidden为true时，个数大于3就会隐藏，默认是3
+    appendId: '',//将浮动栏添加到对应id或者class节点中。或者.xxx。传空字符串是添加到body中。
+    trigger: 'manual',//触发方式，传值可查看Popper UI组件trigger属性
+    placement: 'left-start',//方向，传值可查看Popper UI组件placement属性
+})
+const tooltipModel = ref({});
+const labelColor = ref('')
+const video = ref()
+const label = computed(() => {
+    return (typeof props.colValue === "undefined" || props.colValue === '') ? props.router.controlLabel : props.colValue
+})
+const isShowLabel = computed(() => {
+    let flag = false;
+    if (props.router.imgUrl) {
+        flag = true
+    }
+    else if (props.isOperationalColumn) {
+        if (label.value) {
+            flag = true
+        }
+    }
+    else {
+        if (props.colValue) {
+            flag = true
+        }
+    }
+    return flag;
+})
+
+isVisited()
+function isVisited() {
+    var key = props.router.action + props.rowData.chanceID;
+    // if (typeof Cookies.get(key) !== "undefined") {
+    //     props.labelColor = 'mazarine'
+    // }
+}
+function clickHandler(ev) {
+    if (props.router.isListenVoice) {
+        if (visible.value) {
+            video.value.pause();
+        }
+        visible.value = !visible.value;
+        emit('click', props.router, props.rowData, props.rowindex, visible.value, props.columnName,props.columnGroupId);
+    }
+    else {
+        emit('click', props.router, props.rowData, props.rowindex, null, props.columnName, props.columnGroupId);
+    }
+    labelColor.value = 'mazarine'
+
+}
+
+
+function saveVoiceHistoryHandler() {
+    if (props.router.action && (visible.value || props.isShowVoice)) {
+        var currentTime = parseInt(video.value.currentTime) + 1;
+        if (listenSeconds.value === currentTime) {
+            return;
+        }
+        listenSeconds.value = currentTime;
+        var submitData = {};
+        props.router.actionField.split(',').forEach((k) => {
+            submitData[k] = props.rowData[k];
+        });
+        submitData.listenSeconds = currentTime;
+        props.router.doAction(submitData, (data) => {
+
+        })
+    }
+}
+function voiceEndedHandler() {
+    listenSeconds.value = -1;
+}
+function onShow() {
+    emit('mouseenter', props.router, props.rowData, props.rowindex, null, props.columnName, props.columnGroupId,function (data) {
+        if (data.height) {
+            data.height = (parseInt(data.height.replace('px', '')) + 50) + 'px';
+        }
+        tooltipModel.value = data
+    });
+}
+// 自适应位置配置
+const popperOptions = {
+    modifiers: [
+        {
+            name: 'preventOverflow', // 防止溢出视口
+            options: {
+                padding: 10 // 距离视口边缘的留白
+            }
+        },
+        {
+            name: 'flip', // 当空间不足时翻转位置
+            options: {
+                fallbackPlacements: ['left', 'top', 'bottom'], // 备选位置
+                padding: 5
+            }
+        }
+    ]
+}
+</script>

package/src/loader/src/SliceUpload.js

@@ -3,12 +3,12 @@ async function postFile(api, data, callback) {
   var xhr = window.XMLHttpRequest ? new XMLHttpRequest : new ActiveXObject("Microsoft.XMLHTTP");
   xhr.open('POST', api, !0)
   
-  // let headers=common.getDataDrivenOpts().handler.getRequestHeaders(api);
-  // if(headers){
-  //   for (const [key, value] of Object.entries(headers)) {
-  //     xhr.setRequestHeader(key,value)
-  //   }
-  // }
+  let headers=common.getDataDrivenOpts().handler.getRequestHeaders(api);
+  if(headers){
+    for (const [key, value] of Object.entries(headers)) {
+      xhr.setRequestHeader(key,value)
+    }
+  }
 
   xhr.onreadystatechange = function () {
     if (xhr.readyState != 4 || xhr.status < 200) {

package/src/main.js

@@ -21,16 +21,15 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    //baseUrl: "http://10.88.22.13:7080/ibs-api/",
+    baseUrl: "http://10.88.22.69:7080/external/",
     //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/",
-    baseUrl: "http://10.88.22.13:6060/smartclass-api/",
     //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,
@@ -67,7 +66,7 @@ app.use(centaline, {
             return {
                 
              //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyaWQiOiIyNTEyMTUxNzQyMTg5QzI4MTgwRDkxRTk0MDhEOTA0QSIsImxvZ2luX3VzZXJfa2V5IjoiN2MzYzNjNjAtNWVjMy00MzdkLWExMDYtOWYxZTMwYjU0Mjg2In0.daG9mS98Gg8KmHSUjYHktMcO2Jk7SVtCcqm2sRB0I8Y2N0TuonIrVUDcHdNdDiuD3v6qO_f010tQWlBsAQ1dqg',
-              authobject: '{token:"1-83322f82-1cd6-47bb-89db-7cad6d97eb5d"}',
+              authobject: '{token:"TY002-2058735234823970816",platform:"Android"}',
               //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/utils/mixins.js

@@ -993,8 +993,10 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                         cancelButtonText: '取消',
                                         type: 'warning'
                                     },model.appendToBody).then(() => {
+                                        model.$vue.operationLoading = true
                                         submitData.flagHaveAlert = '1';
                                         field.doAction(submitData, (res) => {
+                                            model.$vue.operationLoading = false
                                             if (res.rtnCode === Enum.ReturnCode.Successful) {
                                                 if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
                                                     model.$vue.doAction(res, model);

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="'/admin/SchoolTeachingPlanLibrary/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
-    <ct-dialog-list></ct-dialog-list>
+    <ct-form :api="'/Order/view-layout'" :apiParam="apiParam"></ct-form>
+    <ct-dialoglist></ct-dialoglist>
   </div>  
   </template>
 <script lang="ts" setup>
- const apiParam={"teachingPlanId":"1982726202548482048","actionType":3}
+ const apiParam={"originalOrderId":"2014640778344816640","actionType":1}
 </script>

package/src/views/SearchList.vue

@@ -4,11 +4,11 @@
       
     :searchDataApi="'/ccesmanage/AppUseSummaryList/getList'"></ct-searchlist> -->
 
-      <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
+      <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
       
-    :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
-       <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
-      :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->
+    :searchDataApi="'/propertyPublishList/getListOfSearchModel'" :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
+       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/PropertyComprehensiveQueryList/getLayoutOfSearch'"
+      :searchDataApi="'/PropertyComprehensiveQueryList/getListOfSearchModel'"></ct-searchlist>
 
  
     <ct-dialoglist ref="dialogList"></ct-dialoglist>