cnhis-design-vue 2.1.11 → 2.1.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -18
- package/es/affix/index.js +8 -8
- package/es/age/index.js +10 -10
- package/es/alert/index.js +8 -8
- package/es/anchor/index.js +8 -8
- package/es/auto-complete/index.js +8 -8
- package/es/avatar/index.js +8 -8
- package/es/back-top/index.js +8 -8
- package/es/badge/index.js +8 -8
- package/es/base/index.js +8 -8
- package/es/big-table/index.js +117 -97
- package/es/big-table/style.css +1 -1
- package/es/breadcrumb/index.js +8 -8
- package/es/button/index.js +28 -28
- package/es/calendar/index.js +8 -8
- package/es/captcha/index.js +3 -3
- package/es/card/index.js +8 -8
- package/es/carousel/index.js +8 -8
- package/es/cascader/index.js +8 -8
- package/es/checkbox/index.js +9 -9
- package/es/col/index.js +8 -8
- package/es/collapse/index.js +8 -8
- package/es/color-picker/index.js +1 -1
- package/es/comment/index.js +8 -8
- package/es/config-provider/index.js +8 -8
- package/es/date-picker/index.js +8 -8
- package/es/descriptions/index.js +8 -8
- package/es/divider/index.js +8 -8
- package/es/drag-layout/index.js +3 -3
- package/es/drawer/index.js +8 -8
- package/es/dropdown/index.js +8 -8
- package/es/editor/index.js +1 -1
- package/es/empty/index.js +8 -8
- package/es/fabric-chart/index.js +140 -87
- package/es/form/index.js +8 -8
- package/es/form-model/index.js +8 -8
- package/es/form-table/index.js +62 -62
- package/es/index/index.js +985 -770
- package/es/index/style.css +1 -1
- package/es/input/index.js +9 -9
- package/es/input-number/index.js +8 -8
- package/es/layout/index.js +8 -8
- package/es/list/index.js +8 -8
- package/es/locale-provider/index.js +8 -8
- package/es/map/index.js +9 -9
- package/es/mentions/index.js +8 -8
- package/es/menu/index.js +8 -8
- package/es/message/index.js +8 -8
- package/es/multi-chat/index.js +75 -75
- package/es/multi-chat-client/index.js +69 -69
- package/es/multi-chat-history/index.js +4 -4
- package/es/multi-chat-record/index.js +14 -14
- package/es/multi-chat-setting/index.js +22 -22
- package/es/multi-chat-sip/index.js +1 -1
- package/es/notification/index.js +8 -8
- package/es/page-header/index.js +8 -8
- package/es/pagination/index.js +8 -8
- package/es/popconfirm/index.js +8 -8
- package/es/popover/index.js +8 -8
- package/es/progress/index.js +8 -8
- package/es/radio/index.js +9 -9
- package/es/rate/index.js +8 -8
- package/es/result/index.js +8 -8
- package/es/row/index.js +8 -8
- package/es/scale-view/index.js +132 -218
- package/es/scale-view/style.css +1 -1
- package/es/select/index.js +11 -11
- package/es/select-label/index.js +11 -11
- package/es/select-person/index.js +2 -2
- package/es/skeleton/index.js +8 -8
- package/es/slider/index.js +8 -8
- package/es/space/index.js +8 -8
- package/es/spin/index.js +8 -8
- package/es/statistic/index.js +8 -8
- package/es/steps/index.js +8 -8
- package/es/switch/index.js +8 -8
- package/es/table-filter/index.js +362 -134
- package/es/table-filter/style.css +1 -1
- package/es/tabs/index.js +8 -8
- package/es/tag/index.js +9 -9
- package/es/time-picker/index.js +8 -8
- package/es/timeline/index.js +8 -8
- package/es/tooltip/index.js +8 -8
- package/es/transfer/index.js +8 -8
- package/es/tree/index.js +8 -8
- package/es/tree-select/index.js +8 -8
- package/es/upload/index.js +8 -8
- package/es/verification-code/index.js +2 -2
- package/lib/cui.common.js +1123 -897
- package/lib/cui.umd.js +1123 -897
- package/lib/cui.umd.min.js +34 -34
- package/package.json +2 -2
- package/packages/big-table/src/BigTable.vue +9 -1
- package/packages/big-table/src/utils/bigTableProps.js +2 -1
- package/packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue +42 -28
- package/packages/scale-view/formitem/r-choice.vue +45 -103
- package/packages/table-filter/src/base-search-com/BaseSearch.vue +6 -2
- package/packages/table-filter/src/components/c-tree-select/tree-select.vue +1 -1
- package/packages/table-filter/src/components/multi-select/multi-select.vue +7 -3
- package/packages/table-filter/src/components/out-quick-search/out-quick-search.vue +1 -1
- package/packages/table-filter/src/const/dataOptions.js +43 -0
- package/packages/table-filter/src/mixins/mixins.js +15 -2
- package/packages/table-filter/src/quick-search/QuickSearch.vue +64 -19
package/es/fabric-chart/index.js
CHANGED
|
@@ -299,7 +299,7 @@ var es_promise_finally = __webpack_require__("a79d");
|
|
|
299
299
|
// EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
|
|
300
300
|
var es_function_name_js_ = __webpack_require__("db0a");
|
|
301
301
|
|
|
302
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
302
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/FabricChart.vue?vue&type=template&id=4ba88400&scoped=true&
|
|
303
303
|
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-fabric-chart",style:({'width': _vm.canvasWidth})},[(_vm.rendercanvas)?_c(("FabricCanvas" + (_vm.templateData.type || '')),{ref:"canvasEle",tag:"component",attrs:{"id":_vm.id,"templateData":_vm.templateData}},[(_vm.templateData.type)?[_c('fabric-grid'),_c('fabric-top2',{attrs:{"templateData":_vm.templateData}}),_c('fabric-left2',{attrs:{"templateData":_vm.templateData}}),_c('fabric-right2',{attrs:{"templateData":_vm.templateData}}),_c('fabric-bottom2',{attrs:{"templateData":_vm.templateData}}),_c('fabric-center2',_vm._g({attrs:{"other":_vm.templateData.other,"polyline":_vm.templateData.left.leftYScalevalue},on:{"pointOperation":_vm.pointOperation}},_vm.$listeners))]:[(_vm.hasXScalevalue)?_c('fabric-text-group',_vm._g({attrs:{"templateData":_vm.templateData}},_vm.$listeners)):_vm._e(),_c('fabric-grid'),(_vm.hasTable)?_c('fabric-scale-value',{attrs:{"templateData":_vm.templateData}}):_vm._e(),(_vm.hasTopTable)?_c('fabric-lines',_vm._g({ref:"lines",attrs:{"linesObj":_vm.templateData.top}},_vm.$listeners)):_vm._e(),(_vm.hasTable)?_c('fabric-polylines',_vm._g({ref:"polylines",attrs:{"polyline":_vm.polylines,"other":_vm.templateData.left.other || {}},on:{"pointOperation":_vm.pointOperation}},_vm.$listeners)):_vm._e()]],2):_vm._e()],1)}
|
|
304
304
|
var staticRenderFns = []
|
|
305
305
|
|
|
@@ -312,7 +312,7 @@ var objectSpread2 = __webpack_require__("5530");
|
|
|
312
312
|
// EXTERNAL MODULE: ./src/core/create.js
|
|
313
313
|
var create = __webpack_require__("8aef");
|
|
314
314
|
|
|
315
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
315
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricCanvas.vue?vue&type=template&id=e6f32df0&
|
|
316
316
|
var FabricCanvasvue_type_template_id_e6f32df0_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('canvas',{attrs:{"id":_vm.id}}),_vm._t("default")],2)}
|
|
317
317
|
var FabricCanvasvue_type_template_id_e6f32df0_staticRenderFns = []
|
|
318
318
|
|
|
@@ -796,7 +796,7 @@ var component = Object(componentNormalizer["a" /* default */])(
|
|
|
796
796
|
)
|
|
797
797
|
|
|
798
798
|
/* harmony default export */ var FabricCanvas = (component.exports);
|
|
799
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
799
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart2/FabricCanvas.vue?vue&type=template&id=d9708486&
|
|
800
800
|
var FabricCanvasvue_type_template_id_d9708486_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('canvas',{attrs:{"id":_vm.id}}),_vm._t("default")],2)}
|
|
801
801
|
var FabricCanvasvue_type_template_id_d9708486_staticRenderFns = []
|
|
802
802
|
|
|
@@ -1036,7 +1036,7 @@ var FabricCanvas_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1036
1036
|
)
|
|
1037
1037
|
|
|
1038
1038
|
/* harmony default export */ var fabric_chart2_FabricCanvas = (FabricCanvas_component.exports);
|
|
1039
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
1039
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=1031ec15&
|
|
1040
1040
|
var FabricPolylinesvue_type_template_id_1031ec15_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"poly-line"},[(_vm.isRightVisible)?_c('MouseRightClick',{attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}):_vm._e(),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
|
|
1041
1041
|
var FabricPolylinesvue_type_template_id_1031ec15_staticRenderFns = []
|
|
1042
1042
|
|
|
@@ -1647,7 +1647,7 @@ var type_isObject = function isObject(obj) {
|
|
|
1647
1647
|
}
|
|
1648
1648
|
}
|
|
1649
1649
|
});
|
|
1650
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
1650
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/MouseRightClick.vue?vue&type=template&id=25d4407a&scoped=true&
|
|
1651
1651
|
var MouseRightClickvue_type_template_id_25d4407a_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-mouse-right-menu-popup c-animation-in",style:(_vm.dialogStyle)},[_c('div',{staticClass:"c-mouse-right-menu"},_vm._l((_vm.nodeList),function(item,index){return _c('div',{key:index,staticClass:"c-mouse-menu-item",on:{"click":function($event){return _vm.handleNodeClick(item)}}},[_c('span',[_vm._v(_vm._s(item.name))])])}),0)])}
|
|
1652
1652
|
var MouseRightClickvue_type_template_id_25d4407a_scoped_true_staticRenderFns = []
|
|
1653
1653
|
|
|
@@ -1755,7 +1755,7 @@ var MouseRightClick_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1755
1755
|
)
|
|
1756
1756
|
|
|
1757
1757
|
/* harmony default export */ var MouseRightClick = (MouseRightClick_component.exports);
|
|
1758
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
1758
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/DropPopup.vue?vue&type=template&id=c4db0ace&scoped=true&
|
|
1759
1759
|
var DropPopupvue_type_template_id_c4db0ace_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-drop-popup",style:(_vm.dialogStyle)},[_c('div',{staticClass:"c-drop-popup-list"},[_c('span',[_vm._v(_vm._s(_vm.val.title))]),_vm._l((_vm.val.list),function(item){return _c('span',{key:item.id},[_vm._v(" "+_vm._s(((item.name) + ": " + (item.value)))+" ")])})],2)])}
|
|
1760
1760
|
var DropPopupvue_type_template_id_c4db0ace_scoped_true_staticRenderFns = []
|
|
1761
1761
|
|
|
@@ -3351,12 +3351,12 @@ var FabricGrid_component = Object(componentNormalizer["a" /* default */])(
|
|
|
3351
3351
|
)
|
|
3352
3352
|
|
|
3353
3353
|
/* harmony default export */ var FabricGrid = (FabricGrid_component.exports);
|
|
3354
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
3355
|
-
var
|
|
3356
|
-
var
|
|
3354
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=7482a520&
|
|
3355
|
+
var FabricTextGroupvue_type_template_id_7482a520_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"text-group"},[(_vm.isRightVisible)?_c('MouseRightClick',{attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}):_vm._e(),(_vm.isDropVisible)?_c('DropPopup',{attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}}):_vm._e()],1)}
|
|
3356
|
+
var FabricTextGroupvue_type_template_id_7482a520_staticRenderFns = []
|
|
3357
3357
|
|
|
3358
3358
|
|
|
3359
|
-
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=
|
|
3359
|
+
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=7482a520&
|
|
3360
3360
|
|
|
3361
3361
|
// EXTERNAL MODULE: external "core-js/modules/es.array.sort.js"
|
|
3362
3362
|
var es_array_sort_js_ = __webpack_require__("4c07");
|
|
@@ -3800,12 +3800,11 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3800
3800
|
|
|
3801
3801
|
if (_this10.isLimit(item[0])) {
|
|
3802
3802
|
item[1].forEach( /*#__PURE__*/function () {
|
|
3803
|
-
var _ref2 = Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function
|
|
3804
|
-
var common, eventStyle,
|
|
3805
|
-
|
|
3806
|
-
return regeneratorRuntime.wrap(function _callee$(_context) {
|
|
3803
|
+
var _ref2 = Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(v, i) {
|
|
3804
|
+
var common, eventStyle, addNumber, addCanvas, option, ele, img, text;
|
|
3805
|
+
return regeneratorRuntime.wrap(function _callee3$(_context3) {
|
|
3807
3806
|
while (1) {
|
|
3808
|
-
switch (
|
|
3807
|
+
switch (_context3.prev = _context3.next) {
|
|
3809
3808
|
case 0:
|
|
3810
3809
|
if (!~limitIndex) {
|
|
3811
3810
|
y += i === 0 ? lineHeight / 2 : lineHeight;
|
|
@@ -3838,93 +3837,136 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3838
3837
|
lockMovementY: true
|
|
3839
3838
|
} : {};
|
|
3840
3839
|
|
|
3840
|
+
addNumber = /*#__PURE__*/function () {
|
|
3841
|
+
var _ref3 = Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee(point) {
|
|
3842
|
+
var _v$other;
|
|
3843
|
+
|
|
3844
|
+
var _obj$numberStyle, _v$other2, _obj$numberStyle2, circle, text, scale, group;
|
|
3845
|
+
|
|
3846
|
+
return regeneratorRuntime.wrap(function _callee$(_context) {
|
|
3847
|
+
while (1) {
|
|
3848
|
+
switch (_context.prev = _context.next) {
|
|
3849
|
+
case 0:
|
|
3850
|
+
if (!((_v$other = v.other) !== null && _v$other !== void 0 && _v$other.number)) {
|
|
3851
|
+
_context.next = 8;
|
|
3852
|
+
break;
|
|
3853
|
+
}
|
|
3854
|
+
|
|
3855
|
+
_context.next = 3;
|
|
3856
|
+
return _this10.createPoint('circle', Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, common), {}, {
|
|
3857
|
+
radius: 5,
|
|
3858
|
+
strokeWidth: 1,
|
|
3859
|
+
stroke: '#000',
|
|
3860
|
+
fill: 'transparent'
|
|
3861
|
+
}, (_obj$numberStyle = obj.numberStyle) === null || _obj$numberStyle === void 0 ? void 0 : _obj$numberStyle.circle), {}, {
|
|
3862
|
+
left: 0,
|
|
3863
|
+
top: 0
|
|
3864
|
+
}));
|
|
3865
|
+
|
|
3866
|
+
case 3:
|
|
3867
|
+
circle = _context.sent;
|
|
3868
|
+
text = new _this10.fabric.Text(String((_v$other2 = v.other) === null || _v$other2 === void 0 ? void 0 : _v$other2.number), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.textStyle), common), ((_obj$numberStyle2 = obj.numberStyle) === null || _obj$numberStyle2 === void 0 ? void 0 : _obj$numberStyle2.text) || {}), {}, {
|
|
3869
|
+
left: 0,
|
|
3870
|
+
top: 0
|
|
3871
|
+
}));
|
|
3872
|
+
scale = typeof point.scale === 'number' ? point.scale : 1;
|
|
3873
|
+
group = new _this10.fabric.Group([circle, text], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, common), {}, {
|
|
3874
|
+
originY: 'right',
|
|
3875
|
+
left: point.left - point.width * scale / 2 - defaultVaule.bottomNumberLeftSpace,
|
|
3876
|
+
selectable: false,
|
|
3877
|
+
hoverCursor: 'default'
|
|
3878
|
+
}, eventStyle));
|
|
3879
|
+
return _context.abrupt("return", group);
|
|
3880
|
+
|
|
3881
|
+
case 8:
|
|
3882
|
+
case "end":
|
|
3883
|
+
return _context.stop();
|
|
3884
|
+
}
|
|
3885
|
+
}
|
|
3886
|
+
}, _callee);
|
|
3887
|
+
}));
|
|
3888
|
+
|
|
3889
|
+
return function addNumber(_x3) {
|
|
3890
|
+
return _ref3.apply(this, arguments);
|
|
3891
|
+
};
|
|
3892
|
+
}();
|
|
3893
|
+
|
|
3894
|
+
addCanvas = /*#__PURE__*/function () {
|
|
3895
|
+
var _ref4 = Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(point) {
|
|
3896
|
+
return regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
3897
|
+
while (1) {
|
|
3898
|
+
switch (_context2.prev = _context2.next) {
|
|
3899
|
+
case 0:
|
|
3900
|
+
_context2.next = 2;
|
|
3901
|
+
return addNumber(point);
|
|
3902
|
+
|
|
3903
|
+
case 2:
|
|
3904
|
+
point.number = _context2.sent;
|
|
3905
|
+
point.hasControls = point.hasBorders = false;
|
|
3906
|
+
|
|
3907
|
+
_this10.pointEvent(point);
|
|
3908
|
+
|
|
3909
|
+
_this10.canvas.add(point);
|
|
3910
|
+
|
|
3911
|
+
point.number && _this10.canvas.add(point.number);
|
|
3912
|
+
|
|
3913
|
+
_this10.canvas.requestRenderAll();
|
|
3914
|
+
|
|
3915
|
+
case 8:
|
|
3916
|
+
case "end":
|
|
3917
|
+
return _context2.stop();
|
|
3918
|
+
}
|
|
3919
|
+
}
|
|
3920
|
+
}, _callee2);
|
|
3921
|
+
}));
|
|
3922
|
+
|
|
3923
|
+
return function addCanvas(_x4) {
|
|
3924
|
+
return _ref4.apply(this, arguments);
|
|
3925
|
+
};
|
|
3926
|
+
}();
|
|
3927
|
+
|
|
3841
3928
|
if (!(_this10.isObject(v) && !v.value)) {
|
|
3842
|
-
|
|
3929
|
+
_context3.next = 17;
|
|
3843
3930
|
break;
|
|
3844
3931
|
}
|
|
3845
3932
|
|
|
3846
3933
|
option = Object.assign({}, obj.iconStyle || {}, v || {}, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, common), eventStyle));
|
|
3847
3934
|
|
|
3848
3935
|
if (!(v !== null && v !== void 0 && v.iconClassName)) {
|
|
3849
|
-
|
|
3936
|
+
_context3.next = 11;
|
|
3850
3937
|
break;
|
|
3851
3938
|
}
|
|
3852
3939
|
|
|
3853
|
-
|
|
3940
|
+
_context3.next = 10;
|
|
3854
3941
|
return _this10.createImage(v.iconClassName, v);
|
|
3855
3942
|
|
|
3856
|
-
case
|
|
3857
|
-
ele =
|
|
3943
|
+
case 10:
|
|
3944
|
+
ele = _context3.sent;
|
|
3858
3945
|
|
|
3859
|
-
case
|
|
3860
|
-
|
|
3946
|
+
case 11:
|
|
3947
|
+
_context3.next = 13;
|
|
3861
3948
|
return _this10.createPoint(v !== null && v !== void 0 && v.url || v !== null && v !== void 0 && v.iconClassName ? 'img' : v.type, Object(objectSpread2["a" /* default */])({
|
|
3862
3949
|
ele: ele || ''
|
|
3863
3950
|
}, option));
|
|
3864
3951
|
|
|
3865
|
-
case
|
|
3866
|
-
img =
|
|
3867
|
-
|
|
3868
|
-
|
|
3869
|
-
_context.next = 19;
|
|
3870
|
-
break;
|
|
3871
|
-
}
|
|
3872
|
-
|
|
3873
|
-
_context.next = 15;
|
|
3874
|
-
return _this10.createPoint('circle', Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, common), {}, {
|
|
3875
|
-
radius: 5,
|
|
3876
|
-
strokeWidth: 1,
|
|
3877
|
-
stroke: '#000',
|
|
3878
|
-
fill: 'transparent'
|
|
3879
|
-
}, (_obj$numberStyle = obj.numberStyle) === null || _obj$numberStyle === void 0 ? void 0 : _obj$numberStyle.circle), {}, {
|
|
3880
|
-
left: 0,
|
|
3881
|
-
top: 0
|
|
3882
|
-
}));
|
|
3883
|
-
|
|
3884
|
-
case 15:
|
|
3885
|
-
circle = _context.sent;
|
|
3886
|
-
text = new _this10.fabric.Text(String(((_v$other2 = v.other) === null || _v$other2 === void 0 ? void 0 : _v$other2.number) || ''), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.textStyle), common), ((_obj$numberStyle2 = obj.numberStyle) === null || _obj$numberStyle2 === void 0 ? void 0 : _obj$numberStyle2.text) || {}), {}, {
|
|
3887
|
-
left: 0,
|
|
3888
|
-
top: 0
|
|
3889
|
-
}));
|
|
3890
|
-
group = new _this10.fabric.Group([circle, text], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, common), {}, {
|
|
3891
|
-
originY: 'right',
|
|
3892
|
-
left: img.left - img.width * img.scale / 2 - defaultVaule.bottomNumberLeftSpace,
|
|
3893
|
-
selectable: false,
|
|
3894
|
-
evented: false
|
|
3895
|
-
}));
|
|
3896
|
-
img.number = group;
|
|
3897
|
-
|
|
3898
|
-
case 19:
|
|
3899
|
-
img.hasControls = img.hasBorders = false;
|
|
3900
|
-
|
|
3901
|
-
_this10.pointEvent(img);
|
|
3902
|
-
|
|
3903
|
-
_this10.canvas.add(img);
|
|
3904
|
-
|
|
3905
|
-
img.number && _this10.canvas.add(img.number);
|
|
3906
|
-
|
|
3907
|
-
_this10.canvas.requestRenderAll();
|
|
3908
|
-
|
|
3909
|
-
_context.next = 31;
|
|
3952
|
+
case 13:
|
|
3953
|
+
img = _context3.sent;
|
|
3954
|
+
addCanvas(img);
|
|
3955
|
+
_context3.next = 18;
|
|
3910
3956
|
break;
|
|
3911
3957
|
|
|
3912
|
-
case
|
|
3913
|
-
|
|
3914
|
-
|
|
3915
|
-
|
|
3916
|
-
|
|
3917
|
-
|
|
3918
|
-
_this10.canvas.add(_text);
|
|
3919
|
-
|
|
3920
|
-
_this10.canvas.renderAll();
|
|
3958
|
+
case 17:
|
|
3959
|
+
if (v.value) {
|
|
3960
|
+
text = new _this10.fabric.Text(String(v.value), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.textStyle), obj.style), common), eventStyle));
|
|
3961
|
+
addCanvas(text);
|
|
3962
|
+
}
|
|
3921
3963
|
|
|
3922
|
-
case
|
|
3964
|
+
case 18:
|
|
3923
3965
|
case "end":
|
|
3924
|
-
return
|
|
3966
|
+
return _context3.stop();
|
|
3925
3967
|
}
|
|
3926
3968
|
}
|
|
3927
|
-
},
|
|
3969
|
+
}, _callee3);
|
|
3928
3970
|
}));
|
|
3929
3971
|
|
|
3930
3972
|
return function (_x, _x2) {
|
|
@@ -3938,8 +3980,9 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3938
3980
|
updateNumber: function updateNumber(point) {
|
|
3939
3981
|
if (point.number) {
|
|
3940
3982
|
point.number.setCoords();
|
|
3983
|
+
var scale = typeof point.scale === 'number' ? point.scale : 1;
|
|
3941
3984
|
point.number.set({
|
|
3942
|
-
left: point.left - point.width *
|
|
3985
|
+
left: point.left - point.width * scale / 2 - defaultVaule.bottomNumberLeftSpace,
|
|
3943
3986
|
top: point.top
|
|
3944
3987
|
});
|
|
3945
3988
|
}
|
|
@@ -3952,7 +3995,17 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3952
3995
|
});
|
|
3953
3996
|
point.on('mouseout', function () {
|
|
3954
3997
|
_this11.isDropVisible = false;
|
|
3955
|
-
});
|
|
3998
|
+
});
|
|
3999
|
+
|
|
4000
|
+
if (point.number) {
|
|
4001
|
+
point.number.on('mouseover', function () {
|
|
4002
|
+
_this11.showDrapPopup(point, true);
|
|
4003
|
+
});
|
|
4004
|
+
point.number.on('mouseout', function () {
|
|
4005
|
+
_this11.isDropVisible = false;
|
|
4006
|
+
});
|
|
4007
|
+
} // 移动中 实时更新相关联的线的坐标
|
|
4008
|
+
|
|
3956
4009
|
|
|
3957
4010
|
if (this.eventStyle.evented) {
|
|
3958
4011
|
point.on('moving', function () {
|
|
@@ -4127,8 +4180,8 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
4127
4180
|
|
|
4128
4181
|
var FabricTextGroup_component = Object(componentNormalizer["a" /* default */])(
|
|
4129
4182
|
fabric_chart_FabricTextGroupvue_type_script_lang_js_,
|
|
4130
|
-
|
|
4131
|
-
|
|
4183
|
+
FabricTextGroupvue_type_template_id_7482a520_render,
|
|
4184
|
+
FabricTextGroupvue_type_template_id_7482a520_staticRenderFns,
|
|
4132
4185
|
false,
|
|
4133
4186
|
null,
|
|
4134
4187
|
null,
|
|
@@ -4137,14 +4190,14 @@ var FabricTextGroup_component = Object(componentNormalizer["a" /* default */])(
|
|
|
4137
4190
|
)
|
|
4138
4191
|
|
|
4139
4192
|
/* harmony default export */ var FabricTextGroup = (FabricTextGroup_component.exports);
|
|
4140
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
4193
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=5ae188c2&
|
|
4141
4194
|
var FabricScaleValuevue_type_template_id_5ae188c2_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.templateData.top.xScalevalue.popupTop)?_c('TimeScaleValue',{attrs:{"times":_vm.timeList,"templateData":_vm.templateData}}):_vm._e()}
|
|
4142
4195
|
var FabricScaleValuevue_type_template_id_5ae188c2_staticRenderFns = []
|
|
4143
4196
|
|
|
4144
4197
|
|
|
4145
4198
|
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=5ae188c2&
|
|
4146
4199
|
|
|
4147
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
4200
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=template&id=64942e54&scoped=true&
|
|
4148
4201
|
var TimeScaleValuevue_type_template_id_64942e54_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"}],staticClass:"c-time-scalevalue",style:({ '--left': _vm.popupStyle.left, '--top': _vm.popupStyle.top, '--height': _vm.popupStyle.height, '--width': _vm.popupStyle.width })},_vm._l((_vm.times),function(item,index){return _c('span',{directives:[{name:"show",rawName:"v-show",value:(index % 2 == 0),expression:"index % 2 == 0"}],key:item.left,staticClass:"c-time-scalevalue-list",style:({ left: ((item.left - item.width / 2) + "px"), '--font-size': _vm.popupStyle.fontSize })},[_vm._v(" "+_vm._s(item.time)+" ")])}),0)}
|
|
4149
4202
|
var TimeScaleValuevue_type_template_id_64942e54_scoped_true_staticRenderFns = []
|
|
4150
4203
|
|
|
@@ -4472,7 +4525,7 @@ var FabricScaleValue_component = Object(componentNormalizer["a" /* default */])(
|
|
|
4472
4525
|
)
|
|
4473
4526
|
|
|
4474
4527
|
/* harmony default export */ var FabricScaleValue = (FabricScaleValue_component.exports);
|
|
4475
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
4528
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=229d2d58&
|
|
4476
4529
|
var FabricLinesvue_type_template_id_229d2d58_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"line"},[(_vm.isRightVisible)?_c('MouseRightClick',{attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}):_vm._e(),(_vm.isDropVisible)?_c('DropPopup',{attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}}):_vm._e()],1)}
|
|
4477
4530
|
var FabricLinesvue_type_template_id_229d2d58_staticRenderFns = []
|
|
4478
4531
|
|
|
@@ -5847,7 +5900,7 @@ var FabricBottom_component = Object(componentNormalizer["a" /* default */])(
|
|
|
5847
5900
|
)
|
|
5848
5901
|
|
|
5849
5902
|
/* harmony default export */ var FabricBottom = (FabricBottom_component.exports);
|
|
5850
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
5903
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6eaa06f6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart2/FabricCenter.vue?vue&type=template&id=4d90e644&
|
|
5851
5904
|
var FabricCentervue_type_template_id_4d90e644_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"poly-line"},[(_vm.isRightVisible)?_c('MouseRightClick',{attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}):_vm._e(),(_vm.isDropVisible)?_c('DropPopup',{attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}}):_vm._e()],1)}
|
|
5852
5905
|
var FabricCentervue_type_template_id_4d90e644_staticRenderFns = []
|
|
5853
5906
|
|
package/es/form/index.js
CHANGED
|
@@ -726,14 +726,14 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
726
726
|
/* harmony import */ var ant_design_vue_es_base_style__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(ant_design_vue_es_base_style__WEBPACK_IMPORTED_MODULE_0__);
|
|
727
727
|
/* harmony import */ var ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("be79");
|
|
728
728
|
/* harmony import */ var ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1__);
|
|
729
|
-
/* harmony import */ var
|
|
730
|
-
/* harmony import */ var
|
|
731
|
-
/* harmony import */ var
|
|
732
|
-
/* harmony import */ var
|
|
733
|
-
/* harmony import */ var
|
|
734
|
-
/* harmony import */ var
|
|
735
|
-
/* harmony import */ var
|
|
736
|
-
/* harmony import */ var
|
|
729
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("e260");
|
|
730
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__);
|
|
731
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("e6cf");
|
|
732
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__);
|
|
733
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("cca6");
|
|
734
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__);
|
|
735
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("a79d");
|
|
736
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__);
|
|
737
737
|
|
|
738
738
|
|
|
739
739
|
|
package/es/form-model/index.js
CHANGED
|
@@ -799,14 +799,14 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
799
799
|
/* harmony import */ var ant_design_vue_es_base_style__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(ant_design_vue_es_base_style__WEBPACK_IMPORTED_MODULE_0__);
|
|
800
800
|
/* harmony import */ var ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("be79");
|
|
801
801
|
/* harmony import */ var ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1__);
|
|
802
|
-
/* harmony import */ var
|
|
803
|
-
/* harmony import */ var
|
|
804
|
-
/* harmony import */ var
|
|
805
|
-
/* harmony import */ var
|
|
806
|
-
/* harmony import */ var
|
|
807
|
-
/* harmony import */ var
|
|
808
|
-
/* harmony import */ var
|
|
809
|
-
/* harmony import */ var
|
|
802
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("e260");
|
|
803
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__);
|
|
804
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("e6cf");
|
|
805
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__);
|
|
806
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("cca6");
|
|
807
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__);
|
|
808
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("a79d");
|
|
809
|
+
/* harmony import */ var F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_cnhis_design_vue_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__);
|
|
810
810
|
|
|
811
811
|
|
|
812
812
|
|