system-clients 3.1.89-8 → 3.1.90

package/.eslintrc.js

@@ -1,16 +1,16 @@
-module.exports = {
-  root: true,
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
-  extends: 'standard',
-  // required to lint *.vue files
-  plugins: [
-    'eslint-plugin-html'
-  ],
-  // add your custom rules here
-  'rules': {
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
-}
+// module.exports = {
+//   root: true,
+//   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+//   extends: 'standard',
+//   // required to lint *.vue files
+//   plugins: [
+//     'eslint-plugin-html'
+//   ],
+//   // add your custom rules here
+//   'rules': {
+//     // allow paren-less arrow functions
+//     'arrow-parens': 0,
+//     // allow debugger during development
+//     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
+//   }
+// }

package/build/webpack.base.conf.js

@@ -1,75 +1,85 @@
-var path = require('path')
-var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
-
-module.exports = {
-  entry: {
-    app: './src/main.js'
-  },
-  output: {
-    path: path.resolve(__dirname, '../dist/static'),
-    publicPath: 'static/',
-    filename: '[name].js'
-  },
-  resolve: {
-    extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
-    alias: {
-      'test': path.resolve(__dirname, '../test'),
-      'src': path.resolve(__dirname, '../src')
-    }
-  },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel',
-        include: [
-          `${projectRoot}\\src`,
-          `${projectRoot}\\build`,
-          `${projectRoot}\\examples`,
-          `${projectRoot}\\test`,
-          `${projectRoot}\\node_modules\\vue-client\\src`,
-          `${projectRoot}\\node_modules\\vue-strap\\src`
-        ]
-      },
-      {
-        test: /\.json$/,
-        loader: 'json'
-      },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
-      {
-        test: /\.less$/,
-        loader: 'style!css!less'
-      },
-      {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
-        loader: 'url',
-        query: {
-          limit: 10000,
-          name: '[name].[ext]?[hash:7]'
-        }
-      }
-    ]
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: false,
-      extract: false
-    })
-  },
-  plugins: [],
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  }
-}
+var path = require('path')
+var cssLoaders = require('./css-loaders')
+var projectRoot = path.resolve(__dirname, '../')
+
+module.exports = {
+  entry: {
+    app: './src/main.js'
+  },
+  output: {
+    path: path.resolve(__dirname, '../dist/mergeUser'),
+    publicPath: 'mergeUser/',
+    filename: '[name].js'
+  },
+  resolve: {
+    extensions: ['', '.js', '.vue'],
+    fallback: [path.join(__dirname, '../node_modules')],
+    alias: {
+      'src': path.resolve(__dirname, '../src'),
+      'test': path.resolve(__dirname, '../test')
+    }
+  },
+  resolveLoader: {
+    fallback: [path.join(__dirname, '../node_modules')]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        include: [
+          /src/,
+          /build/,
+          /examples/,
+          /test/,
+          /node_modules\/vue-client\/src/,
+          /node_modules\/vue-strap\/src/,
+          /node_modules\/system-clients\/src/,
+          /node_modules\/ldap-clients\/src/,
+          /node_modules\/address-client\/src/
+        ],
+        options: {
+          presets: ['es2015']
+        }
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
+      {
+        test: /\.html$/,
+        loader: 'vue-html'
+      },
+      {
+        test: /\.less$/,
+        loader: 'style!css!less'
+      },
+      {
+        test: /\.css$/,
+        loader: 'style!css'
+      },
+      {
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        loader: 'url',
+        query: {
+          limit: 10000,
+          name: '[name].[ext]?[hash:7]'
+        }
+      }
+    ]
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: false,
+      extract: false
+    })
+  },
+  plugins: [],
+  eslint: {
+    formatter: require('eslint-friendly-formatter')
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.1.89-8",
+  "version": "3.1.90",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
@@ -76,7 +76,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
-    "vue-client": "1.21.60",
+    "vue-client": "1.24.33",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/Main.vue

@@ -126,7 +126,7 @@
       tablename:'t_singlevalue',
       condition: " 1=1 and name=\'水印内容\'"
     };
-    let result =await self.$resetpost('rs/sql/saleSingleTable',{data:param},{resolveMsg: '退出成功', rejectMsg: null});
+    let result =await self.$resetpost('rs/sql/saleSingleTable',{data:param},{resolveMsg: null, rejectMsg: null});
     if(result && result.data.length>0){
       self.showwatermakeflag = true;
       createWaterMark(result.data[0].value);

package/src/components/TabButton.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class='flex foot_tabset1'>
+    <!-- Nav tabs -->
+    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
+      <li style="margin-right: 10px;height: 100%"
+          :id="'vc-tabset-li-'+attach +'-'+$index"
+          v-for="r in renderData"
+          @click.prevent="handleTabListClick($index, r)"
+          :disabled="r.disabled"
+      >
+        <button v-if="button" class="button_new" style="width: max-content" v-bind:class="{
+            'btn-succ': ($index === active),
+            'disabled': r.disabled
+          }">
+          <slot name="header">
+            {{ r.header }}
+          </slot>
+          <!-- 关闭按钮 -->
+          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
+                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
+        </button>
+        <span v-if="!button" v-bind:class="{
+            'span-active': ($index === active),
+            'span-disable': ($index !== active)
+          }">
+          <slot name="header">
+            {{ r.header }}
+          </slot>
+          <!-- 关闭按钮 -->
+          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
+                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
+        </span>
+
+      </li>
+    </ul>
+
+    <!-- Tab panes -->
+    <div class="tab-content span" v-el:tab-content>
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+import {remove} from 'vue-client/src/stores/Remove.js'
+
+export default {
+  props: {
+    navStyle: {
+      type: String,
+      default: 'tabs'
+    },
+    effect: {
+      type: String,
+      default: 'fadein'
+    },
+    active: {
+      type: Number,
+      default: 0
+    },
+    close: {
+      type: Boolean,
+      default: false
+    },
+    button: {
+      type: Boolean,
+      default: true
+    },
+    attach: {
+      type: String,
+      default: 'vuestrap'
+    },
+    content: {}
+  },
+  ready() {
+    remove.$on('remove', (name) => {
+      console.log('tabset收$on 到的名字为：', name)
+      this.$removeTab(name)
+    })
+  },
+  data() {
+    return {
+      // 数据格式：{comp, header，disabled}
+      // - comp: 当前页签对应的tab组件
+      renderData: []
+    }
+  },
+  methods: {
+    handleTabListClick(index, el) {
+      // 没有打开过, 则添加显示
+      this.$dispatch('tab-changed')
+      if (!this.$parent.show.includes(el.header)) {
+        this.$parent.show.push(el.header)
+      }
+      if (el.comp._scope && el.comp._scope.tab) {
+        this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
+      }
+      if (!el.disabled) this.active = index
+    },
+    // deletetab函数为自己添加
+    deletetTab(el) {
+      this.$removeTab(el.comp._scope.tab.comp.name)
+      remove.$emit('delete', el.comp._scope.tab.comp.name)
+    },
+    // 根据删除也下标，修改所有页签的下标
+    modifyAllIndex(index) {
+      let cur = this.active
+      this.$nextTick(() => {
+        // 关闭页签以后的多有页签的的下标向前挪动一位,之前的页签不动
+        for (var i = index; i < this.renderData.length; i++) {
+          this.renderData[i].comp.index -= 1
+        }
+        // 修改激活页
+        // 获取当前激活页签下标，关闭在当前激活页之后（包含当前激活页），当前激活页下标不变
+        // 当关闭当前激活页之前（激活页向前移动一位）
+        if (this.active > index || this.active === this.renderData.length) {
+          this.active = cur - 1
+        } else if (cur === 0) {
+          this.active = 0
+        } else {
+          this.active = cur
+        }
+        if (this.active === -1) {
+          this.$dispatch('tab-changed', null)
+        } else {
+          this.$dispatch('tab-changed', this.renderData[this.active].comp._scope.tab.comp.name)
+        }
+      })
+    }
+  },
+  events: {
+    'delete'(index) {
+      this.modifyAllIndex(index)
+    }
+  }
+}
+</script>
+
+<style scoped>
+ul > li > a {
+  position: relative;
+}
+
+ul > li > a > span {
+  display: none;
+}
+
+.span-active {
+  width: max-content;
+  border-bottom: 3px solid #5ac0d9;
+  height: 100%;
+  display: inline-block;
+  font-size: 1.5rem;
+  color: #666;
+  font-weight: 550;
+  padding: 0px 10px;
+  padding-top: 3px;
+  vertical-align: bottom;
+}
+
+.span-disable {
+  width: max-content;
+  height: 100%;
+  display: inline-block;
+  font-size: 1.5rem;
+  color: #666;
+  font-weight: 550;
+  padding: 0px 10px;
+  padding-top: 3px;
+  vertical-align: bottom;
+}
+
+/*ul > li > a:hover > span {*/
+/*display: initial;*/
+/*position: absolute;*/
+/*right: 0;*/
+/*top: 35%;*/
+/*border: 1px solid #EAEAEA;*/
+/*}*/
+/*ul > li > a:hover > span:hover {*/
+/*border: 1px solid #EAEAEA;*/
+/*color: #5cb95c;*/
+/*}*/
+ul > li > button {
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  color: #999;
+  border: 1px solid #5cb95c;
+}
+
+.btn-succ {
+  background-color: #6aa6e2;
+  border-radius: 4px;
+  color: #fff;
+}
+
+.foot_tabset1 > .nav {
+  /*overflow-x: scroll;*/
+  white-space: nowrap;
+}
+</style>

package/src/components/Tabs.vue

@@ -0,0 +1,67 @@
+<template>
+  <div role="tabpanel" class="tab-pane"
+       v-bind:class="{hide:!show}"
+       v-show="show"
+       :transition="transition"
+  >
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+  import coerceBoolean from 'vue-client/src/vue-strap/src/utils/coerceBoolean.js'
+
+  export default {
+    props: {
+      header: {
+        type: String
+      },
+      disabled: {
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      }
+    },
+    data () {
+      return {
+        index: 0,
+        show: false
+      }
+    },
+    watch: {
+      'header' (val) {
+        // header变化时，通知tabset
+        let data = this.$parent.renderData.find((v) => v.comp === this)
+        data.header = val
+      }
+    },
+    computed: {
+      show () {
+        return (this.$parent.active === this.index)
+      },
+      transition () {
+        return this.$parent.effect
+      }
+    },
+    created () {
+      this.$parent.renderData.push({
+        comp: this,
+        header: this.header,
+        disabled: this.disabled
+      })
+    },
+    ready () {
+      // 找到当前tab的索引
+      this.index = this.$parent.$children.findIndex((v) => v.$el === this.$el)
+    },
+    beforeDestroy () {
+      this.$parent.renderData.splice(this.index, 1)
+    }
+  }
+</script>
+
+<style scoped>
+  .tab-content > .tab-pane {
+    display: block;
+  }
+</style>

package/src/components/equipment/EquipmentManage.vue

@@ -1,65 +1,65 @@
-<template>
-  <div class="flex">
-    <div class="auto">
-      <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
-        <div class="row">
-          <div class="col-sm-2 form-group">
-            <label class="font_normal_body">终端类型</label>
-            <v-select id="f_charge_type"
-                      v-model="model.f_equipment_type"
-                      placeholder='终端类型'
-                      :value.sync="model.f_equipment_type"
-                      :options='equipmentType'
-                      close-on-select clear-button>
-            </v-select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'PC'">
-      <pc-manage></pc-manage>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'POS'">
-      <pos-manage></pos-manage>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'PHONE'">
-      <phone-manage></phone-manage>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    title: '终端控制',
-    data () {
-      return {
-        filialeNameStr: this.$login.f.f_fengongsi,
-        filialeCodeStr: this.$login.f.orgid,
-        userid:this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        equipmentType: this.$appdata.getParam('终端类型'),
-        model: {
-            f_equipment_type: []
-        }
-      }
-    },
-    ready () {
-      console.log('看看终端类型',  this.equipmentType)
-      this.model.f_equipment_type = [this.equipmentType[0].value]
-    },
-    methods: {
-      del (row) {
-          console.log('要删除了', row)
-      },
-
-      getRes (obj) {
-        this.filialeNameStr = obj.res
-        this.filialeCodeStr = obj.resids
-      },
-    },
-    computed: {
-
-    }
-  }
-</script>
+<template>
+  <div class="flex">
+    <div class="auto">
+      <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
+        <div class="row">
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
+            <v-select id="f_charge_type"
+                      v-model="model.f_equipment_type"
+                      placeholder='终端类型'
+                      :value.sync="model.f_equipment_type"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PC'">
+      <pc-manage></pc-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'POS'">
+      <pos-manage></pos-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PHONE'">
+      <phone-manage></phone-manage>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    title: '终端控制',
+    data () {
+      return {
+        filialeNameStr: this.$login.f.f_fengongsi,
+        filialeCodeStr: this.$login.f.orgid,
+        userid:this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        equipmentType: this.$appdata.getParam('终端类型'),
+        model: {
+            f_equipment_type: []
+        }
+      }
+    },
+    ready () {
+      console.log('看看终端类型',  this.equipmentType)
+      this.model.f_equipment_type = [this.equipmentType[0].value]
+    },
+    methods: {
+      del (row) {
+          console.log('要删除了', row)
+      },
+
+      getRes (obj) {
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
+      },
+    },
+    computed: {
+
+    }
+  }
+</script>