ocpview-pro 0.1.6 → 0.1.8

package/package.json

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

package/src/components/base/controlbox.vue

@@ -13,12 +13,12 @@
             <div v-if="!!config.hide">
                 <p   v-if="hideFlag"  @click.stop="hide"  class="efuture-hide-text">
                     <Icon type="ios-arrow-up" />
-                    <span> 
-                        收起查询条件
+                    <span>
+                        {{ $t('收起查询条件') }}
                     </span>
                 </p>
                 <p v-else @click.stop="hide" class="efuture-hide-text"><Icon type="ios-arrow-down" />
-                    <span>展开查询条件</span>
+                    <span>{{ $t('展开查询条件') }}</span>
                 </p>
             </div>   
           </template>  

package/src/components/base/load.js

@@ -9,7 +9,7 @@ export default {
         showLoading () {
             this.$Spin.show({
                 render: (h) => {
-                    return h('div', '正在'+this.loadingtext+',请耐心等待...');
+                    return h('div', this.$t('正在{action}，请耐心等待...', { action: this.loadingtext }));
                 }
             });
         },

package/src/components/conditionbox/conditionbase.vue

@@ -8,7 +8,7 @@
                 },
                 myConfig: {
                 },
-                clearInfo:'清空',
+                clearInfo:'',
                 conditionPrior:[],
                 condition:[],
                 dataType:{},
@@ -51,9 +51,9 @@
                     this.myConfig = Object.assign({}, this.myConfig, this.config);
                 }
                 if (this.isPop) {
-                    this.clearInfo = '清空';
+                    this.clearInfo = this.$t('清空');
                 } else {
-                    this.clearInfo = '重置';
+                    this.clearInfo = this.$t('重置');
                 }
 
                 if (this.myConfig.clearInfo) {

package/src/components/conditionbox/conditionfilterbox.vue

@@ -78,7 +78,7 @@ import { resolveComponent } from 'vue';
                     this.myConfig.selector = [];
                     let  obj = {};
                     obj.code = '1';
-                    obj.name = '筛选条件';
+                    obj.name = this.$t('筛选条件');
                     if (this.myConfig.rootName){
                         obj.name = this.myConfig.rootName;
                     }
@@ -105,7 +105,7 @@ import { resolveComponent } from 'vue';
                     root.render = this.renderRootStaticContent;
                     root.children = [];
                     let obj = {
-                        title:'连接关系',
+                        title:this.$t('连接关系'),
                         operflag:true,
                         selectorClass:2,
                         selector:this.myConfig.selector[0].code,
@@ -115,7 +115,7 @@ import { resolveComponent } from 'vue';
                         render:this.renderContent,
                         children:[
                             {
-                                title:'条件',
+                                title:this.$t('条件'),
                                 operflag:true,
                                 isConnector:false,
                                 expand: true,
@@ -130,13 +130,13 @@ import { resolveComponent } from 'vue';
                     if (this.myConfig.rootName) {
                         root.title =  this.myConfig.rootName;
                     } else {
-                        root.title =  '筛选条件';
+                        root.title =  this.$t('筛选条件');
                     }
                     root.expand =true;
                     root.children = [];
                     root.render = this.renderRootStaticContent;
                     root.children.push({
-                        title: '连接关系',
+                        title: this.$t('连接关系'),
                         isConnector:true,
                         expand: true,
                         operflag:false,
@@ -156,7 +156,7 @@ import { resolveComponent } from 'vue';
                         obj.render=this.renderRootStaticContent;
                         obj.children = [];
                         let temp = {
-                            title:'连接关系',
+                            title:this.$t('连接关系'),
                             operflag:true,
                             selectorClass:3,
                             selector:el.code,
@@ -166,7 +166,7 @@ import { resolveComponent } from 'vue';
                             render:this.renderContent,
                             children:[
                                 {
-                                    title:'条件',
+                                    title:this.$t('条件'),
                                     operflag:true,
                                     isConnector:false,
                                     expand: true,
@@ -262,9 +262,9 @@ import { resolveComponent } from 'vue';
                 const children = data.children || [];
                 let nextClass = Number(data.selectorClass) + 1;
                 let isConnector = !data.isConnector;
-                let title ='条件';
+                let title =this.$t('条件');
                 if (isConnector) {
-                    title = '连接关系';
+                    title = this.$t('连接关系');
                     let flag = false;
                     for (let i=0; i<children.length; i++) {
                         if (children[i].isConnector) {

package/src/components/conditionbox/conditionselectorbox.vue

@@ -31,58 +31,60 @@
                     lineNum:12,
                     labelWidth:10,
                     showLabel:false,
-                    items:[{
-                        name:'field',
-                        type:'ComboBox',
-                        codeWithName:false,
-                        valueChanged:this.fieldChanged,
-                        colNum:3,
-                       // size:'small',
-                        isFull:true
-                    },{
-                        name:'oper',
-                        type:'ComboBox',
-                        codeWithName:false,
-                        clearable:false,
-                        //size:'small',
-                        colNum:2,
-                        data:[{
-                            name: '等于',
-                            code: '=='
-                        }],
-                        defaultValue:'==',
-                        isFull:true
-                    },{
-                        name:'value',
-                        type:'TextBox',
-                        //size:'small',
-                        readOnly:true,
-                        colNum:3,
-                        isFull:true
-                    }]
+                    items:[]
                 },
                 formConnector:{
                     lineNum:8,
                     labelWidth:30,
                     showLabel:false,
-                    items:[{
-                        name:'connector',
-                        type:'ComboBox',
-                        codeWithName:false,
-                        //size:'small',
-                        colNum:2,
-                        data:[{'code':'$or','name':'或'}, {'code':'$and','name':'且'}],
-                        defaultValue:'$and',
-                        style:{
-                            'min-width':'50px'
-                        },
-                        clearable:false
-                    }]
+                    items:[]
                 },
                 dataType:{}
             };
         },
         created () {
+            this.form.items = [{
+                name:'field',
+                type:'ComboBox',
+                codeWithName:false,
+                valueChanged:this.fieldChanged,
+                colNum:3,
+               // size:'small',
+                isFull:true
+            },{
+                name:'oper',
+                type:'ComboBox',
+                codeWithName:false,
+                clearable:false,
+                //size:'small',
+                colNum:2,
+                data:[{
+                    name: this.$t('等于'),
+                    code: '=='
+                }],
+                defaultValue:'==',
+                isFull:true
+            },{
+                name:'value',
+                type:'TextBox',
+                //size:'small',
+                readOnly:true,
+                colNum:3,
+                isFull:true
+            }];
+            this.formConnector.items = [{
+                name:'connector',
+                type:'ComboBox',
+                codeWithName:false,
+                //size:'small',
+                colNum:2,
+                data:[{'code':'$or','name':this.$t('或')}, {'code':'$and','name':this.$t('且')}],
+                defaultValue:'$and',
+                style:{
+                    'min-width':'50px'
+                },
+                clearable:false
+            }];
             this.init();
         },
         props:{
@@ -147,30 +149,30 @@
             getOperData(el) {
                 let tempData = [];
                 tempData.push({
-                    name: '等于',
+                    name: this.$t('等于'),
                     code: '=='
                 });
                 if (el.type === 'DateBox' || el.type === 'NumberBox') {
                     tempData.push({
-                        name: '不小于',
+                        name: this.$t('不小于'),
                         code: '>='
                     });
                     tempData.push({
-                        name: '不大于',
+                        name: this.$t('不大于'),
                         code: '<='
                     });
                     tempData.push({
-                        name: '不等于',
+                        name: this.$t('不等于'),
                         code: '<>'
                     });
-                } 
+                }
                 if (el.type === 'TextBox') {
                     tempData.push({
-                        name: '不等于',
+                        name: this.$t('不等于'),
                         code: '<>'
                     });
                     tempData.push({
-                        name: '包含',
+                        name: this.$t('包含'),
                         code: 'LIKE'
                     });
                 } 
@@ -201,7 +203,7 @@
                     }
                 } else {
                     oper.data = [{
-                        name: '等于',
+                        name: this.$t('等于'),
                         code: '=='
                     }];
                     oper.readOnly = true;

package/src/components/conditionbox/queryconditionbox.vue

@@ -7,10 +7,10 @@
             <Col span='6'>
                 <Row type="flex" justify="end" align="middle"  >
                     <Col>
-                        <Button customIcon="iconfont icon-custom-search" type="primary"  style="width:80px" @click="search">查询</Button>
+                        <Button customIcon="iconfont icon-custom-search" type="primary"  style="width:80px" @click="search">{{ $t('查询') }}</Button>
                     </COl>
                     <Col style="margin-left:10px">
-                        <Button  customIcon="iconfont icon-custom-reset"  style="width:80px" @click="doClear">重置</Button>
+                        <Button  customIcon="iconfont icon-custom-reset"  style="width:80px" @click="doClear">{{ $t('重置') }}</Button>
                     </Col>
                 </Row>
             </Col>

package/src/components/conditionbox/searchconditionbox.vue

@@ -8,13 +8,13 @@
             <ControlBox  v-if="hackReset" ref="editors"  :config="editorsConfig"  ></ControlBox>
         </Col>
         <Col>
-            <Button icon="ios-search"  @click="search" >查询</Button>
+            <Button icon="ios-search"  @click="search" >{{ $t('查询') }}</Button>
         </Col>
         <Col>
             <Button icon="ios-refresh" @click="clear">{{clearInfo}}</Button>
         </Col>
         <Col>
-            <Button icon="ios-search" type="primary" @click="showHighSearch">高级查询</Button>
+            <Button icon="ios-search" type="primary" @click="showHighSearch">{{ $t('高级查询') }}</Button>
         </Col>
     </Row>
     <SearchGrid ref="searchgrid" :config="config" :dictData="searchDictData" :dataType="dataType" @search="search"/>

package/src/components/conditionbox/searchgrid.vue

@@ -17,23 +17,23 @@
 </style>
 <template>
     <div>
-        <Modal v-model="modalSearch" :width="900"  title="高级查询" class-name="vertical-center-modal" :footer-hide="true">
+        <Modal v-model="modalSearch" :width="900"  :title="$t('高级查询')" class-name="vertical-center-modal" :footer-hide="true">
         <div style="padding:10px">
         <Row type="flex" :gutter="10" justify="start" align="middle">
             <Col>
-            <Button icon="ios-add" type="primary" @click="addCondition">新建</Button>
+            <Button icon="ios-add" type="primary" @click="addCondition">{{ $t('新建') }}</Button>
             </Col>
             <Col>
-            <Button icon="ios-remove" type="primary" @click="delCondition">删除</Button>
+            <Button icon="ios-remove" type="primary" @click="delCondition">{{ $t('删除') }}</Button>
             </Col>
             <Col>
-            <Button icon="ios-close" type="primary" @click="clearCondition">清空</Button>
+            <Button icon="ios-close" type="primary" @click="clearCondition">{{ $t('清空') }}</Button>
             </Col>
             <Col>
-            <Button icon="ios-redo-outline" style="float:right;" @click="backCondition">取消</Button>
+            <Button icon="ios-redo-outline" style="float:right;" @click="backCondition">{{ $t('取消') }}</Button>
             </Col>
             <Col>
-            <Button icon="ios-search" style="float:right;margin-right:5px;" type="primary" @click="searchCondition">确定查询</Button>
+            <Button icon="ios-search" style="float:right;margin-right:5px;" type="primary" @click="searchCondition">{{ $t('确定查询') }}</Button>
             </Col>
         </Row>
          <EditGrid ref="grid" :config="gridConfig" :dictData="dictData">
@@ -60,81 +60,10 @@ export default {
                 showIndex:false,
                 height:0.5,
                 cellbeginedit:this.cellbeginedit,
-                items:[  {
-                    label:'左括号',
-                    name:'bracket_left',
-                    type:'ComboBox',
-                    width:80,
-                    align:'center',
-                    codeWithName:false,
-                    data:[{code:'1',name:'('},{code:'2',name:'(('}]
-                },{
-                    label:'条件字段',
-                    name:'field',
-                    type:'ComboBox',
-                    codeWithName:false,
-                    align:'center',
-                    contentAlign:'left',
-                    dictkey:'FIELD'
-                }, {
-                    label:'运算',
-                    name:'calculator',
-                    type:'ComboBox',
-                    width:100,
-                    align:'center',
-                    codeWithName:false,
-                    clearable:false,
-                    data:[{
-                        name: '等于',
-                        code: '=='
-                    }, {
-                        name: '大于',
-                        code: '>'
-                    }, {
-                        name: '大于等于',
-                        code: '>='
-                    }, {
-                        name: '小于',
-                        code: '<'
-                    }, {
-                        name: '小于等于',
-                        code: '<='
-                    }, {
-                        name: '不等于',
-                        code: '<>'
-                    }, {
-                        name: '包含',
-                        code: 'LIKE'
-                    }],
-                    defaultValue:'=='
-                }, {
-                    label:'条件值',
-                    name:'editors',
-                    type:'TextBox',
-                    align:'center',
-                    contentAlign:'left',
-                    updateCellConfig:this.updateCellConfig
-                },{
-                    label:'右括号',
-                    name:'bracket_right',
-                    type:'ComboBox',
-                    width:80,
-                    align:'center',
-                    codeWithName:false,
-                    data:[{code:'1',name:')'},{code:'2',name:'))'}]
-                },{
-                    label:'关系',
-                    name:'relationship',
-                    type:'ComboBox',
-                    width:80,
-                    align:'center',
-                    codeWithName:false,
-                    clearable:false,
-                    data:[{code:'1',name:'且'},{code:'2',name:'或'}]
-                }]
+                items:[]
             },
             initData:[],
-            condition:[], 
+            condition:[],
             bracket:[],
             bracketLeft:0,
             bracketRight:0
@@ -157,6 +86,78 @@ export default {
         },
     },
     created() {
+        this.gridConfig.items = [{
+            label: this.$t('左括号'),
+            name:'bracket_left',
+            type:'ComboBox',
+            width:80,
+            align:'center',
+            codeWithName:false,
+            data:[{code:'1',name:'('},{code:'2',name:'(('}]
+        },{
+            label: this.$t('条件字段'),
+            name:'field',
+            type:'ComboBox',
+            codeWithName:false,
+            align:'center',
+            contentAlign:'left',
+            dictkey:'FIELD'
+        }, {
+            label: this.$t('运算'),
+            name:'calculator',
+            type:'ComboBox',
+            width:100,
+            align:'center',
+            codeWithName:false,
+            clearable:false,
+            data:[{
+                name: this.$t('等于'),
+                code: '=='
+            }, {
+                name: this.$t('大于'),
+                code: '>'
+            }, {
+                name: this.$t('大于等于'),
+                code: '>='
+            }, {
+                name: this.$t('小于'),
+                code: '<'
+            }, {
+                name: this.$t('小于等于'),
+                code: '<='
+            }, {
+                name: this.$t('不等于'),
+                code: '<>'
+            }, {
+                name: this.$t('包含'),
+                code: 'LIKE'
+            }],
+            defaultValue:'=='
+        }, {
+            label: this.$t('条件值'),
+            name:'editors',
+            type:'TextBox',
+            align:'center',
+            contentAlign:'left',
+            updateCellConfig:this.updateCellConfig
+        },{
+            label: this.$t('右括号'),
+            name:'bracket_right',
+            type:'ComboBox',
+            width:80,
+            align:'center',
+            codeWithName:false,
+            data:[{code:'1',name:')'},{code:'2',name:'))'}]
+        },{
+            label: this.$t('关系'),
+            name:'relationship',
+            type:'ComboBox',
+            width:80,
+            align:'center',
+            codeWithName:false,
+            clearable:false,
+            data:[{code:'1',name:this.$t('且')},{code:'2',name:this.$t('或')}]
+        }];
         this.init();
     },
     methods: {
@@ -267,11 +268,11 @@ export default {
                 for (let i=0;i<data.length;i++) {
                     if (data[i].bracket_left || data[i].bracket_right) {
                         if (!data[i].field) {
-                            this.alert('第'+(i+1)+'行的条件字段为空，请检查');
+                            this.alert(this.$t('第{row}行的条件字段为空，请检查', { row: i+1 }));
                             return false;
                         }
                         if (!data[i].editors) {
-                            this.alert('第'+(i+1)+'行的值为空，请检查');
+                            this.alert(this.$t('第{row}行的值为空，请检查', { row: i+1 }));
                             return false;
                         }
                         if (data[i].bracket_left) {
@@ -284,7 +285,7 @@ export default {
                    
                     if (data[i].field && data[i].editors) {
                         if (!data[i].relationship) {
-                            this.alert('第'+(i+1)+'行的关系为空，请检查');
+                            this.alert(this.$t('第{row}行的关系为空，请检查', { row: i+1 }));
                             return false;
                         }
                         result.push(this.$Method.copy(data[i]));
@@ -292,7 +293,7 @@ export default {
                 }
             }
             if (this.bracketLeft !== this.bracketRight) {
-                this.alert('有效条件的左括号('+this.bracketLeft+')与右括号('+this.bracketRight+')的数量不一致，请检查');
+                this.alert(this.$t('有效条件的左括号({left})与右括号({right})的数量不一致，请检查', { left: this.bracketLeft, right: this.bracketRight }));
                 return false;
             }
             if (result.length > 0) {
@@ -331,10 +332,10 @@ export default {
                     let orIndex =  el.indexOf('$or');
                     if (andIndex !== -1 && orIndex !== -1) {
                         let oper = '$or';
-                        let opername = '或';
+                        let opername = this.$t('或');
                         if (orIndex < andIndex) {
                             oper = '$and';
-                            opername = '且';
+                            opername = this.$t('且');
                         }
                         let list = el.split('_');
                         let index = -1;
@@ -350,7 +351,7 @@ export default {
                             });
                         }
                         if (index > -1) {
-                            this.alert('第'+(index+1)+'行的关系不能为['+opername+']或请添加括号' );
+                            this.alert(this.$t('第{row}行的关系不能为[{oper}]或请添加括号', { row: index+1, oper: opername }) );
                             return true;
                         }  
                     }

package/src/components/datebox/DateBoxV1.vue

@@ -7,7 +7,7 @@ export default {
     mounted() {
         const shortcuts = this.$utils.get(this.myConfig, "shortcuts", [
             {
-                text: "今天",
+                text: this.$t("今天"),
                 value() {
                     return new Date();
                 },

package/src/components/form/detailsbox.vue

@@ -44,8 +44,8 @@
                      <template #footer>
                     <Row type="flex" justify="center" align="middle" style="margin-top: 10px;margin-bottom: 10px;" :gutter="16">
                         <Col>
-                        <Button  type="primary" @click="save">保存</Button>
-                        <Button  style="margin-left: 20px;" @click="cancel">放弃</Button>
+                        <Button  type="primary" @click="save">{{ $t('保存') }}</Button>
+                        <Button  style="margin-left: 20px;" @click="cancel">{{ $t('放弃') }}</Button>
                         </Col>
                     </Row>
                     </template>
@@ -112,6 +112,8 @@ export default {
         }
     },
     created () {
+        this.myConfig.addBtnName = this.$t('新增');
+        this.myConfig.editBtnName = this.$t('编辑');
         this.init();
     },
     computed: {
@@ -449,7 +451,7 @@ export default {
                     }
                 });
                 if (flag) {
-                    this.alert('必填项不允许为空');
+                    this.alert(this.$t('必填项不允许为空'));
                 }
             }
             return flag;

package/src/components/form/formcardbox.vue

@@ -113,6 +113,9 @@ export default {
         };
     },
     created() {
+        this.myConfig.editBtnText = this.$t('编辑');
+        this.myConfig.saveBtnText = this.$t('保存');
+        this.myConfig.cancelBtnText = this.$t('放弃');
         this.init();
     },
     computed: {

package/src/components/form/formcardbox2.vue

@@ -80,6 +80,9 @@ export default {
         };
     },
     created() {
+        this.myConfig.editBtnText = this.$t('编辑');
+        this.myConfig.saveBtnText = this.$t('保存');
+        this.myConfig.cancelBtnText = this.$t('放弃');
         this.init();
     },
     computed: {

package/src/components/form/formcardgroupbox.vue

@@ -40,6 +40,8 @@ export default {
         };
     },
     created () {
+        this.myConfig.editBtnText = this.$t('编辑');
+        this.myConfig.saveBtnText = this.$t('保存');
         this.init();
     },
     props:{

package/src/components/form/formdetail.vue

@@ -10,10 +10,10 @@
             <Row type="flex" justify="start"> 
                 <Col  style="margin-top: 18px;text-align:right;width:2%">
                     <Affix>
-                        <Poptip v-show="!leftSpan" trigger="hover" placement="right" content="展开功能菜单栏"> 
+                        <Poptip v-show="!leftSpan" trigger="hover" placement="right" :content="$t('展开功能菜单栏')"> 
                             <CommonIcon type="_right" :size="1" @click="doShowLeft"> </CommonIcon>
                         </Poptip>
-                        <Poptip v-show="leftSpan" trigger="hover" placement="right" content="收缩功能菜单栏">
+                        <Poptip v-show="leftSpan" trigger="hover" placement="right" :content="$t('收缩功能菜单栏')">
                              <CommonIcon type="_left" :size="1" @click="doHideLeft"> </CommonIcon>
                         </Poptip>
                     </Affix>