centaline-data-driven-v3 0.0.65 → 0.0.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.65",
+  "version": "0.0.66",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",
@@ -16,7 +16,7 @@
     "moment": "^2.30.1",
     "photo-sphere-viewer": "^4.8.1",
     "sortablejs": "^1.15.6",
-    "vant": "^4.8.0",
+    "vant": "^4.8.0", 
     "vite-plugin-css-injected-by-js": "^3.3.0",
     "vue": "^3.3.4",
     "vue-cropper": "^1.1.1",

package/src/assets/commonWeb.css

@@ -358,50 +358,6 @@ body {
   color: var(--centalineBlack);
 }
 
-/* 查询搜索 */
-.search-btn,
-.more-btn {
-  height: 26px;
-  background: var(--chinaRed) !important;
-  border-color: var(--chinaRed) !important;
-  box-shadow: 0px 2px 4px 0px rgba(238, 107, 107, 0.25);
-  border-radius: 6px;
-  color: #fff !important;
-}
-
-/* 重置按钮 更多按钮*/
-.reset-btn {
-  height: 26px;
-  background: #FFFFFF !important;
-  border-color: var(--chinaRed) !important;
-  border-radius: 6px;
-  color: var(--chinaRed) !important;
-}
-
-/* 搜索按钮,重置按钮和更多按钮的hover */
-.search-btn:hover,
-.reset-btn:hover,
-.more-btn:hover {
-  background-color: var(--btnHoverRed) !important;
-  border-color: var(--btnHoverRed) !important;
-  color: #fff !important;
-}
-
-.more-btn:hover .open,
-.more-btn:hover .fold {
-  background-color: var(--btnHoverRed) !important;
-}
-
-.search-btn:active,
-.search-btn:focus,
-.reset-btn:active.reset-btn:focus,
-.more-btn:active.more-btn:focus {
-  background-color: var(--btnFocusRed);
-  border-color: var(--btnFocusRed);
-  color: #fff !important;
-}
-
-
 .subdiv_allinline {
   margin: 0;
   padding: 0;
@@ -1067,7 +1023,7 @@ body {
 .el-tag--small {
   height: auto;
   line-height: 16px;
-  padding: 3px 9px;
+  padding: 3px 5px;
 }
 
 .el-checkbox.el-checkbox--small {

package/src/components/web/Button.vue

@@ -16,7 +16,7 @@
         :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
         @click="clickHandle">{{ model.controlLabel }}</el-link>
     <el-upload v-else-if="model.isImport" :action="model.action" :data="uploadData" :headers="headers" :multiple="false"
-        :show-file-list="false" :on-success="handleAvatarSuccess" :on-error="handleAvatarError">
+        :show-file-list="false" :on-success="handleAvatarSuccess" :on-error="handleAvatarError" :before-upload="handleAvatarBeforeUpload">
         <el-button type="primary" v-bind="model.attrs"
             :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
             :disabled="model.disabled || model.locked">
@@ -97,6 +97,19 @@ function clickHandle() {
     emit('fieldClick', model.value);
 }
 
+function handleAvatarBeforeUpload(file) {
+  if(model.value.form && model.value.form.$vue){
+    let submitData = model.value.form.$vue.getFileData(model.value);
+    for (var key in submitData) {
+      if (typeof submitData[key] === "object") {
+        uploadData.value[key] = JSON.stringify(submitData[key]);
+      }
+      else {        
+        uploadData.value[key] = submitData[key];
+      }
+    }
+  }
+}
 function handleAvatarSuccess(res) {
   emit('importComplete', res, model.value);
 }
@@ -124,4 +137,47 @@ function commandClick(code) {
     color: var(--chinaRed);
     font-weight: 700;
 }
+/* 查询搜索 */
+.search-btn,
+.more-btn {
+  height: 26px;
+  background: var(--chinaRed);
+  border-color: var(--chinaRed);
+  box-shadow: 0px 2px 4px 0px rgba(238, 107, 107, 0.25);
+  border-radius: 6px;
+  color: #fff;
+}
+
+/* 重置按钮 更多按钮*/
+.reset-btn {
+  height: 26px;
+  background: #FFFFFF;
+  border-color: var(--chinaRed);
+  border-radius: 6px;
+  color: var(--chinaRed);
+}
+
+/* 搜索按钮,重置按钮和更多按钮的hover */
+.search-btn:hover,
+.reset-btn:hover,
+.more-btn:hover {
+  background-color: var(--btnHoverRed);
+  border-color: var(--btnHoverRed);
+  color: #fff;
+}
+
+.more-btn:hover .open,
+.more-btn:hover .fold {
+  background-color: var(--btnHoverRed);
+}
+
+.search-btn:active,
+.search-btn:focus,
+.reset-btn:active.reset-btn:focus,
+.more-btn:active.more-btn:focus {
+  background-color: var(--btnFocusRed);
+  border-color: var(--btnFocusRed);
+  color: #fff;
+}
+
 </style>

package/src/components/web/ComboBox.vue

@@ -13,7 +13,7 @@
                     </el-tooltip>
                 </template>
                 <template #prefix
-                    v-if="(model.isList && model.value && !model.multiple) || (model.multiple && model.isList && model.labelValue && model.labelValue.length > 0 && model.placeholder)">
+                    v-if="((model.isList && model.value && !model.multiple) || (model.multiple && model.isList && model.labelValue && model.labelValue.length > 0 && model.placeholder)) && model.prefix">
                     <span>{{ model.prefix }}</span>
                 </template>
                 <template #tag>
@@ -181,7 +181,7 @@ function setminWidth() {
             }
         }
     }
-  
+
     let span = document.createElement('span');
     span.innerText = text;
     span.style.whiteSpace = 'nowrap';

package/src/components/web/Form.vue

@@ -1,5 +1,5 @@
 <template>
-    <div ref="refForm" v-loading="loading">
+    <div ref="refForm" v-loading="loading" :style="{'min-height': minHeight}">
         <div v-if="model !== null && !loading" class="ct-form">
             <el-affix target=".ct-form" v-if="model.tip" :offset="62">
                 <div class="ct-form-tip">
@@ -138,7 +138,7 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { ref, nextTick, onUpdated,onDeactivated } from 'vue'
+import { ref, nextTick, onUpdated,onDeactivated , onMounted  } from 'vue'
 import { RouterClickHandler } from '../../utils/mixins';
 import common from '../../utils/common'
 import Form from '../../loader/src/Form'
@@ -205,6 +205,7 @@ const Fields = ref()
 const refForm = ref()
 const qrtimer = ref(null)
 const downloadUrl = ref('')
+const minHeight = ref('auto')
 onUpdated(() => {
     nextTick(() => {
         qrtimer.value = setTimeout(getisScroll, 100);
@@ -213,6 +214,9 @@ onUpdated(() => {
 onDeactivated(() => {
   downloadUrl.value=''
 })
+onMounted(() => {
+  setCss();
+})
 init()
 //初始化数据
 function init() {
@@ -535,4 +539,9 @@ function flagNotificationParentAfterContentChanged() {
 function updateFields(data) {
     Form.updateFields(data, model.value)
 }
+function setCss() {
+  if (props.topHeight > -1) {
+    minHeight.value = (document.documentElement.clientHeight - props.topHeight - 20) + 'px';
+  }
+}
 </script>

package/src/components/web/SearchScreen.vue

@@ -48,12 +48,12 @@
             </div>
         </div>
         <iframe :src="downloadUrl"
-        style="height:0px;width:0px;border-width: 0px;position: absolute;bottom: 0px;display: none;">
-      </iframe>
+            style="height:0px;width:0px;border-width: 0px;position: absolute;bottom: 0px;display: none;">
+        </iframe>
     </div>
 </template>
 <script setup lang="ts">
-import { ref, nextTick,onDeactivated } from 'vue'
+import { ref, nextTick, onDeactivated } from 'vue'
 import SearchScreen from '../../loader/src/SearchScreen'
 import Form from '../../loader/src/Form'
 import Enum from '../../utils/Enum'
@@ -88,7 +88,7 @@ const Fields = ref()
 const downloadUrl = ref('')
 
 onDeactivated(() => {
-  downloadUrl.value=''
+    downloadUrl.value = ''
 })
 
 searchComplate()
@@ -178,11 +178,15 @@ function searchHandler(field) {
 //组件数据验证
 function validExcute() {
     var rtnBool = true;
+    var i = 0;
     if (Fields.value) {
         Fields.value.forEach((f) => {
             if (f.model && typeof f.model.validExcute !== 'undefined') {
                 if (!f.model.validExcute()) {
-                    common.message(f.model.displayValidMessage)
+                    if (i === 0) {
+                        common.message(f.model.displayValidMessage)
+                    }
+                    i++
                     rtnBool = false;
                 }
             }

package/src/components/web/SensitiveEye.vue

@@ -2,7 +2,7 @@
     <ct-field :vmodel="model">
         <template #Control>
             <span class="eyelabel">{{ showLable == true ? model.code1 : model.name1 }}</span>
-            <el-icon size="16" v-if="model.name1" @click="onSensitiveEye()" style="margin-top: -2px;">
+            <el-icon size="16" v-if="model.name1" @click="onSensitiveEye()" style="margin-top: 5px;">
                 <View v-if="showLable" />
                 <Hide v-else />
             </el-icon>
@@ -57,6 +57,7 @@ defineExpose({
 </script>
 <style scoped>
 .eyelabel {
-    min-width: 80px;
+  min-width: 80px;
+  line-height: 26px;
 }
 </style>

package/src/components/web/TextBox.vue

@@ -2,7 +2,7 @@
     <ct-field :vmodel="model">
         <template #Control>
           <div v-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
-            <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="change()"
+            <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
                 :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
                 :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
                 :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
@@ -12,7 +12,7 @@
             </el-input>
             <span v-if="model.sufLabel1" class="sufLabel" v-html="model.sufLabel1"></span>
           </div>
-          <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="change()"
+          <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
                 :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
                 :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
                 :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
@@ -51,10 +51,16 @@ function search() {
         emit('search');
     }
 }
- 
+function input() {
+  if(model.value.controlType===Enum.ControlType.MultiLineText || model.value.controlType===Enum.ControlType.TextBox){
+  }
+  else{
+    change();
+  }
+} 
 function change() {
-    changeHandler(model.value, emit);
-    if (props.from == 'tree') { emit('search'); }
+  changeHandler(model.value, emit);
+  if (props.from == 'tree') { emit('search'); }
 }
 //弹出选择列表
 function popupSearchListHandle() {

package/src/loader/src/Button.js

@@ -7,15 +7,15 @@ const Button = function (source) {
     let rtn = {
         icon: '',
         get bgColor() {
-            if (source.controlType == Enum.ControlType.ButtonReset) {
-                return '#519DA6'
-            }
+            // if (source.controlType == Enum.ControlType.ButtonReset) {
+            //     return '#519DA6'
+            // }
             return source.bgColor
         },
         get borderColor() {
-            if (source.controlType == Enum.ControlType.ButtonReset) {
-                return '#519DA6'
-            }
+            // if (source.controlType == Enum.ControlType.ButtonReset) {
+            //     return '#519DA6'
+            // }
             return source.borderColor
         },
         get action() {

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/loader/src/SearchTable.js

@@ -598,6 +598,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         get dataDictionary() {
             return rtn._dataDictionary;
         },
+        get rowColorColumn() { //行字体颜色列
+          return source.content.rowColorColumn;
+        },
         //设置行样式
         setRow(rows) {
             rtn.setStyleRow(rows);
@@ -610,10 +613,10 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                     row.rowStyle = "";
                 }
                 if (rtn.rowColorColumn && row[rtn.rowColorColumn]) {
-                    row.rowStyle = row.rowStyle + "color:" + row[rtn.rowColorColumn] + ";";
+                  row.rowStyle = row.rowStyle + ";color:" + row[rtn.rowColorColumn] + ";";
                 }
                 if (row.flagDrag && row.flagDrag == '1') {
-                    row.rowStyle = row.rowStyle + "cursor:move;";
+                  row.rowStyle = row.rowStyle + "cursor:move;";
                 }
             });
         },

package/src/main.js

@@ -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_77affd14-db50-46dd-be3f-4354dfe6ff07",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_77affd14-db50-46dd-be3f-4354dfe6ff07",Platform:"IOS"}',
+                authObject: '{EmpID:"Token_052cca91-c75e-45cc-b549-90730d12f6bc",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_052cca91-c75e-45cc-b549-90730d12f6bc",Platform:"IOS"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作