centaline-data-driven-v3 0.0.54 → 0.0.56

package/package.json

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

package/src/components/app/ContainerControl.vue

@@ -2,15 +2,14 @@
     <template v-for="(col, index) in model.fields" :key="index">
         <template v-if="col.show !== false&&(col.controlLabel||col.code1||col.name1)">
             <component v-if="col.show !== false" ref="Fields" :is="col.is" :vmodel="col"
-                :parameterAction="parameterAction" v-bind="col.bindPara" @fieldClick="fieldClickHandler"
-                @change="change" @popupSearchList="popupSearchListHandler">
+                :parameterAction="parameterAction" v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)"
+                @change="change(col)" @popupSearchList="popupSearchListHandler">
             </component>
         </template>
     </template>
 </template>
 <script lang="ts" setup>
 import { ref } from 'vue'
-import common from '../../utils/common'
 import { initData } from '../../utils/mixins';
 import ContainerControl from '../../loader/src/ContainerControl';
 const emit = defineEmits(['click', 'change', 'fieldClick', 'popupSearchList'])
@@ -24,15 +23,12 @@ const Fields = ref()
 
 model.value.selfValidExcute = () => {
     let rtnBool = true;
-    if (typeof Fields !== 'undefined') {
+    if (typeof Fields.value !== 'undefined') {
         Fields.value.forEach((f) => {
-            if (typeof f.validExcute !== 'undefined') {
-                if (!f.validExcute(f.model)) {
+            if (f.model && typeof f.model.validExcute !== 'undefined') {
+                if (!f.model.validExcute(f.model)) {
+                    model.value.displayValidMessage=f.model.displayValidMessage
                     rtnBool = false;
-                    if (!model.controlLabel && f.model.controlLabel) {
-                        common.message('【' + f.model.controlLabel + '】不能为空！')
-                    }
-
                 }
             }
         });

package/src/components/app/Label.vue

@@ -6,7 +6,7 @@
                     <span style="line-height: 32px;" v-for="item in model.value" :key="item" class="tag">{{ item }}</span>
                 </template>
                 <template v-else>
-                    <span style="line-height: 32px;" v-html="model.value"></span>
+                    <span style="line-height: 32px;" v-html="model.value" @click="clickHandle"></span>
                 </template>
             </div>
         </template>
@@ -21,7 +21,7 @@
 <script lang="ts" setup>
 import { initData } from '../../utils/mixins';
 import Label from '../../loader/src/Label';
-const emit = defineEmits(['popupSearchList'])
+const emit = defineEmits(['popupSearchList','change'])
 const props = defineProps({
     parameterAction: String,
     vmodel: Object,
@@ -33,6 +33,9 @@ function popupSearchListHandle() {
     let isSingle=model.value.moreActionRouter.isSingle
     emit('popupSearchList', isSingle, model, model.value.moreActionRouter);
 }
+function clickHandle(){
+    emit('change', model);
+}
 defineExpose({
     model
 })

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

@@ -194,7 +194,7 @@ function load(data) {
         return v.key && v.show && (v.key.indexOf('New') > -1 || v.key.indexOf('new') > -1 || v.key.indexOf('Apply') > -1);
     })
     modeButtons.value = model.value.buttons.filter((v) => {
-        return v.disabled = true && !(v.key.indexOf('New') > -1 || v.key.indexOf('new') > -1 || v.key.indexOf('Apply') > -1)
+        return v.disabled && v.show && v.isMulti && !(v.key.indexOf('New') > -1 || v.key.indexOf('new') > -1 || v.key.indexOf('Apply') > -1)
     })
     modeButtons.value.forEach((v) => {
         v.name = v.controlLabel

package/src/components/app/TextBox.vue

@@ -18,6 +18,9 @@
                     <span>{{ model.controlLabel }}</span>
                 </div>
             </template>
+            <template #extra v-if="model.sufLabel1">
+                    <span v-html="model.sufLabel1" style="margin-left: 5px;line-height: 32px;"></span>
+            </template>
             <template v-if="model.unitName1" #button>
                 {{ model.unitName1 }}
             </template>

package/src/components/app/ViewerFile.vue

@@ -173,6 +173,9 @@ function onswipenext() {
     touch-action: none;
 }
 
+
+</style>
+<style scoped>
 .viewerContent {
     background: #000000;
     height: 100%;
@@ -181,8 +184,6 @@ function onswipenext() {
     justify-content: center;
 
 }
-</style>
-<style scoped>
 .cont {
     position: absolute;
     z-index: 100000000000000;

package/src/components/web/CheckBoxList.vue

@@ -15,7 +15,7 @@
                             </el-tooltip>
                         </el-icon>
                     </el-checkbox>
-                    <el-icon @click="clearClickHandle" class="el-range__close-icon" style="margin-left: 10px;">
+                    <el-icon @click="clearClickHandle" class="el-range__close-icon" style="margin-left: 10px;" v-if="!common.flagHK()">
                         <CircleClose />
                     </el-icon>
                 </el-checkbox-group>
@@ -26,6 +26,7 @@
 <script lang="ts" setup>
 import { initData, changeHandler } from '../../utils/mixins';
 import CheckBoxList from '../../loader/src/CheckBoxList';
+import common from '../../utils/common'
 const emit = defineEmits(['click', 'change', 'search'])
 const props = defineProps({
     parameterAction: String,

package/src/components/web/ContainerControl.vue

@@ -8,7 +8,7 @@
                     :class="index > 0 && (col.controlLabel == '' || col.is == 'ct-button') ? 'complex-left-10' : ''"
                     :style="{ 'width': (col.width != '0' ? col.width + 'px' : '100%'), 'flex': (col.width != '0' ? '0 0 ' + col.width + 'px' : '100%') }">
                     <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="parameterAction"
-                        v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change"
+                        v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change(col)"
                         @popupSearchList="popupSearchListHandler"></component>
                 </div>
             </template>
@@ -23,7 +23,7 @@
                             :class="[index > 0 && (col.controlLabel == '' || col.is == 'ct-btn') ? 'complex-left-10' : '', 'containerCol']"
                             :style="{ 'width': (col.width != '0' ? col.width + 'px' : '100%'), 'flex': (col.width != '0' ? '0 0 ' + col.width + 'px' : '100%') }">
                             <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="parameterAction"
-                                v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change"
+                                v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change(col)"
                                 @popupSearchList="popupSearchListHandler">
                             </component>
                         </el-col>

package/src/components/web/File.vue

@@ -8,11 +8,10 @@
         :data="model.uploadData" :headers="headers" :before-upload="beforeUploadProcess"
         :on-success="handleAvatarSuccess" :on-error="handleAvatarError" :on-progress="uploadProcess"
         :limit="parseInt(model.maxValue1 || 999)" :on-exceed="handleExceed"
-        :uploadStatus="!model.disableUpload&&!model.locked?'upload':'lock'"
-        >
+        :uploadStatus="!model.disableUpload && !model.locked ? 'upload' : 'lock'">
         <el-icon>
           <Plus />
-        </el-icon> 
+        </el-icon>
         <template #tip>
           <div class="el-upload__tip errorMessage" style="white-space:pre-wrap;" v-show="!model.valid"
             v-html="model.validMessage">
@@ -20,7 +19,7 @@
           <div v-show="model.description" v-html="model.description">
           </div>
         </template>
-        <div class="qrcode-target"  v-if="model.QRCodeAction">
+        <div class="qrcode-target" v-if="model.QRCodeAction">
           <img @click.stop="qrcodeFn" ref="QRCodeRef" :src="util.getAssetsImage('serw1.png')"
             style="width: 35px;height: 35px; float: right; " alt="扫码上传" title="扫码上传" />
         </div>
@@ -106,7 +105,7 @@
 
 
               <div @dragstart="drag($event, file)" @drop="drop($event, file)" @dragover.prevent
-                @dragenter="dragenter($event, file)" @dragleave="dragleave($event, file)" >             
+                @dragenter="dragenter($event, file)" @dragleave="dragleave($event, file)">
                 <el-image fit="fill" @click="viewerfile(file)"
                   :src="file.url ? file.url : file.mediaUrl ? file.mediaUrl + '/100/100' : util.getAssetsImage('blank.png')"
                   style="width: 100px; height: 100px" :z-index="previewZIndex">
@@ -187,12 +186,12 @@ const props = defineProps({
 })
 const refct_upload = ref()
 const refupload = ref()
-const QRCodeRef = ref() 
+const QRCodeRef = ref()
 const UploadhttpRequest = ref({})
 const startfile = ref();
 const endfile = ref();
 const model = ref(null);
- 
+
 
 const headers = computed(() => {
   return common.getDataDrivenOpts().handler.getRequestHeaders();
@@ -246,6 +245,9 @@ function load(data) {
       showClose: true,
     });
   }
+  if (model.value?.fileList && model.value.fileList.length > 0) {
+    selfValidExcute("valid");
+  }
 }
 //校验上传数量
 const handleExceed: UploadProps['onExceed'] = (files) => {
@@ -261,8 +263,8 @@ const handleExceed: UploadProps['onExceed'] = (files) => {
 function handleRemove(file) {
 
 
-  common.confirm(common.LocalizedString("确定删除该附件？","確定刪除該附件？"), "提示", {
-    confirmButtonText: common.LocalizedString("确定","確認"),
+  common.confirm(common.LocalizedString("确定删除该附件？", "確定刪除該附件？"), "提示", {
+    confirmButtonText: common.LocalizedString("确定", "確認"),
     cancelButtonText: "取消",
     //type: 'warning'
   }).then(() => {
@@ -283,7 +285,7 @@ function handleEdit(file) {
   var dialogOption = {
     title: "编辑图片",
     content: [{
-      component: 'ct-pictureedit',
+      component: 'ct-picturedit',
       width: width + "px",
       height: (window.document.body.clientHeight * 0.8).toString() + "px",
       attrs: {
@@ -626,22 +628,22 @@ function viewerfile(file) {
   File.viewerfile(file, model.value)
 }
 
- 
- 
+
+
 function PasteUpload(event) {
   if (!model.value.locked && !model.value.disableUpload) {
     // 获取粘贴板中的图片
     const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
     const items = clipboardDatas.items;
-      //检测是否全是文件才上传
-      let fileSum = 0;
+    //检测是否全是文件才上传
+    let fileSum = 0;
     for (let index in items) {
       const item = items[index];
       if (item.kind === 'file') {
         ++fileSum;
       }
     }
-    
+
     if (fileSum == items.length) {
       for (let index in items) {
         const item = items[index];
@@ -660,32 +662,32 @@ function PasteUpload(event) {
   }
 }
 
-function ListenerPaste(event) { 
-    var target = event.target;
-    const uploads =  document.querySelectorAll('[uploadStatus="upload"]');
+function ListenerPaste(event) {
+  var target = event.target;
+  const uploads = document.querySelectorAll('[uploadStatus="upload"]');
 
-    if (!window.uploads) {
-      window.uploads = { count: 0, length: uploads.length };
-    }
-    if (uploads.length > 1) {
-      window.uploads.count = window.uploads.count + 1;
-      window.uploads.length = uploads.length;
+  if (!window.uploads) {
+    window.uploads = { count: 0, length: uploads.length };
+  }
+  if (uploads.length > 1) {
+    window.uploads.count = window.uploads.count + 1;
+    window.uploads.length = uploads.length;
 
-      if (window.uploads.count == window.uploads.length) {
-        window.uploads = null;
-        ElMessage({
-          message: "存在多个上传组件，请点击粘贴上传！",
-          type: 'info',
-          showClose: true,
-        });
-        return false;
-      }
-    }
-    else if (uploads.length == 1) {
+    if (window.uploads.count == window.uploads.length) {
       window.uploads = null;
-      PasteUpload(event);
+      ElMessage({
+        message: "存在多个上传组件，请点击粘贴上传！",
+        type: 'info',
+        showClose: true,
+      });
+      return false;
     }
-  
+  }
+  else if (uploads.length == 1) {
+    window.uploads = null;
+    PasteUpload(event);
+  }
+
 
 }
 

package/src/components/web/Label.vue

@@ -2,7 +2,7 @@
     <ct-field :vmodel="model">
         <template #Control v-if="model.code1">
             <template v-if="model.controlType==Enum.ControlType.HtmlLabel">
-                <span class="ct-html" v-html="model.value"></span>
+                <span class="ct-html" @click="clickHandle" v-html="model.value"></span>
             </template>
             <template v-else-if="model.flagJson">
                 <el-tag v-for="item in model.value" :key="item" type="info" :disable-transitions="true" style="margin: 2px 6px 2px 0px;">{{ item
@@ -16,7 +16,7 @@
                         <div :style="{ 'width': (model.value.length > 66 ? '400px' : 'auto') }" v-html="model.value">
                         </div>
                     </template>
-                    <span class="ct-lable" @mouseover="onMouseOver($event)" v-html="model.value"></span>
+                    <span class="ct-lable" @mouseover="onMouseOver($event)" v-html="model.value" @click="clickHandle"></span>
                 </el-tooltip>
                 <span class="unitName">{{ model.unitName1 }}</span>
             </template>
@@ -36,7 +36,7 @@ import { ref, nextTick } from 'vue'
 import { initData } from '../../utils/mixins';
 import Enum from '../../utils/Enum'
 import Label from '../../loader/src/Label';
-const emit = defineEmits(['popupSearchList'])
+const emit = defineEmits(['popupSearchList','change'])
 const props = defineProps({
     parameterAction: String,
     vmodel: Object,
@@ -64,7 +64,9 @@ function popupSearchListHandle() {
     let isSingle=model.value.moreActionRouter.isSingle
     emit('popupSearchList', isSingle, model, model.value.moreActionRouter);
 }
-
+function clickHandle(){
+    emit('change', model);
+}
 defineExpose({
     model
 })

package/src/components/web/PictureEdit.vue

@@ -495,8 +495,10 @@ function uploadpro(filesize, res, xhr, flagError) {
             props.file.mediaUrl = media.mediaUrl;
             props.file.savedFileName = media.savedFileName;
             props.file.mediaDate = media.mediaDate;
+            props.file.mediaCode== media.mediaCode;
             props.file.width = canvas.value.width;
             props.file.height = canvas.value.height;
+
             emit('handleEditPhoto', props.file);
         }
         return true;

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

@@ -1145,7 +1145,13 @@ function refreshTableColumns(data) {
         load(SearchTable.loadSearchTableModel(data, model.value.searchModel, false, props.api));
     }
     else {
-        SearchTable.loadSearchTableApi(props.api, load, model.value.searchModel, true);
+        if (refTableStats.value){
+            disabledStats.value = true;
+            getPage(1, true);
+        }
+        else{
+            SearchTable.loadSearchTableApi(props.api, load, searchModel, true);
+        }
     }
     model.value.searchStats = searchStats;
     model.value.toolbarKey = Math.random();

package/src/components/web/ViewerFile.vue

@@ -118,7 +118,7 @@
                         <template v-else>
                             <div class="viewerContent" style="max-height: 200px; text-align: center">
                                 <a :href="resultObject" target="_blank">
-                                    <img :src="itemFile.thumbnailUrl" /><br />{{
+                                    <img :src="(itemFile.thumbnailUrl||itemFile.url)" /><br />{{
                                         itemFile.mediaLabelName || itemFile.fileName
                                     }}
                                 </a>

package/src/loader/src/CheckBoxList.js

@@ -7,7 +7,10 @@ const CheckBoxList = function (source) {
 
             this._value = [];
             if (source.code1) {
-                let val = JSON.parse(source.code1)
+                let val = source.code1
+                if (typeof source.code1 === 'string'){
+                    val = JSON.parse(source.code1)
+                }
                 val.forEach((v) => {
                     if (v['code']) {
                         if (!v['flagDeleted']) {
@@ -36,7 +39,10 @@ const CheckBoxList = function (source) {
                 });
             });
             if (source.code1) {
-                let checked = JSON.parse(source.code1)
+                let checked = source.code1
+                if (typeof source.code1 === 'string'){
+                    checked = JSON.parse(source.code1)
+                }
                 checked.forEach((v) => {
                     let item = rtn.globalOptions.find((v1) => {
                         return v1.code === v.code;
@@ -62,7 +68,11 @@ const CheckBoxList = function (source) {
         //初始数据
         get globalOptions() {
             if (source.code1) {
-                return [].concat(JSON.parse(source.code1));
+                if (typeof source.code1 === 'string'){
+                    return [].concat(JSON.parse(source.code1));
+                }
+                return [].concat(source.code1);
+                
             }
             else {
                 return []

package/src/loader/src/File.js

@@ -511,6 +511,7 @@ function updateFile(file, model) {
                     model.fileSourceList[j].mediaUrl = file.mediaUrl;
                     model.fileSourceList[j].savedFileName = file.savedFileName;
                     model.fileSourceList[j].mediaDate = file.mediaDate;
+                    model.fileSourceList[j].mediaCode = file.mediaCode;
                     break;
                 }
             }

package/src/loader/src/Form.js

@@ -55,7 +55,7 @@ function loadFromModel(source, isFormList) {
         }
       },
       setActionRouter(id, attrKey, attrValue) {
-        var router = source.actionRouters.find((v1) => {
+        var router = this.form.actionRouters.find((v1) => {
           return v1.key === id;
         });
         if (router) {
@@ -286,6 +286,18 @@ function loadFromModel(source, isFormList) {
         }
         return false;
       },
+      //设置表格选择路由
+      setListSelectRouter(tableId, attrKey, attrValue) {
+        let listData = this.excuteListData.find((v) => {
+          return v.fieldName1 === tableId;
+        });
+        if (listData) {
+          var router = listData.selectRouter;
+          if (router) {
+            router[attrKey] = attrValue;
+          }
+        }
+      },
       //设置表格属性值
       setListAttr(tableId, attrName, attrValue) {
         let listData = this.excuteListData.find((v) => {

package/src/loader/src/LibFunction.js

@@ -188,7 +188,12 @@ const LibFunction = {
 
                 }
                 //    var files = getMmdias(source, field);
-                var files = field.code1 && field.code1 != "[]" ? JSON.parse(field.code1) : [];
+                var files = [];
+                if (Array.isArray(field.code1)) {
+                    files = field.code1;
+                } else { 
+                    files= field.code1 && field.code1 != "[]" ? JSON.parse(field.code1) : [];
+                }
                 item = Photo.loadFromModel(item, files, router, source.videoPlayIconUrl);
                 item.is = 'ct-photo';
                 break;

package/src/loader/src/Photo.js

@@ -342,7 +342,7 @@ function updateFile(file, model) {
     model.fileSource[0].mediaUrl = file.mediaUrl;
     model.fileSource[0].savedFileName = file.savedFileName;
     model.fileSource[0].mediaDate = file.mediaDate;
-
+    model.fileSource[0].mediaCode = file.mediaCode; 
 
 }
 function uploadguid() {

package/src/loader/src/Router.js

@@ -250,6 +250,9 @@ const Router = function (source) {
     get isMulti() {
       return source.selectedMode === Enum.ListSelectMode.Multiple;
     },
+    set selectedMode(v) {
+      source.selectedMode = v;
+    },
     // 路由操作完成后是否刷新当前行
     get flagFreshCurrentRow() {
       return source.flagFreshCurrentRow;

package/src/main.js

@@ -21,12 +21,12 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
-    baseUrl: "http://10.88.22.66:6060/onecard-api/",
+    baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    //baseUrl: "http://10.88.22.66:6060/onecard-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,
@@ -63,8 +63,8 @@ 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-b0ca13fb-3f45-46b0-9d1f-7b028c05f6d3"}',
-                //authObject: '{EmpID:"Token_937f0ada-8862-4c37-bf44-578531920446",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_937f0ada-8862-4c37-bf44-578531920446",Platform:"WEB"}',
+                //authObject: '{token:"1647-1802885825978044416",platform:"WEB"}',
+                authObject: '{EmpID:"Token_db2d49d2-8f18-4491-a9c1-2b6bee44ad28",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_db2d49d2-8f18-4491-a9c1-2b6bee44ad28",Platform:"IOS"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/common.js

@@ -563,6 +563,12 @@ const common = {
     }
     return strCN;
   },
+  flagHK() {
+    if (dataDrivenOpts.language == 'HK') {
+      return true;
+    }
+    return false
+  },
   //是否微信浏览器
   flagMicroMessenger() {
     var ua = navigator.userAgent.toLowerCase();