Skip to content

H
haoban-3
Commit 8645e44a by 无尘
Options

fix: 修改bug

parent 8b4861fb
Showing with 79 additions and 9 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.4413ccb8767a6b4c323a1680a7a11e1a.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.035358f7f819722d2e5a.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.47d0a76a602113533393.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.bb4dff633cc38c84b744c2640db96c63.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.fe9ad141dcb0c49d28e0.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.47d0a76a602113533393.js></script></body></html>
\ No newline at end of file
dist/static/css/app.4413ccb8767a6b4c323a1680a7a11e1a.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.bb4dff633cc38c84b744c2640db96c63.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/public.css
......@@ -1133,6 +1133,27 @@ button.el-button--danger.is-plain {
border-bottom: 2px solid #e4e7ed;
}
.sortable-chosen.sortable-ghost .li-cell-copy::before {
content: " ";
position: absolute;
left: 20px;
bottom: -3px;
width: 6px;
height: 6px;
border-radius: 50%;
border: 1px solid #e4e7ed;
background: #fff;
z-index:1;
}
.sortable-chosen.sortable-ghost .li-cell-copy::after {
content: " ";
position: absolute;
left: 20px;
width: 100%;
height: 26px;
border-bottom: 2px solid #e4e7ed;
}
.sortable-chosen.sortable-ghost:parent {
border: 2px solid #e4e7ed;
}
dist/static/js/5.682f76044b41f12e1a61.js → dist/static/js/5.fb421a8c6f9a5af13da9.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.035358f7f819722d2e5a.js → dist/static/js/manifest.fe9ad141dcb0c49d28e0.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=d(d.s=r[i]);return b};var a={},f={51:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"1d78c2e96a4878f71b40",1:"06c4e42e62c1f75191f0",2:"724ba299b800aa0b3c25",3:"6526c3e678f49c50eb0b",4:"f1674bae959e941960b1",5:"682f76044b41f12e1a61",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"bda5789112a4386ac684",9:"5e6b743726e7d8438871",10:"7e09f595ade6af4acd24",11:"e17569badebc0d03b94f",12:"106cadf87efaf0fd28ce",13:"0f01707cee8bf5918701",14:"a034fd161b8c1b267354",15:"e2410478e3a7240b7adc",16:"982b6d4cc452775c1826",17:"91e2fe42aacd5fd73d9e",18:"a4c6826038e63e26db84",19:"56fbc2476082c554cb76",20:"7f3a92bcf5a66089600a",21:"857b8bbdd27214a8bc25",22:"9ad786a93be8761b954d",23:"44f8721a4e37849af31a",24:"40fac2805362183128cd",25:"478df3da4cb7c7af6a47",26:"d2a69d136f7452d5784b",27:"217dc34d1a705f1d98da",28:"da436cef50554854b5f4",29:"7b201172482e527d64c7",30:"d271c65352b153fe44d7",31:"f10d5ff5623699d9f45c",32:"fdc8fb944fc839a5f0c9",33:"64721b581ad65fc06a5c",34:"1f69600f84ea88db4621",35:"51630c67df4e611a358a",36:"030f99cc1cb0eb54f38a",37:"722ec3ee74746d1f0771",38:"5c593f6c0886723307a9",39:"13770623cd0155327e56",40:"f6ef482085cccdca5f67",41:"d2e13a048e460fe7db63",42:"bbfc8147188dfd7ffd12",43:"5d2d83cd76295aac795e",44:"894c9353222f503048dd",45:"e943700ad9539430cc2a",46:"3ebb7632373e949c4784",47:"db2230e175441528fa76",48:"bda5c55f72a191ae99c2"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=d(d.s=r[i]);return b};var a={},f={51:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"1d78c2e96a4878f71b40",1:"06c4e42e62c1f75191f0",2:"724ba299b800aa0b3c25",3:"6526c3e678f49c50eb0b",4:"f1674bae959e941960b1",5:"fb421a8c6f9a5af13da9",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"bda5789112a4386ac684",9:"5e6b743726e7d8438871",10:"7e09f595ade6af4acd24",11:"e17569badebc0d03b94f",12:"106cadf87efaf0fd28ce",13:"0f01707cee8bf5918701",14:"a034fd161b8c1b267354",15:"e2410478e3a7240b7adc",16:"982b6d4cc452775c1826",17:"91e2fe42aacd5fd73d9e",18:"a4c6826038e63e26db84",19:"56fbc2476082c554cb76",20:"7f3a92bcf5a66089600a",21:"857b8bbdd27214a8bc25",22:"9ad786a93be8761b954d",23:"44f8721a4e37849af31a",24:"40fac2805362183128cd",25:"478df3da4cb7c7af6a47",26:"d2a69d136f7452d5784b",27:"217dc34d1a705f1d98da",28:"da436cef50554854b5f4",29:"7b201172482e527d64c7",30:"d271c65352b153fe44d7",31:"f10d5ff5623699d9f45c",32:"fdc8fb944fc839a5f0c9",33:"64721b581ad65fc06a5c",34:"1f69600f84ea88db4621",35:"51630c67df4e611a358a",36:"030f99cc1cb0eb54f38a",37:"722ec3ee74746d1f0771",38:"5c593f6c0886723307a9",39:"13770623cd0155327e56",40:"f6ef482085cccdca5f67",41:"d2e13a048e460fe7db63",42:"bbfc8147188dfd7ffd12",43:"5d2d83cd76295aac795e",44:"894c9353222f503048dd",45:"e943700ad9539430cc2a",46:"3ebb7632373e949c4784",47:"db2230e175441528fa76",48:"bda5c55f72a191ae99c2"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/company/org-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors: 无尘
* @LastEditTime: 2020-03-11 14:40:25
* @LastEditTime: 2020-03-11 15:02:37
-->
<!--
<org-tree v-if="item.children.length" :itemData="item.children" ></org-tree>
......@@ -12,10 +12,10 @@
import orgTree from './org-tree.vue';
-->
<template>
<ul class="m-l-10">
<ul class="m-l-10 gic-tree-body">
<draggable :list="itemData" class="org-component" :options="leftOption" :move="onMove" @start="isDragging = true" @end="itemMoveEnd">
<li v-for="(item, index) in itemData" :key="index + 'gic'">
<div class="li-cell cursor-pointer" @click="toggleExpand(item)">
<div class="li-cell li-cell-copy cursor-pointer" @click="toggleExpand(item)">
<span :class="['font-12 color-606266', item.isStore == 1 || !item.children.length ? 'color-fff' : '', item.expand ? 'el-icon-caret-bottom' : 'el-icon-caret-right']"></span><span :class="['font-14 p-l-10 p-r-10 iconfont', item.isStore == 1 ? 'icondianpu-kuai' : 'iconqiye-tianchong', item.bindFlag == 1 ? 'color-2f54eb' : 'color-dedfe6']"></span><span class="font-14 color-606266">{{ item.label }}</span>
</div>
<li-row v-show="!!item.children.length && item.expand" :itemObj="item" :itemData="item.children"></li-row>
......@@ -175,11 +175,35 @@ export default {
};
</script>
<style lang="less" scoped>
.gic-tree-body {
.sortable-chosen.sortable-ghost {
/* .li-cell::before {
content: ' ';
position: absolute;
left: 20px;
width: 100%;
height: 26px;
border-bottom: 2px solid #e4e7ed;
}
.li-cell::after {
content: ' ';
position: absolute;
left: 20px;
bottom: -3px;
width: 6px;
height: 6px;
border-radius: 50%;
border: 1px solid #e4e7ed;
background: #fff;
z-index: 1;
} */
}
}
.li-cell {
position: relative;
line-height: 26px;
white-space: nowrap;
overflow: hidden;
// overflow: hidden;
text-overflow: ellipsis;
.color-fff {
color: #fff;
......
src/components/company/wx-tree.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-08-14 16:51:07
* @LastEditors: 无尘
* @LastEditTime: 2020-03-11 14:35:53
* @LastEditTime: 2020-03-11 15:41:39
-->
<!--
<wx-tree v-model="itemData" ></wx-tree>
......@@ -196,6 +196,10 @@ export default {
const objKey = !!value['added'] ? 'added' : !!value['moved'] ? 'moved' : 'removed';
if (!!objKey && objKey != 'removed') {
// 如果移入的父级原来子级是空的，需要判断来设置有没有子级字段
if (that.itemObj.children.length) {
that.$set(that.itemObj, 'hasSonNode', true);
}
let sort = '';
for (let index = 0; index < that.itemObj.children.length; index++) {
that.itemObj.children[index].sort = index;
......
static/css/public.css
......@@ -1133,6 +1133,27 @@ button.el-button--danger.is-plain {
border-bottom: 2px solid #e4e7ed;
}
.sortable-chosen.sortable-ghost .li-cell-copy::before {
content: " ";
position: absolute;
left: 20px;
bottom: -3px;
width: 6px;
height: 6px;
border-radius: 50%;
border: 1px solid #e4e7ed;
background: #fff;
z-index:1;
}
.sortable-chosen.sortable-ghost .li-cell-copy::after {
content: " ";
position: absolute;
left: 20px;
width: 100%;
height: 26px;
border-bottom: 2px solid #e4e7ed;
}
.sortable-chosen.sortable-ghost:parent {
border: 2px solid #e4e7ed;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment