ocpview-pro 0.1.7 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-pro",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/masterplate/RewriteBillListDetails/BillListPanelQueryBar.vue

@@ -144,7 +144,14 @@
             :dictData="dictData"
         />
         <!-- 列表快捷查询 -->
-        <div v-show="filterFlag" style="margin-top: 20px">
+        <Modal
+            v-model="filterFlag"
+            :title="$t('高级查询')"
+            :width="90"
+            footer-hide
+            :styles="{ top: '20px' }"
+            @on-cancel="onFilterModalCancel"
+        >
             <BillConditionsBox
                 ref="filter"
                 @doAction="doAction"
@@ -152,7 +159,7 @@
                 :config="config"
                 :dictData="dictData"
             />
-        </div>
+        </Modal>
     </div>
 </template>
 <script>
@@ -246,7 +253,9 @@ export default {
             }
         },
         conditionAction(obj) {
-            // this.filterFlag = false;
+            if (obj.name === 'condition_searchFilter' || obj.name === 'condition_closeFilter') {
+                this.filterFlag = false;
+            }
             let data = this.$refs.filter.getData();
             this.updateScene(data.scenename, data);
             this.$emit("conditionAction", obj);

package/src/components/masterplate/RewriteListdetails/BillListPanelV3QueryBar.vue

@@ -143,7 +143,14 @@
                 </Col>
             </Row>
         </Card>
-        <div v-show="filterFlag" style="margin-top: 14px">
+        <Modal
+            v-model="filterFlag"
+            :title="$t('高级查询')"
+            :width="90"
+            footer-hide
+            :styles="{ top: '20px' }"
+            @on-cancel="onFilterModalCancel"
+        >
             <BillConditionsBox
                 ref="filter"
                 @doAction="doAction"
@@ -151,7 +158,7 @@
                 :config="config"
                 :dictData="dictData"
             />
-        </div>
+        </Modal>
     </div>
 </template>
 <script>
@@ -245,7 +252,9 @@ export default {
             }
         },
         conditionAction(obj) {
-            // this.filterFlag = false;
+            if (obj.name === 'condition_searchFilter' || obj.name === 'condition_closeFilter') {
+                this.filterFlag = false;
+            }
             let data = this.$refs.filter.getData();
             this.updateScene(data.scenename, data);
             this.$emit("conditionAction", obj);

package/src/components/masterplate/billconditionsbox.vue

@@ -1,6 +1,6 @@
 <template>
 <Card  :padding="0" style="padding:14px 16px;" dis-hover>
-    <Row type="flex" justify="start" align="middle" style="max-height:120px;overflow-y:auto;overflow-x:hidden" >
+    <Row type="flex" justify="start" align="middle">
         <Col v-for="temp in data" :key="temp.index" span="12">
             <BillConditionBox v-if="reset" :config="myConfig" :ref="temp.index" :curIndex="temp.index" :valueData="temp.form" @doAction="doAction" @inputValue="input"/>
         </Col>
@@ -10,10 +10,10 @@
             <p     @click.stop="doAdd" style="cursor:pointer">
                 <Row type="flex" justify="start" align="middle">
                     <Col>
-                        <Icon custom="iconfont icon-custom-addcond"   size="20" color="#AF292E"/>
+                        <Icon custom="iconfont icon-custom-addcond"   size="20" :style="{color: 'var(--mss-primary-color)'}"/>
                     </Col>
                     <Col>
-                        <span style="margin-left:18px;color:#AF292E;font-size:14px"> {{ $t('添加条件') }} </span>
+                        <span style="margin-left:18px;font-size:14px" class="add-cond-text"> {{ $t('添加条件') }} </span>
                     </Col>
                 </Row>
             </p>
@@ -118,7 +118,7 @@ export default {
                             let obj = {};
                             obj.index ='index_0';
                             obj.form = {};
-                            this.data.push(obj); 
+                            this.data.push(obj);
                         }
                     });
                 }
@@ -153,7 +153,7 @@ export default {
             let obj = {};
             obj.index ='index_0';
             obj.form = {};
-            this.data.push(obj); 
+            this.data.push(obj);
         },
         clearData() {
             this.data = [];
@@ -214,12 +214,12 @@ export default {
                                 Object.assign(param,temp3);
                             }
                         }
-                    } else {  
+                    } else {
                         param[obj.field] = {};
                         if (obj.value.value !== undefined) {
-                            param[obj.field][obj.oper] = obj.value.value; 
+                            param[obj.field][obj.oper] = obj.value.value;
                         } else {
-                            param[obj.field][obj.oper] = obj.value; 
+                            param[obj.field][obj.oper] = obj.value;
                         }
                     }
                 } else {
@@ -229,21 +229,21 @@ export default {
                     } else  {
                         param[obj.field] = {};
                         if (obj.value.value !== undefined) {
-                            param[obj.field][obj.oper] = obj.value.value; 
+                            param[obj.field][obj.oper] = obj.value.value;
                         } else {
-                            param[obj.field][obj.oper] = obj.value; 
+                            param[obj.field][obj.oper] = obj.value;
                         }
-                    } 
+                    }
                 }
-                
+
             }
-            
+
             if (para === undefined) {
                 return param;
             } else {
                 para.push(param);
             }
-           
+
         },
         getQuerySearchParam () {
             if (this.data.length  === 0) {
@@ -268,7 +268,7 @@ export default {
                         if (el.form.relevance === 'and') {
                             this.getCommomParam(el.form, paraAnd);
                         }
-                        
+
                     }
                 });
                 if (paraOr.length > 0) {
@@ -368,45 +368,48 @@ export default {
                 position: relative;
             }
          }
-         
+
          .ivu-btn {
              height:40px;
          }
-        .ivu-btn-red {
-            color: #fff;
-            background-color: #AF292E;
-        }
-        .ivu-btn-red:hover {
-            background-color: #FFB5B8;
-            border-color: #FFB5B8;
-        }
-        .ivu-btn-red :focus {
-            background-color: #7A2531;
-            border-color: #7A2531;
-        }
-        .ivu-btn-black {
-            color: #fff;
-            background-color: #4D4E53;
+        .add-cond-text {
+            color: var(--mss-primary-color);
         }
+        // .ivu-btn-red {
+        //     color: #fff;
+        //     background-color: var(--mss-primary-color);
+        // }
+        // .ivu-btn-red:hover {
+        //     background-color: var(--mss-primary-color-hover);
+        //     border-color: var(--mss-primary-color-hover);
+        // }
+        // .ivu-btn-red:focus {
+        //     background-color: var(--mss-primary-color-active);
+        //     border-color: var(--mss-primary-color-active);
+        // }
+        // .ivu-btn-black {
+        //     color: #fff;
+        //     background-color: var(--mss-info-color);
+        // }
 
-        .ivu-btn-black:hover {
-              background-color: #CDD0D6;
-              border-color: #CDD0D6;;
-         }
-         .ivu-btn-black:focus {
-              background-color: #000000;
-              border-color: #000000;;
-         }
-         .ivu-btn-default:hover {
-               color: #EF6E73;
-              background-color: #FFF9F9;
-              border-color: #EF6E73;;
-         }
-        .ivu-btn-default:focus {
-             color: #DF3D43;
-            background-color: #FFF9F9;
-            border-color: #DF3D43;
-        }
+        // .ivu-btn-black:hover {
+        //       background-color: #CDD0D6;
+        //       border-color: #CDD0D6;
+        //  }
+        //  .ivu-btn-black:focus {
+        //       background-color: #000000;
+        //       border-color: #000000;
+        //  }
+        //  .ivu-btn-default:hover {
+        //        color: var(--mss-error-color);
+        //       background-color: #FFF9F9;
+        //       border-color: var(--mss-error-color);
+        //  }
+        // .ivu-btn-default:focus {
+        //      color: var(--mss-error-color-active);
+        //     background-color: #FFF9F9;
+        //     border-color: var(--mss-error-color-active);
+        // }
         .modulecodetext {
             height:40px;
             text-align:center;
@@ -420,7 +423,7 @@ export default {
             height:32px;
         }
     }
- 
+
 }
 
 

package/src/components/masterplate/index.js

@@ -4,7 +4,7 @@ import SimpleTree from "./simpletree.vue";
 import RowBtnToolbar from "./rowbtntoolbar.vue";
 import DetailBtnToolbar from "./detailbtntoolbar.vue";
 import BillTemplate from "./layouttemplate.vue";
-import mListDetails from "./listdetails.vue";
+import mListDetails from "./RewriteListdetails/indexV3.vue"; // 备份：./listdetails.vue
 import mLeftListRightDetails from "./leftlistrightdetails.vue";
 import mLeftTreeRightDetails from "./lefttreerightdetails.vue";
 import mLeftListRightList from "./leftlistrightlist.vue";

package/src/components/masterplate/querybar.vue

@@ -1,4 +1,4 @@
-<template> 
+<template>
 <div class="querybar" >
     <Row  type="flex" :gutter="0">
         <Col span='16'>
@@ -22,7 +22,7 @@
                     <Dropdown trigger="custom" :visible="filterSceneFlag" @on-click="filterAction" placement="bottom-start" @on-clickoutside="closeFilterScene">
                        <Badge  class-name="badgeclass" :count="sceneNum">
                         <ButtonGroup>
-                            <Button  customIcon="iconfont icon-custom-filter"  @click="updataFilterScene">{{ $t('高级查询') }}</Button>  
+                            <Button  customIcon="iconfont icon-custom-filter"  @click="updataFilterScene">{{ $t('高级查询') }}</Button>
                             <Button  v-if="!filterSceneFlag && sceneFlag" icon="ios-arrow-down"  @click="openFilterScene"> </Button>
                             <Button  v-if="filterSceneFlag && sceneFlag" icon="ios-arrow-up"  @click="closeFilterScene"> </Button>
                         </ButtonGroup>
@@ -41,7 +41,7 @@
             <Col style="padding-right:10px;">
                 <Dropdown trigger="custom" :visible="btnFlag" @on-click="action" placement="bottom-start" @on-clickoutside="closeBtn">
                     <ButtonGroup>
-                        <Button customIcon="iconfont icon-custom-add"   v-if="addDataBtnFlag"  @click="addData">{{ $t('新增') }}</Button>   
+                        <Button customIcon="iconfont icon-custom-add"   v-if="addDataBtnFlag"  @click="addData">{{ $t('新增') }}</Button>
                         <Button   v-if="!btnFlag && moreBtnFlag" icon="ios-arrow-down"  @click="openBtn"> </Button>
                         <Button   v-if="btnFlag && moreBtnFlag" icon="ios-arrow-up"  @click="closeBtn"> </Button>
                     </ButtonGroup>
@@ -56,13 +56,20 @@
             </Col>
             <Col>
                 <PromptMessages style="height:100%"/>
-            </COl> 
+            </COl>
         </Row>
         </Col>
     </Row>
-    <div v-show="filterFlag" style="margin-top:20px">
+    <Modal
+        v-model="filterFlag"
+        :title="$t('高级查询')"
+        :width="90"
+        footer-hide
+        :styles="{ top: '20px' }"
+        @on-cancel="onFilterModalCancel"
+    >
         <BillConditionsBox ref="filter"  @doAction="doAction"  @conditionAction="conditionAction" :config="config" :dictData="dictData"/>
-    </div>
+    </Modal>
 </div>
 </template>
 <script>
@@ -87,7 +94,7 @@
             moduleMethod:{
                 type:Array,
                 default: () => {
-                return [];      
+                return [];
             }
         }
         } ,
@@ -157,7 +164,7 @@
                         }
                     });
                 }
-                
+
                 if (this.myConfig.btnData !== undefined) {
                     this.btnData = this.$Method.copy(this.myConfig.btnData);
                 }
@@ -168,7 +175,7 @@
                         el.icon = null;
                     }
                 });
-                
+
                 if (this.myConfig.sceneData !== undefined) {
                     this.sceneData = this.$Method.copy(this.myConfig.sceneData);
                 }
@@ -229,7 +236,7 @@
                 if (el.children && el.children.length > 0) {
                     for (let i=0;i<el.children.length; i++) {
                         this.initDictkey(el.children[i]);
-                    } 
+                    }
                 } else {
                     if (el.dictkey) {
                         if (el.data === undefined) {
@@ -297,7 +304,9 @@
                 this.$emit('conditionAction',temp);
             },
             conditionAction(obj) {
-                this.filterFlag = false;
+                if (obj.name === 'condition_searchFilter' || obj.name === 'condition_closeFilter') {
+                    this.filterFlag = false;
+                }
                 let data = this.$refs.filter.getData();
                 this.updateScene(data.scenename,data);
                 this.$emit('conditionAction',obj);
@@ -322,7 +331,7 @@
                 this.$nextTick(() =>{
                     this.hackReset = true;
                 });
-                
+
             },
             customClear () {
                 this.$refs.field.setValue('');
@@ -390,7 +399,7 @@
                             return false;
                         }  else {
                             this.sceneData.push(obj.para);
-                            
+
                         }
                     }
                     if (obj.para.flag === 'U') {
@@ -412,7 +421,7 @@
                           if (index > -1) {
                                this.sceneData.splice(index,1)
                           }
-                          this.filterFlag = false;  
+                          this.filterFlag = false;
                     }
                     if (this.sceneData.length > 0) {
                         this.sceneFlag = true;
@@ -450,6 +459,9 @@
                     });
                 }
             },
+            onFilterModalCancel() {
+                this.filterSceneFlag = false;
+            },
             updataFilterScene() {
                 this.filterFlag = !this.filterFlag
                 if (!this.selectedScence && this.filterFlag) {
@@ -477,9 +489,9 @@
                     this.selectedScence ='';
                 }
             },
-           
+
         }
-        
+
     };
 </script>
 <style lang="less" scoped>

package/src/index.js

@@ -195,7 +195,7 @@ const install = function(app, opts = {}) {
     app.use(localePlus, opts.locale);
     setupCopyFormatRestore()
 
-    VXETable.install(app)
+    VXETable.install(app,localePlus.i18n);
     app.config.globalProperties.$utils = XEUtils;
 
     iviewCoustom.initEview(ViewUI);

package/src/plugins/vxeTable/index.js

@@ -233,7 +233,7 @@ VXETable.setup({
 const install = (app, i18n) => {
     VXETable.setup({
         // 对组件内置的提示语进行国际化翻译
-        // i18n: (key, args) => i18n.global.t(key, args)
+        i18n: (key, args) => i18n.global.t(key, args)
     });
     app.use(VXETable);
 };