centaline-data-driven-v3 0.0.71 → 0.0.73

package/package.json

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

package/src/components/web/Button.vue

@@ -16,7 +16,8 @@
         :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" :before-upload="handleAvatarBeforeUpload">
+        :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">
@@ -37,7 +38,7 @@
         <div>{{ model.controlLabel }}</div>
         <div class="subText">{{ model.subText }}</div>
     </el-button>
-    <el-button v-else type="primary" v-bind="model.attrs" @click="clickHandle"
+    <el-button v-else type="primary" :loading="model.loading" v-bind="model.attrs" @click="clickHandle"
         :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">
         <template #icon v-if="model.icon">
@@ -47,7 +48,7 @@
             <img :src="model.imgUrl" :height="model.buttonHeight" />
             <div style="margin-top:5px;" class="labelText" v-html="model.controlLabel"></div>
         </template>
-        <template v-else>
+        <template v-else :style="{display:model.loading?'inline-block':''}">
             <img v-if="model.imgUrl" :title="model.controlLabel" :src="model.imgUrl" :height="model.buttonHeight" />
             <span v-else v-html="model.controlLabel"></span>
         </template>
@@ -68,6 +69,7 @@ const props = defineProps({
     vmodel: Object,
     source: Object,
     flagAppMode: Boolean,
+    parentModel: Object,
 })
 const model = initData(props, Button)
 if (model.value.controlType == Enum.ControlType.ButtonAdvancedSearch) {
@@ -80,31 +82,42 @@ const uploadData = computed(() => {
     //因传输方式是FormData，故需要对Value是object的进行转化
     let data = {};
     for (var key in props.fileData) {
-      if (typeof props.fileData[key] === "object") {
-          data[key] = JSON.stringify(props.fileData[key]);
-      }
-      else {
-          data[key] = props.fileData[key];
-      }
+        if (typeof props.fileData[key] === "object") {
+            data[key] = JSON.stringify(props.fileData[key]);
+        }
+        else {
+            data[key] = props.fileData[key];
+        }
     }
-    data.flagHaveAlert=0;
+    data.flagHaveAlert = 0;
     return data;
 })
 const headers = computed(() => {
     return common.getDataDrivenOpts().handler.getRequestHeaders();
 })
 function clickHandle() {
-    emit('fieldClick', model.value);
+  emit('fieldClick', model.value);
 }
 
 function handleAvatarBeforeUpload(file) {
-  if(model.value.form && model.value.form.$vue){
+  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 {        
+      else {
+        uploadData.value[key] = submitData[key];
+      }
+    }
+  }
+  if(props.parentModel && props.parentModel.is && props.parentModel.is=="ct-formlist" && props.parentModel.form && props.parentModel.form.$vue){
+    let submitData = props.parentModel.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];
       }
     }
@@ -128,8 +141,8 @@ function dropClick() {
     }
 }
 function commandClick(code) {
-    model.value.selectOptionCode = code;
-    emit('fieldClick', model.value);
+  model.value.selectOptionCode = code;
+  emit('fieldClick', model.value);
 }
 </script>
 <style scoped>
@@ -137,47 +150,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;
+    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);
+    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;
+    background-color: var(--btnHoverRed);
+    border-color: var(--btnHoverRed);
+    color: #fff;
 }
 
 .more-btn:hover .open,
 .more-btn:hover .fold {
-  background-color: var(--btnHoverRed);
+    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;
+    background-color: var(--btnFocusRed);
+    border-color: var(--btnFocusRed);
+    color: #fff;
 }
-
 </style>

package/src/components/web/Form.vue

@@ -413,6 +413,14 @@ function importComplete(res, field) {
             .catch(() => {
             });
     }
+    else if(res && res.rtnCode && res.rtnCode === 200 && res.rtnMsg){
+      ElMessage({
+          message: res.rtnMsg,
+          type: 'success',
+          showClose: true,
+      });
+    }
+
     if (field.flagAsync) {
         if (res.rtnCode && res.rtnCode === 202 && res.rtnMsg) {
             common.confirm(res.rtnMsg, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
@@ -448,8 +456,13 @@ function importComplete(res, field) {
                                             type: 'success',
                                             showClose: true,
                                         });
+                                    }                                    
+                                    if (field && field.callBackFunName) {
+                                      changeCallBackHandler(field, field.callBackFunName, data.content);
+                                    }
+                                    else {
+                                      Form.doAction(data);
                                     }
-                                    getPage(1, false);
                                 },
                                 onError(data) {
                                     common.closeDialog(dialogOption);
@@ -501,7 +514,12 @@ function importComplete(res, field) {
                                         showClose: true,
                                     });
                                 }
-                                getPage(1, false);
+                                if (field && field.callBackFunName) {
+                                  changeCallBackHandler(field, field.callBackFunName, data.content);
+                                }
+                                else {
+                                  Form.doAction(data);
+                                }
                             },
                             onError(data) {
                                 common.closeDialog(dialogOption);
@@ -523,7 +541,7 @@ function importComplete(res, field) {
           changeCallBackHandler(field, field.callBackFunName, res.content);
         }
         else {
-           model.doAction(res)
+          Form.doAction(res)
         }
     }
 }

package/src/components/web/FormList.vue

@@ -72,18 +72,27 @@
                     <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>
-                    <el-button v-if="model.create" :disabled="model.disabled" class="btn-add" type="success"
-                        style="width: auto;" size="small" :icon="CirclePlus" @click="addRow">
-                        {{ model.createText }}
-                    </el-button>
+                  <template v-if="!model.tableDisabled">
+                    <ul>
+                      <li v-for="(v,i) in model.toolButtonsShow" >
+                        <component :is="v.is" :vmodel="v" :parentModel="model" @fieldClick="toolButtonsClick" @importComplete="importComplete" @change="toolButtonsChangeHandler(v,$event)"></component>
+                      </li>
+                      <li v-if="model.selectRouter!==null">
+                        <component :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle(model.selectRouter)"></component>                        
+                      </li>
+                      <li v-if="model.create">
+                        <el-button :disabled="model.disabled" class="btn-add" type="success" style="width: auto;" size="small" :icon="CirclePlus" @click="addRow">
+                          {{ model.createText }}
+                        </el-button>                    
+                      </li>
+                    </ul>
+                  </template>
                 </div>
                 <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"
+                            v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)"
                             :width="'100%'">
                             <template #header="{ column, $index }">
                                 {{ setcolumnminWidth(column) }}
@@ -104,13 +113,9 @@
                                     @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-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 }}</el-tag>
                                 </template>
-
                             </template>
                         </el-table-column>
                     </template>
@@ -146,7 +151,7 @@
                     </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"
+                            v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)"
                             :width="'100%'">
                             <template #header="{ column, $index }">
                                 {{ setcolumnminWidth(column) }}
@@ -167,13 +172,9 @@
                                     @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-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 }}</el-tag>
                                 </template>
-
                             </template>
                         </el-table-column>
                     </template>
@@ -494,7 +495,7 @@ function setcolumnminWidth(column) {
 function buttonClick(row, button) {
     var submitData = {};
     button.submitFormField.forEach((v) => {
-        submitData[v] = row[v].code1;
+        submitData[v] = common.getDataOfUpperLower(row,v).code1;
     });
     model.value.currentRowIndex = model.value.source.rows.findIndex(v => v.$sourceIndex === row.$sourceIndex);
 
@@ -503,6 +504,15 @@ function buttonClick(row, button) {
 function rolRouterClickHandler(field, rowData,rowindex) {
   buttonClick(rowData, field);
 }
+function toolButtonsClick(field) {
+  emit('tableButtonClick', field, null);
+}
+function toolButtonsChangeHandler(field) {
+  emit('change', field);
+}
+function importComplete(res, button) {
+  emit('importComplete', res, button);
+}
 function insertOrUpdateRow(row) {
     FormList.insertOrUpdateRow(row, true, model.value);
 }
@@ -613,7 +623,10 @@ defineExpose({
     padding: 10px;
     width: 100%;
 }
-
+.list-button ul li {
+    margin-right: 5px;
+    float: left;
+}
 
 .ct-form-repeat .list-title {
     padding-bottom: 5px;

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

@@ -238,7 +238,7 @@ import TableToolbar from './TableToolbar.vue';
 import Tabletip from './Tabletip.vue';
 import Tablecurrency from './Tablecurrency.vue';
 import SearchTable from '../../../loader/src/SearchTable'
-import { RouterClickHandler, RouterMouseenterHandler } from '../../../utils/mixins';
+import { RouterClickHandler } from '../../../utils/mixins';
 import { ElMessage } from 'element-plus'
 const emit = defineEmits(['rowClickHandle', 'searchComplate', 'refreshRowHandle', 'simpleRouterRefreshHandler', 'loaded', 'scrollHandle', 'closeSideBar', 'refreshParent', 'popupClickHandler', 'drag'])
 const props = defineProps({
@@ -685,7 +685,7 @@ function rowLayoutClickHandle(index) {
 }
 
 //表单列表操作
-function rolRouterClickHandler(field, rowData, rowindex, visible, columnName) {
+function rolRouterClickHandler(field, rowData, rowindex, visible, columnName,callBack,flagMouseenter) {
     field.rowindex = rowindex;
     if (refRowsPopover.value[rowindex]) {
         refRowsPopover.value[rowindex].hide();
@@ -717,42 +717,11 @@ function rolRouterClickHandler(field, rowData, rowindex, visible, columnName) {
         action = rowData[field.actionField];
     }
 
-    RouterClickHandler(field, submitData, action, model.value, 'table')
+    RouterClickHandler(field, submitData, action, model.value, 'table',callBack,flagMouseenter)
 }
 //表单列表操作
-function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName, callBack) {
-    field.rowindex = rowindex;
-    if (refRowsPopover.value[rowindex]) {
-        refRowsPopover.value[rowindex].hide();
-    }
-    if (field.isListenVoice) {
-        if (model.value.currentListenVoice) {
-            refRowsRouter.value[model.value.currentListenVoice].closeListenVoice()
-        }
-        model.value.currentListenVoice = visible ? 'router' + field.id + rowindex : '';
-    }
-
-    var submitData = {};
-    field.submitListField.forEach((k) => {
-        submitData[k] = rowData[k];
-    });
-
-    if (field.flagAttachSearchCondition) {
-        submitData["searchFields"] = model.value.getSearchData();
-    }
-    if (field.isCallTel) {
-        submitData.flagHaveAlert = visible || false;
-    }
-    if (columnName) {
-        submitData.columnName = columnName;
-    }
-
-    let action = field.action;
-    if (field.actionField) {
-        action = rowData[field.actionField];
-    }
-
-    RouterMouseenterHandler(field, submitData, action, model.value, 'table', callBack)
+function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName, callBack,flagMouseenter) {
+    rolRouterClickHandler(field,rowData,rowindex,visible,columnName,callBack,true)
 }
 function popupClickHandler() {
     var tempListData = model.value.getSelectRowData({ isMulti: model.value.isMulti });

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

@@ -5,7 +5,7 @@
             <el-popover @before-enter="onShow" :width="tooltipModel.width"
                 :fallback-placements="['bottom', 'top', 'right', 'left']">
                 <template #default>
-                    <div :style="'height: '+(tooltipModel.height+50)+'px;'">
+                    <div :style="'height: ' + tooltipModel.height + ''">
                         <component v-bind="tooltipModel.attrs" :is="tooltipModel.component"></component>
                     </div>
                 </template>
@@ -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(() => {
@@ -173,6 +173,9 @@ function voiceEndedHandler() {
 }
 function onShow() {
     emit('mouseenter', props.router, props.rowData, props.rowindex, null, props.columnName, function (data) {
+        if (data.height) {
+            data.height = (parseInt(data.height.replace('px', ''))+50)+'px';
+        }
         tooltipModel.value = data
     });
 }

package/src/loader/src/FormList.js

@@ -120,6 +120,12 @@ function FormListModel(source, master,actionRouters) {
         get totalCols() {
             return source.totalCols;
         },
+        get tableDisabled() {
+          return source.disabled || master.locked || false;
+        },
+        set tableDisabled(v) {
+          source.disabled = v;
+        },
         //表单表格 选择数据来源的路由
         get selectRouter() {
             if (source.selectRouter) {
@@ -128,7 +134,7 @@ function FormListModel(source, master,actionRouters) {
                 return button;
             }
             return null;
-        },
+        },    
         //表格编辑模式
         get editMode() {
             return source.editMode;
@@ -168,6 +174,57 @@ function FormListModel(source, master,actionRouters) {
                 return rtn._buttons;
             }
         },
+        _buttonsShow: null,
+        get buttonsShow() {
+          if (rtn._buttonsShow !== null) {
+            return rtn._buttonsShow;
+          }
+          else {
+            rtn._buttonsShow = [];
+            if (rtn.buttons) {
+              rtn.buttons.forEach((v) => {
+                if(v.show){
+                  rtn._buttonsShow.push(v);
+                }
+              });
+            }
+            return rtn._buttonsShow;
+          }
+        },
+        _toolButtons: null,
+        get toolButtons() {
+          if (rtn._toolButtons !== null) {
+            return rtn._toolButtons;
+          }
+          else {
+            rtn._toolButtons = [];
+            if (source.toolButtons) {
+              source.toolButtons.forEach((v) => {
+                var button = Router(v);
+                button.is = "ct-button";
+                rtn._toolButtons.push(button);
+              });
+            }
+            return rtn._toolButtons;
+          }
+        },
+        _toolButtonsShow: null,
+        get toolButtonsShow() {
+          if (rtn._toolButtonsShow !== null) {
+            return rtn._toolButtonsShow;
+          }
+          else {
+            rtn._toolButtonsShow = [];
+            if (rtn.toolButtons) {
+              rtn.toolButtons.forEach((v) => {
+                if(v.show){
+                  rtn._toolButtonsShow.push(v);
+                }
+              });
+            }
+            return rtn._toolButtonsShow;
+          }
+        },
         _rows: null,
         get rows() {
             if (this._rows) {

package/src/loader/src/Router.js

@@ -4,6 +4,7 @@ import Enum from '../../utils/Enum';
 const Router = function (source) {
   let rtn = {
     disabled: source.selectedMode && source.selectedMode === Enum.ListSelectMode.Multiple ? true : false,//是否可以多选
+    loading: false,
     //动作的 key 值
     get key() {
       return source.key;

package/src/main.js

@@ -25,6 +25,7 @@ app.use(centaline, {
     //baseUrl: "http://10.88.22.66:6060/xian/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
+    
     flagRouterSelf: true,
     flagApp: false,//是否app端
     zindex: 999,
@@ -64,7 +65,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_2e493771-28ae-485d-afea-0e6dcef23f64",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_2e493771-28ae-485d-afea-0e6dcef23f64",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_8ce6c140-f584-45ed-b683-ca52837993aa",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_8ce6c140-f584-45ed-b683-ca52837993aa",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作