From 83641a9a533d68ef2cd71bff1e3d4ed2bac2cc08 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Wed, 3 Jul 2024 22:46:04 +0800 Subject: [PATCH] v6.2.0 --- README.md | 7 +- app/admin/controller/Appconfig.php | 8 +- app/admin/controller/Common.php | 6 +- app/admin/controller/Error.php | 3 +- app/admin/controller/Navigation.php | 3 + app/admin/form/Useraddress.php | 9 + app/admin/lang/cht.php | 9 + app/admin/lang/en.php | 9 + app/admin/lang/spa.php | 9 + app/admin/lang/zh.php | 37 +- app/admin/view/default/admin/detail.html | 2 +- app/admin/view/default/admin/index.html | 4 +- app/admin/view/default/admin/logininfo.html | 73 +- .../view/default/admin/module/operate.html | 2 +- app/admin/view/default/admin/saveinfo.html | 2 +- .../view/default/appcenternav/detail.html | 2 +- .../view/default/appcenternav/index.html | 4 +- .../default/appcenternav/module/operate.html | 2 +- app/admin/view/default/appconfig/app.html | 101 +- app/admin/view/default/appconfig/index.html | 5 - app/admin/view/default/apphomenav/detail.html | 2 +- app/admin/view/default/apphomenav/index.html | 4 +- .../default/apphomenav/module/operate.html | 2 +- app/admin/view/default/appmini/index.html | 4 +- .../view/default/appmini/module/operate.html | 2 +- app/admin/view/default/appmini/package.html | 2 +- app/admin/view/default/article/detail.html | 2 +- app/admin/view/default/article/index.html | 4 +- .../view/default/article/module/operate.html | 2 +- app/admin/view/default/article/saveinfo.html | 6 +- .../view/default/articlecategory/index.html | 6 +- app/admin/view/default/brand/detail.html | 2 +- app/admin/view/default/brand/index.html | 4 +- .../view/default/brand/module/operate.html | 2 +- .../view/default/brandcategory/index.html | 8 +- app/admin/view/default/config/index.html | 2 +- app/admin/view/default/customview/detail.html | 2 +- app/admin/view/default/customview/index.html | 4 +- .../default/customview/module/operate.html | 2 +- .../default/customview/popup_saveinfo.html | 4 +- app/admin/view/default/design/index.html | 16 +- .../view/default/design/module/operate.html | 2 +- .../view/default/design/popup_saveinfo.html | 95 +- app/admin/view/default/design/saveinfo.html | 60 +- app/admin/view/default/emaillog/detail.html | 2 +- app/admin/view/default/emaillog/index.html | 6 +- .../view/default/emaillog/module/operate.html | 2 +- app/admin/view/default/express/index.html | 6 +- app/admin/view/default/goods/detail.html | 2 +- app/admin/view/default/goods/index.html | 4 +- .../view/default/goods/module/operate.html | 2 +- app/admin/view/default/goods/saveinfo.html | 31 +- app/admin/view/default/goods/spec.html | 6 +- .../view/default/goods/spec_extends.html | 2 +- .../view/default/goodsbrowse/detail.html | 2 +- app/admin/view/default/goodsbrowse/index.html | 2 +- .../default/goodsbrowse/module/operate.html | 2 +- app/admin/view/default/goodscart/detail.html | 2 +- app/admin/view/default/goodscart/index.html | 2 +- .../default/goodscart/module/operate.html | 2 +- .../view/default/goodscategory/index.html | 18 +- .../view/default/goodscomments/detail.html | 2 +- .../view/default/goodscomments/index.html | 4 +- .../default/goodscomments/module/operate.html | 2 +- app/admin/view/default/goodsfavor/detail.html | 2 +- app/admin/view/default/goodsfavor/index.html | 2 +- .../default/goodsfavor/module/operate.html | 2 +- .../default/goodsparamstemplate/detail.html | 2 +- .../default/goodsparamstemplate/index.html | 4 +- .../goodsparamstemplate/module/operate.html | 2 +- .../default/goodsparamstemplate/saveinfo.html | 8 +- .../default/goodsspectemplate/detail.html | 2 +- .../view/default/goodsspectemplate/index.html | 4 +- .../goodsspectemplate/module/operate.html | 2 +- .../default/goodsspectemplate/saveinfo.html | 6 +- app/admin/view/default/index/init.html | 20 +- app/admin/view/default/index/stats_where.html | 2 +- .../view/default/integrallog/detail.html | 2 +- app/admin/view/default/integrallog/index.html | 2 +- app/admin/view/default/lib/gender.html | 2 +- app/admin/view/default/lib/is_default.html | 2 +- .../view/default/lib/is_default_row.html | 6 - app/admin/view/default/lib/is_enable.html | 2 +- app/admin/view/default/lib/is_enable_row.html | 6 - app/admin/view/default/lib/is_footer.html | 2 +- .../view/default/lib/is_full_screen.html | 2 +- app/admin/view/default/lib/is_header.html | 2 +- .../view/default/lib/is_new_window_open.html | 2 +- .../default/lib/is_new_window_open_row.html | 6 - app/admin/view/default/lib/is_show.html | 2 +- app/admin/view/default/lib/is_show_row.html | 6 - app/admin/view/default/lib/module/user.html | 2 +- .../view/default/lib/region_linkage.html | 6 +- .../view/default/lib/region_linkage_row.html | 53 - app/admin/view/default/lib/seo.html | 13 +- app/admin/view/default/lib/seo_data.html | 1 - app/admin/view/default/lib/seo_row.html | 13 - app/admin/view/default/lib/sort.html | 7 +- app/admin/view/default/lib/sort_row.html | 9 - app/admin/view/default/lib/user_status.html | 2 +- app/admin/view/default/link/detail.html | 2 +- app/admin/view/default/link/index.html | 12 +- .../view/default/link/module/operate.html | 2 +- app/admin/view/default/message/detail.html | 2 +- app/admin/view/default/message/index.html | 2 +- .../view/default/message/module/operate.html | 2 +- app/admin/view/default/navigation/index.html | 105 +- .../default/navigation/module/operate.html | 2 +- .../view/default/order/deliveryinfo.html | 12 +- app/admin/view/default/order/detail.html | 2 +- app/admin/view/default/order/index.html | 6 +- .../view/default/order/module/address.html | 2 +- .../view/default/order/module/operate.html | 2 +- .../view/default/orderaftersale/detail.html | 2 +- .../view/default/orderaftersale/index.html | 6 +- .../orderaftersale/module/operate.html | 2 +- app/admin/view/default/paylog/detail.html | 2 +- app/admin/view/default/paylog/index.html | 4 +- app/admin/view/default/payment/index.html | 6 +- .../view/default/payment/module/operate.html | 2 +- .../view/default/payrequestlog/detail.html | 2 +- .../view/default/payrequestlog/index.html | 2 +- .../payrequestlog/module/business_handle.html | 2 +- .../payrequestlog/module/request_params.html | 2 +- .../payrequestlog/module/response_data.html | 2 +- .../view/default/pluginsadmin/firststep.html | 5 +- .../view/default/pluginsadmin/index.html | 40 +- .../view/default/pluginsadmin/saveinfo.html | 3 +- .../default/pluginsadmin/storeuploadinfo.html | 4 +- .../view/default/pluginsadmin/upload.html | 2 +- .../view/default/pluginscategory/index.html | 6 +- app/admin/view/default/power/index.html | 8 +- .../default/public/custom_to_value_tips.html | 21 + app/admin/view/default/public/footer.html | 10 +- .../public/goodsparamstemplate/table.html | 2 +- app/admin/view/default/public/header.html | 26 +- app/admin/view/default/public/nav.html | 14 +- .../view/default/public/nav_switch_btn.html | 4 +- .../view/default/public/nav_switch_tabs.html | 4 +- .../default/public/plugins_admin_nav.html | 4 +- .../default/public/plugins_admin_nav_btn.html | 4 +- app/admin/view/default/quicknav/detail.html | 2 +- app/admin/view/default/quicknav/index.html | 4 +- .../view/default/quicknav/module/operate.html | 2 +- app/admin/view/default/refundlog/detail.html | 2 +- app/admin/view/default/refundlog/index.html | 2 +- app/admin/view/default/region/index.html | 8 +- app/admin/view/default/role/detail.html | 2 +- app/admin/view/default/role/index.html | 4 +- .../view/default/role/module/operate.html | 2 +- app/admin/view/default/role/saveinfo.html | 8 +- .../view/default/screeningprice/index.html | 6 +- .../view/default/site/siteset/extends.html | 62 +- .../view/default/site/siteset/goods.html | 22 + .../view/default/site/siteset/index.html | 2 +- .../view/default/site/siteset/order.html | 2 +- .../view/default/site/siteset/search.html | 16 + .../view/default/site/sitetype/index.html | 14 +- app/admin/view/default/slide/detail.html | 2 +- app/admin/view/default/slide/index.html | 4 +- .../view/default/slide/module/operate.html | 2 +- app/admin/view/default/slide/saveinfo.html | 2 +- app/admin/view/default/smslog/detail.html | 2 +- app/admin/view/default/smslog/index.html | 6 +- .../view/default/smslog/module/operate.html | 2 +- app/admin/view/default/themeadmin/index.html | 4 +- app/admin/view/default/themedata/detail.html | 2 +- app/admin/view/default/themedata/index.html | 8 +- .../default/themedata/module/operate.html | 2 +- .../saveinfo/public/article_search_popup.html | 2 +- .../saveinfo/public/goods_search_popup.html | 2 +- .../saveinfo/public/url_choice_popup.html | 4 +- app/admin/view/default/user/detail.html | 2 +- app/admin/view/default/user/index.html | 4 +- .../view/default/user/module/operate.html | 2 +- .../view/default/useraddress/detail.html | 2 +- app/admin/view/default/useraddress/index.html | 4 +- .../default/useraddress/module/operate.html | 4 +- .../default/useraddress/module/position.html | 2 +- .../view/default/useraddress/saveinfo.html | 14 +- app/admin/view/default/warehouse/detail.html | 2 +- app/admin/view/default/warehouse/index.html | 4 +- .../default/warehouse/module/operate.html | 2 +- .../default/warehouse/module/position.html | 2 +- .../view/default/warehousegoods/detail.html | 2 +- .../view/default/warehousegoods/index.html | 6 +- .../default/warehousegoods/inventoryinfo.html | 2 +- .../warehousegoods/module/operate.html | 2 +- app/api/controller/Common.php | 4 +- app/api/controller/Goods.php | 3 - app/api/controller/Search.php | 28 +- app/api/controller/Usergoodscomments.php | 4 +- app/common.php | 203 +- app/index/controller/Common.php | 4 +- app/index/controller/Goods.php | 8 +- app/index/controller/Search.php | 13 + app/index/view/.gitignore | 4 - app/index/view/default/buy/index.html | 26 +- app/index/view/default/config.json | 2 +- app/index/view/default/dev/index.html | 4 +- app/index/view/default/goods/cartinfo.html | 2 +- .../module/middle_base/right/panel_base.html | 5 +- .../middle_base/right/panel_spec_choice.html | 14 +- app/index/view/default/index/index.html | 14 +- app/index/view/default/lib/gender.html | 4 +- app/index/view/default/lib/is_default.html | 2 +- .../view/default/lib/is_default_row.html | 6 - app/index/view/default/lib/is_enable.html | 2 +- app/index/view/default/lib/is_enable_row.html | 6 - app/index/view/default/lib/is_footer.html | 2 +- app/index/view/default/lib/is_header.html | 2 +- .../view/default/lib/is_new_window_open.html | 2 +- app/index/view/default/lib/is_show.html | 2 +- app/index/view/default/lib/module/user.html | 2 +- .../view/default/lib/region_linkage.html | 6 +- .../view/default/lib/region_linkage_row.html | 53 - app/index/view/default/lib/seo.html | 12 +- app/index/view/default/lib/seo_data.html | 29 +- app/index/view/default/lib/seo_row.html | 12 - app/index/view/default/lib/sort.html | 4 +- app/index/view/default/lib/sort_row.html | 6 - app/index/view/default/message/detail.html | 2 +- app/index/view/default/message/index.html | 2 +- .../view/default/module/goods/grid/base.html | 10 +- .../view/default/module/goods/list/base.html | 6 +- .../view/default/module/goods/list/mini.html | 6 +- .../default/module/goods/slider/base.html | 6 +- .../default/module/goods/slider/binding.html | 6 +- .../default/module/goods/slider/piece.html | 6 +- app/index/view/default/order/index.html | 4 +- .../view/default/order/module/operate.html | 2 +- .../view/default/order/payment_popup.html | 2 +- .../view/default/orderaftersale/create.html | 5 +- .../view/default/orderaftersale/delivery.html | 2 +- .../view/default/orderaftersale/index.html | 2 +- app/index/view/default/personal/saveinfo.html | 64 +- app/index/view/default/public/admin_nav.html | 9 +- .../view/default/public/breadcrumb_data.html | 6 +- .../default/public/custom_to_value_tips.html | 21 + .../view/default/public/event_value_tips.html | 3 +- app/index/view/default/public/footer.html | 4 + .../view/default/public/goods_category.html | 4 +- app/index/view/default/public/header.html | 8 + .../view/default/public/header_top_nav.html | 4 +- .../default/public/plugins_admin_nav.html | 6 +- app/index/view/default/public/user_menu.html | 2 +- app/index/view/default/safety/emailinfo.html | 4 +- .../view/default/safety/loginpwdinfo.html | 4 +- app/index/view/default/safety/mobileinfo.html | 4 +- .../view/default/safety/newemailinfo.html | 6 +- .../view/default/safety/newmobileinfo.html | 4 +- app/index/view/default/user/index.html | 10 +- .../view/default/user/login_content.html | 6 +- app/index/view/default/useraddress/index.html | 8 +- .../view/default/useraddress/saveinfo.html | 38 +- .../view/default/usergoodsbrowse/detail.html | 2 +- .../view/default/usergoodsbrowse/index.html | 2 +- .../usergoodsbrowse/module/operate.html | 2 +- .../default/usergoodscomments/detail.html | 2 +- .../view/default/usergoodscomments/index.html | 2 +- .../usergoodscomments/module/operate.html | 2 +- .../default/usergoodscomments/saveinfo.html | 2 +- .../view/default/usergoodsfavor/detail.html | 2 +- .../view/default/usergoodsfavor/index.html | 2 +- .../usergoodsfavor/module/operate.html | 2 +- .../view/default/userintegral/detail.html | 2 +- .../view/default/userintegral/index.html | 2 +- app/install/controller/Index.php | 39 +- app/install/view/index/check.html | 72 +- app/install/view/index/create.html | 92 +- app/install/view/index/successful.html | 13 +- app/lang/cht.php | 186 +- app/lang/en.php | 185 +- app/lang/spa.php | 186 +- app/lang/zh.php | 188 +- app/layout/view/base.html | 2 +- .../public/common/goods_category_choice.html | 10 +- .../view/public/common/module_admin.html | 4 +- .../view/public/common/module_view.html | 2 +- .../modal/modal_module_pages_select.html | 163 +- .../offcanvas/offcanvas_layout_config.html | 2 +- .../popup/popup_module_goods_category.html | 21 +- .../popup/popup_module_goods_search.html | 21 +- .../popup/popup_module_goods_select.html | 28 +- app/module/DataPrintHandleModule.php | 401 ++++ ...leModule.php => FormTableHandleModule.php} | 5 +- .../view/data_print/form_print_content.html | 100 + .../view/data_print/form_print_handle.html | 95 + .../view/{ => form_table}/base_form.html | 10 +- app/module/view/{ => form_table}/detail.html | 4 +- .../view/{ => form_table}/detail_avg.html | 4 +- .../view/{ => form_table}/detail_content.html | 14 +- .../{ => form_table}/detail_nav_operate.html | 4 +- app/module/view/{ => form_table}/form.html | 10 +- .../{ => form_table}/form_fields_select.html | 2 +- .../{ => form_table}/form_operate_bottom.html | 0 .../{ => form_table}/form_operate_top.html | 8 +- .../view/{ => form_table}/form_table.html | 5 +- .../{ => form_table}/form_table_content.html | 15 +- .../{ => form_table}/form_table_page.html | 0 .../{ => form_table}/form_table_search.html | 0 .../view/{ => form_table}/user_form.html | 10 +- app/plugins/.gitignore | 1 - app/plugins/view/index.html | 1 - app/service/BuyService.php | 2 +- app/service/ConfigService.php | 15 +- app/service/ConstService.php | 3 + app/service/DomainService.php | 4 +- app/service/EmailLogService.php | 2 +- app/service/GoodsCartService.php | 17 +- app/service/GoodsCategoryService.php | 18 + app/service/GoodsService.php | 23 +- app/service/IntegralService.php | 47 +- app/service/NavigationService.php | 45 +- app/service/OrderService.php | 46 +- app/service/PluginsAdminService.php | 259 +-- app/service/PluginsService.php | 46 +- app/service/ResourcesService.php | 51 +- app/service/SearchService.php | 40 +- app/service/SiteService.php | 2 +- app/service/SmsLogService.php | 2 +- app/service/StatisticalService.php | 82 +- app/service/StoreService.php | 27 +- app/service/SystemBaseService.php | 273 +-- app/service/SystemService.php | 76 +- app/service/ThemeDataService.php | 2 +- app/service/UserAddressService.php | 60 +- app/service/WarehouseGoodsService.php | 2 +- changelog.txt | 42 +- composer.json | 2 +- config/cache.php | 2 +- config/shopxo.sql | 30 +- extend/base/Excel.php | 2 +- public/core.php | 6 +- .../admin/default/css/admin.logininfo.css | 2 +- public/static/admin/default/css/common.css | 342 +--- public/static/admin/default/css/goods.css | 4 +- .../static/admin/default/css/index.init.css | 14 +- .../static/admin/default/css/pluginsadmin.css | 39 +- public/static/admin/default/css/role.css | 30 - public/static/admin/default/css/site.css | 27 +- .../admin/default/css/themedata.saveinfo.css | 10 - public/static/admin/default/js/common.js | 16 +- public/static/admin/default/js/goods.js | 9 +- public/static/admin/default/js/index.init.js | 3 +- public/static/admin/default/js/index.js | 1 + public/static/admin/default/js/navigation.js | 1 + .../admin/default/js/order.deliveryinfo.js | 4 +- .../static/admin/default/js/pluginsadmin.js | 12 +- public/static/admin/default/js/site.js | 8 +- public/static/common/css/common.css | 1326 +++++++++---- public/static/common/css/layout.admin.css | 37 +- public/static/common/iconfont/demo_index.html | 941 ++++++++- public/static/common/iconfont/iconfont.css | 166 +- public/static/common/iconfont/iconfont.js | 2 +- public/static/common/iconfont/iconfont.json | 283 ++- public/static/common/iconfont/iconfont.ttf | Bin 82136 -> 91188 bytes public/static/common/iconfont/iconfont.woff | Bin 51680 -> 57232 bytes public/static/common/iconfont/iconfont.woff2 | Bin 43900 -> 48376 bytes public/static/common/js/common.js | 155 +- public/static/common/js/layout.admin.js | 30 +- .../lib/My97DatePicker/skin/default/img.gif | Bin 2504 -> 2803 bytes .../lib/amazeui-chosen/amazeui.chosen.css | 5 +- .../lib/amazeui-chosen/amazeui.chosen.js | 2 +- .../lib/amazeui-dialog/amazeui.dialog.js | 1 - .../static/common/lib/assets/css/amazeui.css | 40 +- public/static/common/lib/assets/js/amazeui.js | 33 +- .../common/lib/swiper/swiper-bundle.min.css | 13 + .../common/lib/swiper/swiper-bundle.min.js | 14 + .../static/common/lib/swiper/swiper.min.css | 13 + public/static/common/lib/swiper/swiper.min.js | 14 + public/static/index/.gitignore | 4 - public/static/index/default/css/article.css | 1 + public/static/index/default/css/buy.css | 7 +- public/static/index/default/css/category.css | 3 + public/static/index/default/css/common.css | 1006 +++------- public/static/index/default/css/goods.css | 49 +- public/static/index/default/css/module.css | 4 +- .../default/css/orderaftersale.detail.css | 37 - public/static/index/default/js/buy.js | 15 +- public/static/index/default/js/cart.js | 2 +- public/static/index/default/js/common.js | 12 +- public/static/index/default/js/goods.js | 57 +- public/static/index/default/js/useraddress.js | 11 - .../default/lib/swiper/swiper-bundle.min.css | 13 + .../default/lib/swiper/swiper-bundle.min.js | 14 + .../index/default/lib/swiper/swiper.min.css | 13 + .../index/default/lib/swiper/swiper.min.js | 14 + public/static/install/css/index.css | 11 - .../view => public/static/plugins}/.gitignore | 0 public/static/plugins/css/.gitignore | 3 - public/static/plugins/css/index.html | 1 - public/static/plugins/images/.gitignore | 3 - public/static/plugins/images/index.html | 1 - public/static/plugins/js/.gitignore | 3 - public/static/plugins/js/index.html | 1 - .../phpspreadsheet/.php-cs-fixer.dist.php | 39 +- .../phpoffice/phpspreadsheet/.phpcs.xml.dist | 4 - .../phpspreadsheet/.readthedocs.yaml | 12 - vendor/phpoffice/phpspreadsheet/CHANGELOG.md | 163 +- .../phpoffice/phpspreadsheet/CONTRIBUTING.md | 39 +- vendor/phpoffice/phpspreadsheet/README.md | 28 +- vendor/phpoffice/phpspreadsheet/composer.json | 32 +- .../phpspreadsheet/phpstan-baseline.neon | 1019 +--------- .../phpspreadsheet/phpstan-conditional.php | 86 + .../phpspreadsheet/phpstan.neon.dist | 15 +- .../Calculation/ArrayEnabled.php | 26 +- .../Calculation/BinaryComparison.php | 89 +- .../Calculation/Calculation.php | 643 +++--- .../PhpSpreadsheet/Calculation/Database.php | 430 ++++ .../Calculation/Database/DAverage.php | 6 +- .../Calculation/Database/DCount.php | 6 +- .../Calculation/Database/DCountA.php | 6 +- .../Calculation/Database/DGet.php | 6 +- .../Calculation/Database/DMax.php | 6 +- .../Calculation/Database/DMin.php | 6 +- .../Calculation/Database/DProduct.php | 6 +- .../Calculation/Database/DStDev.php | 6 +- .../Calculation/Database/DStDevP.php | 6 +- .../Calculation/Database/DSum.php | 6 +- .../Calculation/Database/DVar.php | 4 +- .../Calculation/Database/DVarP.php | 4 +- .../Calculation/Database/DatabaseAbstract.php | 27 +- .../PhpSpreadsheet/Calculation/DateTime.php | 890 +++++++++ .../Calculation/DateTimeExcel/Current.php | 9 +- .../Calculation/DateTimeExcel/Date.php | 29 +- .../Calculation/DateTimeExcel/DateParts.php | 11 +- .../Calculation/DateTimeExcel/DateValue.php | 20 +- .../Calculation/DateTimeExcel/Days.php | 2 +- .../Calculation/DateTimeExcel/Days360.php | 2 +- .../Calculation/DateTimeExcel/Difference.php | 11 +- .../Calculation/DateTimeExcel/Helpers.php | 64 +- .../Calculation/DateTimeExcel/Month.php | 11 +- .../Calculation/DateTimeExcel/NetworkDays.php | 2 +- .../Calculation/DateTimeExcel/Time.php | 12 +- .../Calculation/DateTimeExcel/TimeParts.php | 9 +- .../Calculation/DateTimeExcel/TimeValue.php | 16 +- .../Calculation/DateTimeExcel/Week.php | 24 +- .../Calculation/DateTimeExcel/WorkDay.php | 13 +- .../Calculation/DateTimeExcel/YearFrac.php | 31 +- .../Engine/ArrayArgumentHelper.php | 35 +- .../Engine/ArrayArgumentProcessor.php | 38 +- .../Calculation/Engine/BranchPruner.php | 48 +- .../Engine/CyclicReferenceStack.php | 20 +- .../Calculation/Engine/FormattedNumber.php | 23 +- .../Calculation/Engine/Logger.php | 42 +- .../Engine/Operands/StructuredReference.php | 81 +- .../Calculation/Engineering.php | 1447 ++++++++++++++ .../Calculation/Engineering/BesselI.php | 37 +- .../Calculation/Engineering/BesselJ.php | 40 +- .../Calculation/Engineering/BesselK.php | 41 +- .../Calculation/Engineering/BesselY.php | 40 +- .../Calculation/Engineering/BitWise.php | 84 +- .../Calculation/Engineering/Compare.php | 12 +- .../Calculation/Engineering/Complex.php | 15 +- .../Engineering/ComplexFunctions.php | 133 +- .../Engineering/ComplexOperations.php | 26 +- .../Calculation/Engineering/ConvertBase.php | 6 +- .../Calculation/Engineering/ConvertBinary.php | 20 +- .../Engineering/ConvertDecimal.php | 16 +- .../Calculation/Engineering/ConvertHex.php | 10 +- .../Calculation/Engineering/ConvertOctal.php | 10 +- .../Calculation/Engineering/ConvertUOM.php | 55 +- .../Engineering/EngineeringValidations.php | 10 +- .../Calculation/Engineering/Erf.php | 23 +- .../Calculation/Engineering/ErfC.php | 11 +- .../PhpSpreadsheet/Calculation/Exception.php | 8 +- .../Calculation/ExceptionHandler.php | 2 +- .../PhpSpreadsheet/Calculation/Financial.php | 1389 +++++++++++++ .../Calculation/Financial/Amortization.php | 47 +- .../CashFlow/CashFlowValidations.php | 24 +- .../Financial/CashFlow/Constant/Periodic.php | 49 +- .../CashFlow/Constant/Periodic/Cumulative.php | 32 +- .../CashFlow/Constant/Periodic/Interest.php | 39 +- .../Periodic/InterestAndPrincipal.php | 6 +- .../CashFlow/Constant/Periodic/Payments.php | 30 +- .../Calculation/Financial/CashFlow/Single.php | 14 +- .../CashFlow/Variable/NonPeriodic.php | 40 +- .../Financial/CashFlow/Variable/Periodic.php | 22 +- .../Calculation/Financial/Coupons.php | 91 +- .../Calculation/Financial/Depreciation.php | 33 +- .../Calculation/Financial/Dollar.php | 13 +- .../Financial/FinancialValidations.php | 66 +- .../Calculation/Financial/Helpers.php | 2 +- .../Calculation/Financial/InterestRate.php | 6 +- .../Financial/Securities/AccruedInterest.php | 38 +- .../Financial/Securities/Price.php | 55 +- .../Financial/Securities/Rates.php | 28 +- .../Securities/SecurityValidations.php | 16 +- .../Financial/Securities/Yields.php | 30 +- .../Calculation/Financial/TreasuryBill.php | 10 +- .../Calculation/FormulaParser.php | 120 +- .../Calculation/FormulaToken.php | 39 +- .../PhpSpreadsheet/Calculation/Functions.php | 409 +++- .../Calculation/Information/ErrorValue.php | 15 +- .../Calculation/Information/ExcelError.php | 20 +- .../Calculation/Information/Value.php | 55 +- .../PhpSpreadsheet/Calculation/Logical.php | 303 +++ .../Calculation/Logical/Conditional.php | 10 +- .../Calculation/Logical/Operations.php | 25 +- .../PhpSpreadsheet/Calculation/LookupRef.php | 402 ++++ .../Calculation/LookupRef/Address.php | 11 +- .../Calculation/LookupRef/ExcelMatch.php | 63 +- .../Calculation/LookupRef/Filter.php | 13 +- .../Calculation/LookupRef/Formula.php | 12 +- .../Calculation/LookupRef/HLookup.php | 10 +- .../Calculation/LookupRef/Helpers.php | 4 +- .../Calculation/LookupRef/Hyperlink.php | 6 +- .../Calculation/LookupRef/Indirect.php | 18 +- .../Calculation/LookupRef/Lookup.php | 2 +- .../Calculation/LookupRef/LookupBase.php | 5 +- .../LookupRef/LookupRefValidations.php | 10 +- .../Calculation/LookupRef/Matrix.php | 17 +- .../Calculation/LookupRef/Offset.php | 22 +- .../LookupRef/RowColumnInformation.php | 31 +- .../Calculation/LookupRef/Selection.php | 2 +- .../Calculation/LookupRef/Sort.php | 51 +- .../Calculation/LookupRef/Unique.php | 20 +- .../Calculation/LookupRef/VLookup.php | 14 +- .../PhpSpreadsheet/Calculation/MathTrig.php | 1446 ++++++++++++++ .../Calculation/MathTrig/Absolute.php | 2 +- .../Calculation/MathTrig/Angle.php | 4 +- .../Calculation/MathTrig/Arabic.php | 28 +- .../Calculation/MathTrig/Base.php | 7 +- .../Calculation/MathTrig/Ceiling.php | 10 +- .../Calculation/MathTrig/Combinations.php | 6 +- .../Calculation/MathTrig/Exp.php | 2 +- .../Calculation/MathTrig/Factorial.php | 8 +- .../Calculation/MathTrig/Floor.php | 14 +- .../Calculation/MathTrig/Gcd.php | 9 +- .../Calculation/MathTrig/Helpers.php | 33 +- .../Calculation/MathTrig/IntClass.php | 2 +- .../Calculation/MathTrig/Lcm.php | 2 +- .../Calculation/MathTrig/Logarithms.php | 6 +- .../Calculation/MathTrig/MatrixFunctions.php | 20 +- .../Calculation/MathTrig/Operations.php | 25 +- .../Calculation/MathTrig/Random.php | 12 +- .../Calculation/MathTrig/Roman.php | 2 +- .../Calculation/MathTrig/Round.php | 16 +- .../Calculation/MathTrig/SeriesSum.php | 4 +- .../Calculation/MathTrig/Sign.php | 2 +- .../Calculation/MathTrig/Sqrt.php | 4 +- .../Calculation/MathTrig/Subtotal.php | 22 +- .../Calculation/MathTrig/Sum.php | 20 +- .../Calculation/MathTrig/SumSquares.php | 20 +- .../Calculation/MathTrig/Trig/Cosine.php | 4 +- .../Calculation/MathTrig/Trig/Cotangent.php | 2 +- .../Calculation/MathTrig/Trig/Sine.php | 4 +- .../Calculation/MathTrig/Trig/Tangent.php | 9 +- .../Calculation/MathTrig/Trunc.php | 8 +- .../Calculation/Statistical.php | 1739 +++++++++++++++++ .../Calculation/Statistical/AggregateBase.php | 15 +- .../Calculation/Statistical/Averages.php | 22 +- .../Calculation/Statistical/Averages/Mean.php | 12 +- .../Calculation/Statistical/Conditional.php | 57 +- .../Calculation/Statistical/Confidence.php | 7 +- .../Calculation/Statistical/Counts.php | 12 +- .../Calculation/Statistical/Deviations.php | 24 +- .../Statistical/Distributions/Beta.php | 25 +- .../Statistical/Distributions/Binomial.php | 30 +- .../Statistical/Distributions/ChiSquared.php | 38 +- .../Distributions/DistributionValidations.php | 5 +- .../Statistical/Distributions/Exponential.php | 5 +- .../Statistical/Distributions/F.php | 13 +- .../Statistical/Distributions/Fisher.php | 10 +- .../Statistical/Distributions/Gamma.php | 17 +- .../Statistical/Distributions/GammaBase.php | 12 +- .../Distributions/HyperGeometric.php | 9 +- .../Statistical/Distributions/LogNormal.php | 12 +- .../Distributions/NewtonRaphson.php | 3 +- .../Statistical/Distributions/Normal.php | 16 +- .../Statistical/Distributions/Poisson.php | 6 +- .../Distributions/StandardNormal.php | 25 +- .../Statistical/Distributions/StudentT.php | 13 +- .../Statistical/Distributions/Weibull.php | 2 +- .../Calculation/Statistical/MaxMinBase.php | 7 +- .../Calculation/Statistical/Maximum.php | 8 +- .../Calculation/Statistical/Minimum.php | 8 +- .../Calculation/Statistical/Percentiles.php | 16 +- .../Calculation/Statistical/Permutations.php | 4 +- .../Calculation/Statistical/Size.php | 4 +- .../Statistical/StandardDeviations.php | 14 +- .../Calculation/Statistical/Standardize.php | 2 +- .../Statistical/StatisticalValidations.php | 15 +- .../Calculation/Statistical/Trends.php | 47 +- .../Calculation/Statistical/VarianceBase.php | 14 +- .../Calculation/Statistical/Variances.php | 8 +- .../PhpSpreadsheet/Calculation/TextData.php | 450 +++++ .../Calculation/TextData/CaseConvert.php | 15 +- .../Calculation/TextData/CharacterConvert.php | 4 +- .../Calculation/TextData/Concatenate.php | 4 +- .../Calculation/TextData/Extract.php | 30 +- .../Calculation/TextData/Format.php | 63 +- .../Calculation/TextData/Helpers.php | 17 +- .../Calculation/TextData/Replace.php | 10 +- .../Calculation/TextData/Search.php | 4 +- .../Calculation/TextData/Text.php | 54 +- .../Calculation/TextData/Trim.php | 10 +- .../Calculation/Token/Stack.php | 20 +- .../src/PhpSpreadsheet/Calculation/Web.php | 30 + .../Calculation/Web/Service.php | 8 +- .../Calculation/locale/Translations.xlsx | Bin 140431 -> 108747 bytes .../Calculation/locale/bg/config | 37 +- .../Calculation/locale/bg/functions | 746 +++---- .../Calculation/locale/en/uk/config | 22 +- .../src/PhpSpreadsheet/Cell/AddressHelper.php | 4 +- .../src/PhpSpreadsheet/Cell/AddressRange.php | 11 +- .../Cell/AdvancedValueBinder.php | 21 +- .../src/PhpSpreadsheet/Cell/Cell.php | 221 +-- .../src/PhpSpreadsheet/Cell/CellAddress.php | 64 +- .../src/PhpSpreadsheet/Cell/CellRange.php | 16 +- .../src/PhpSpreadsheet/Cell/ColumnRange.php | 26 +- .../src/PhpSpreadsheet/Cell/Coordinate.php | 158 +- .../src/PhpSpreadsheet/Cell/DataType.php | 8 +- .../PhpSpreadsheet/Cell/DataValidation.php | 192 +- .../src/PhpSpreadsheet/Cell/DataValidator.php | 63 +- .../Cell/DefaultValueBinder.php | 30 +- .../src/PhpSpreadsheet/Cell/Hyperlink.php | 45 +- .../src/PhpSpreadsheet/Cell/IValueBinder.php | 4 +- .../src/PhpSpreadsheet/Cell/IgnoredErrors.php | 62 - .../src/PhpSpreadsheet/Cell/RowRange.php | 26 +- .../PhpSpreadsheet/Cell/StringValueBinder.php | 36 +- .../PhpSpreadsheet/CellReferenceHelper.php | 58 +- .../src/PhpSpreadsheet/Chart/Axis.php | 182 +- .../src/PhpSpreadsheet/Chart/AxisText.php | 63 - .../src/PhpSpreadsheet/Chart/Chart.php | 303 +-- .../src/PhpSpreadsheet/Chart/ChartColor.php | 37 +- .../src/PhpSpreadsheet/Chart/DataSeries.php | 141 +- .../PhpSpreadsheet/Chart/DataSeriesValues.php | 181 +- .../src/PhpSpreadsheet/Chart/Layout.php | 185 +- .../src/PhpSpreadsheet/Chart/Legend.php | 95 +- .../src/PhpSpreadsheet/Chart/PlotArea.php | 89 +- .../src/PhpSpreadsheet/Chart/Properties.php | 237 ++- .../Chart/Renderer/IRenderer.php | 4 +- .../Chart/Renderer/JpGraphRendererBase.php | 82 +- .../Chart/Renderer/MtJpGraphRenderer.php | 10 +- .../src/PhpSpreadsheet/Chart/Title.php | 110 +- .../src/PhpSpreadsheet/Chart/TrendLine.php | 27 +- .../src/PhpSpreadsheet/Collection/Cells.php | 89 +- .../Collection/Memory/SimpleCache1.php | 64 +- .../Collection/Memory/SimpleCache3.php | 47 +- .../src/PhpSpreadsheet/Comment.php | 65 +- .../src/PhpSpreadsheet/DefinedName.php | 36 +- .../PhpSpreadsheet/Document/Properties.php | 148 +- .../src/PhpSpreadsheet/Document/Security.php | 32 +- .../src/PhpSpreadsheet/Exception.php | 4 +- .../src/PhpSpreadsheet/HashTable.php | 21 +- .../src/PhpSpreadsheet/Helper/Dimension.php | 11 +- .../src/PhpSpreadsheet/Helper/Downloader.php | 101 - .../src/PhpSpreadsheet/Helper/Handler.php | 45 - .../src/PhpSpreadsheet/Helper/Html.php | 161 +- .../src/PhpSpreadsheet/Helper/Sample.php | 122 +- .../src/PhpSpreadsheet/Helper/Size.php | 21 +- .../src/PhpSpreadsheet/Helper/TextGrid.php | 41 +- .../src/PhpSpreadsheet/IComparable.php | 2 +- .../src/PhpSpreadsheet/IOFactory.php | 75 +- .../src/PhpSpreadsheet/NamedRange.php | 2 +- .../src/PhpSpreadsheet/Reader/BaseReader.php | 79 +- .../src/PhpSpreadsheet/Reader/Csv.php | 125 +- .../PhpSpreadsheet/Reader/Csv/Delimiter.php | 18 +- .../Reader/DefaultReadFilter.php | 4 +- .../src/PhpSpreadsheet/Reader/Gnumeric.php | 95 +- .../Reader/Gnumeric/PageSetup.php | 5 +- .../Reader/Gnumeric/Properties.php | 5 +- .../PhpSpreadsheet/Reader/Gnumeric/Styles.php | 16 +- .../src/PhpSpreadsheet/Reader/Html.php | 315 ++- .../src/PhpSpreadsheet/Reader/IReadFilter.php | 4 +- .../src/PhpSpreadsheet/Reader/IReader.php | 65 +- .../src/PhpSpreadsheet/Reader/Ods.php | 96 +- .../PhpSpreadsheet/Reader/Ods/BaseLoader.php | 10 +- .../Reader/Ods/DefinedNames.php | 4 - .../Reader/Ods/PageSettings.php | 37 +- .../PhpSpreadsheet/Reader/Ods/Properties.php | 20 +- .../Reader/Security/XmlScanner.php | 99 +- .../src/PhpSpreadsheet/Reader/Slk.php | 130 +- .../src/PhpSpreadsheet/Reader/Xls.php | 1341 +++++++++---- .../src/PhpSpreadsheet/Reader/Xls/Color.php | 3 +- .../PhpSpreadsheet/Reader/Xls/Color/BIFF5.php | 6 +- .../PhpSpreadsheet/Reader/Xls/Color/BIFF8.php | 6 +- .../Reader/Xls/Color/BuiltIn.php | 4 +- .../Reader/Xls/ConditionalFormatting.php | 4 +- .../Reader/Xls/DataValidationHelper.php | 6 +- .../PhpSpreadsheet/Reader/Xls/ErrorCode.php | 6 +- .../src/PhpSpreadsheet/Reader/Xls/Escher.php | 33 +- .../src/PhpSpreadsheet/Reader/Xls/MD5.php | 165 +- .../src/PhpSpreadsheet/Reader/Xls/RC4.php | 14 +- .../Reader/Xls/Style/Border.php | 2 +- .../Reader/Xls/Style/CellAlignment.php | 4 +- .../Reader/Xls/Style/CellFont.php | 2 +- .../Reader/Xls/Style/FillPattern.php | 8 +- .../src/PhpSpreadsheet/Reader/Xlsx.php | 529 ++--- .../PhpSpreadsheet/Reader/Xlsx/AutoFilter.php | 96 +- .../Reader/Xlsx/BaseParserClass.php | 9 +- .../src/PhpSpreadsheet/Reader/Xlsx/Chart.php | 555 ++---- .../Reader/Xlsx/ColumnAndRowAttributes.php | 22 +- .../Reader/Xlsx/ConditionalStyles.php | 114 +- .../Reader/Xlsx/DataValidations.php | 18 +- .../PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php | 6 +- .../PhpSpreadsheet/Reader/Xlsx/PageSetup.php | 28 +- .../PhpSpreadsheet/Reader/Xlsx/Properties.php | 45 +- .../Reader/Xlsx/SharedFormula.php | 26 - .../Reader/Xlsx/SheetViewOptions.php | 28 +- .../PhpSpreadsheet/Reader/Xlsx/SheetViews.php | 63 +- .../src/PhpSpreadsheet/Reader/Xlsx/Styles.php | 62 +- .../Reader/Xlsx/TableReader.php | 63 +- .../src/PhpSpreadsheet/Reader/Xlsx/Theme.php | 28 +- .../Reader/Xlsx/WorkbookView.php | 18 +- .../src/PhpSpreadsheet/Reader/Xml.php | 231 +-- .../Reader/Xml/DataValidations.php | 177 -- .../Reader/Xml/PageSettings.php | 15 +- .../PhpSpreadsheet/Reader/Xml/Properties.php | 24 +- .../src/PhpSpreadsheet/Reader/Xml/Style.php | 29 +- .../Reader/Xml/Style/Border.php | 4 +- .../PhpSpreadsheet/Reader/Xml/Style/Font.php | 4 +- .../src/PhpSpreadsheet/ReferenceHelper.php | 180 +- .../PhpSpreadsheet/RichText/ITextElement.php | 16 +- .../src/PhpSpreadsheet/RichText/RichText.php | 33 +- .../src/PhpSpreadsheet/RichText/Run.php | 30 +- .../PhpSpreadsheet/RichText/TextElement.php | 24 +- .../src/PhpSpreadsheet/Settings.php | 68 +- .../src/PhpSpreadsheet/Shared/CodePage.php | 3 +- .../src/PhpSpreadsheet/Shared/Date.php | 123 +- .../src/PhpSpreadsheet/Shared/Drawing.php | 65 +- .../src/PhpSpreadsheet/Shared/Escher.php | 24 +- .../Shared/Escher/DgContainer.php | 15 +- .../Escher/DgContainer/SpgrContainer.php | 14 +- .../DgContainer/SpgrContainer/SpContainer.php | 145 +- .../Shared/Escher/DggContainer.php | 69 +- .../Escher/DggContainer/BstoreContainer.php | 4 +- .../DggContainer/BstoreContainer/BSE.php | 22 +- .../DggContainer/BstoreContainer/BSE/Blip.php | 16 +- .../src/PhpSpreadsheet/Shared/File.php | 26 +- .../src/PhpSpreadsheet/Shared/Font.php | 189 +- .../src/PhpSpreadsheet/Shared/IntOrFloat.php | 6 +- .../src/PhpSpreadsheet/Shared/OLE.php | 78 +- .../Shared/OLE/ChainedBlockStream.php | 40 +- .../src/PhpSpreadsheet/Shared/OLE/PPS.php | 70 +- .../PhpSpreadsheet/Shared/OLE/PPS/File.php | 8 +- .../PhpSpreadsheet/Shared/OLE/PPS/Root.php | 57 +- .../src/PhpSpreadsheet/Shared/OLERead.php | 87 +- .../PhpSpreadsheet/Shared/PasswordHasher.php | 7 +- .../PhpSpreadsheet/Shared/StringHelper.php | 94 +- .../src/PhpSpreadsheet/Shared/TimeZone.php | 4 +- .../PhpSpreadsheet/Shared/Trend/BestFit.php | 168 +- .../Shared/Trend/ExponentialBestFit.php | 27 +- .../Shared/Trend/LinearBestFit.php | 15 +- .../Shared/Trend/LogarithmicBestFit.php | 19 +- .../Shared/Trend/PolynomialBestFit.php | 38 +- .../Shared/Trend/PowerBestFit.php | 27 +- .../src/PhpSpreadsheet/Shared/Trend/Trend.php | 17 +- .../src/PhpSpreadsheet/Shared/XMLWriter.php | 20 +- .../src/PhpSpreadsheet/Shared/Xls.php | 22 +- .../src/PhpSpreadsheet/Spreadsheet.php | 399 ++-- .../src/PhpSpreadsheet/Style/Alignment.php | 122 +- .../src/PhpSpreadsheet/Style/Border.php | 77 +- .../src/PhpSpreadsheet/Style/Borders.php | 122 +- .../src/PhpSpreadsheet/Style/Color.php | 68 +- .../src/PhpSpreadsheet/Style/Conditional.php | 118 +- .../ConditionalFormatting/CellMatcher.php | 130 +- .../CellStyleAssessor.php | 11 +- .../ConditionalColorScale.php | 92 - .../ConditionalDataBar.php | 31 +- .../ConditionalDataBarExtension.php | 107 +- .../ConditionalFormatValueObject.php | 48 +- .../ConditionalFormattingRuleExtension.php | 32 +- .../ConditionalFormatting/StyleMerger.php | 5 +- .../Style/ConditionalFormatting/Wizard.php | 77 +- .../ConditionalFormatting/Wizard/Blanks.php | 12 +- .../Wizard/CellValue.php | 37 +- .../Wizard/DateValue.php | 6 +- .../Wizard/Duplicates.php | 12 +- .../ConditionalFormatting/Wizard/Errors.php | 12 +- .../Wizard/Expression.php | 12 +- .../Wizard/TextValue.php | 22 +- .../Wizard/WizardAbstract.php | 52 +- .../src/PhpSpreadsheet/Style/Fill.php | 86 +- .../src/PhpSpreadsheet/Style/Font.php | 252 ++- .../src/PhpSpreadsheet/Style/NumberFormat.php | 65 +- .../Style/NumberFormat/BaseFormatter.php | 13 - .../Style/NumberFormat/DateFormatter.php | 45 +- .../Style/NumberFormat/Formatter.php | 75 +- .../Style/NumberFormat/FractionFormatter.php | 13 +- .../Style/NumberFormat/NumberFormatter.php | 57 +- .../NumberFormat/PercentageFormatter.php | 6 +- .../Style/NumberFormat/Wizard/Accounting.php | 28 +- .../Style/NumberFormat/Wizard/Currency.php | 25 +- .../Style/NumberFormat/Wizard/Date.php | 125 -- .../Style/NumberFormat/Wizard/DateTime.php | 47 - .../NumberFormat/Wizard/DateTimeWizard.php | 46 - .../Style/NumberFormat/Wizard/Duration.php | 153 -- .../Style/NumberFormat/Wizard/Locale.php | 6 +- .../Style/NumberFormat/Wizard/NumberBase.php | 3 +- .../Style/NumberFormat/Wizard/Time.php | 105 - .../src/PhpSpreadsheet/Style/Protection.php | 44 +- .../src/PhpSpreadsheet/Style/RgbTint.php | 172 -- .../src/PhpSpreadsheet/Style/Style.php | 140 +- .../src/PhpSpreadsheet/Style/Supervisor.php | 41 +- .../src/PhpSpreadsheet/Theme.php | 259 --- .../PhpSpreadsheet/Worksheet/AutoFilter.php | 173 +- .../Worksheet/AutoFilter/Column.php | 80 +- .../Worksheet/AutoFilter/Column/Rule.php | 60 +- .../PhpSpreadsheet/Worksheet/BaseDrawing.php | 172 +- .../PhpSpreadsheet/Worksheet/CellIterator.php | 19 +- .../src/PhpSpreadsheet/Worksheet/Column.php | 35 +- .../Worksheet/ColumnCellIterator.php | 53 +- .../Worksheet/ColumnDimension.php | 18 +- .../Worksheet/ColumnIterator.php | 31 +- .../PhpSpreadsheet/Worksheet/Dimension.php | 22 +- .../src/PhpSpreadsheet/Worksheet/Drawing.php | 36 +- .../Worksheet/Drawing/Shadow.php | 100 +- .../PhpSpreadsheet/Worksheet/HeaderFooter.php | 134 +- .../Worksheet/HeaderFooterDrawing.php | 16 +- .../src/PhpSpreadsheet/Worksheet/Iterator.php | 8 +- .../Worksheet/MemoryDrawing.php | 79 +- .../PhpSpreadsheet/Worksheet/PageBreak.php | 15 +- .../PhpSpreadsheet/Worksheet/PageMargins.php | 87 +- .../PhpSpreadsheet/Worksheet/PageSetup.php | 183 +- .../src/PhpSpreadsheet/Worksheet/Pane.php | 48 - .../PhpSpreadsheet/Worksheet/Protection.php | 121 +- .../src/PhpSpreadsheet/Worksheet/Row.php | 34 +- .../Worksheet/RowCellIterator.php | 29 +- .../PhpSpreadsheet/Worksheet/RowDimension.php | 24 +- .../PhpSpreadsheet/Worksheet/RowIterator.php | 30 +- .../PhpSpreadsheet/Worksheet/SheetView.php | 64 +- .../src/PhpSpreadsheet/Worksheet/Table.php | 79 +- .../PhpSpreadsheet/Worksheet/Table/Column.php | 38 +- .../Worksheet/Table/TableStyle.php | 24 +- .../PhpSpreadsheet/Worksheet/Validations.php | 29 +- .../PhpSpreadsheet/Worksheet/Worksheet.php | 1453 +++++++------- .../src/PhpSpreadsheet/Writer/BaseWriter.php | 39 +- .../src/PhpSpreadsheet/Writer/Csv.php | 45 +- .../src/PhpSpreadsheet/Writer/Html.php | 562 +++--- .../src/PhpSpreadsheet/Writer/IWriter.php | 33 +- .../src/PhpSpreadsheet/Writer/Ods.php | 58 +- .../PhpSpreadsheet/Writer/Ods/AutoFilters.php | 15 +- .../PhpSpreadsheet/Writer/Ods/Cell/Style.php | 133 +- .../src/PhpSpreadsheet/Writer/Ods/Content.php | 46 +- .../src/PhpSpreadsheet/Writer/Ods/Formula.php | 5 +- .../src/PhpSpreadsheet/Writer/Ods/Meta.php | 12 +- .../Writer/Ods/NamedExpressions.php | 11 +- .../PhpSpreadsheet/Writer/Ods/Settings.php | 2 +- .../PhpSpreadsheet/Writer/Ods/WriterPart.php | 8 +- .../src/PhpSpreadsheet/Writer/Pdf.php | 50 +- .../src/PhpSpreadsheet/Writer/Pdf/Dompdf.php | 6 +- .../src/PhpSpreadsheet/Writer/Pdf/Mpdf.php | 29 +- .../src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php | 2 +- .../src/PhpSpreadsheet/Writer/Xls.php | 81 +- .../PhpSpreadsheet/Writer/Xls/BIFFwriter.php | 30 +- .../Writer/Xls/CellDataValidation.php | 6 +- .../Writer/Xls/ConditionalHelper.php | 31 +- .../PhpSpreadsheet/Writer/Xls/ErrorCode.php | 2 +- .../src/PhpSpreadsheet/Writer/Xls/Escher.php | 103 +- .../src/PhpSpreadsheet/Writer/Xls/Font.php | 27 +- .../src/PhpSpreadsheet/Writer/Xls/Parser.php | 204 +- .../Writer/Xls/Style/CellAlignment.php | 4 +- .../Writer/Xls/Style/CellBorder.php | 2 +- .../Writer/Xls/Style/CellFill.php | 2 +- .../Writer/Xls/Style/ColorMap.php | 2 +- .../PhpSpreadsheet/Writer/Xls/Workbook.php | 213 +- .../PhpSpreadsheet/Writer/Xls/Worksheet.php | 297 +-- .../src/PhpSpreadsheet/Writer/Xls/Xf.php | 105 +- .../src/PhpSpreadsheet/Writer/Xlsx.php | 156 +- .../PhpSpreadsheet/Writer/Xlsx/AutoFilter.php | 6 +- .../src/PhpSpreadsheet/Writer/Xlsx/Chart.php | 444 ++--- .../PhpSpreadsheet/Writer/Xlsx/Comments.php | 8 +- .../Writer/Xlsx/ContentTypes.php | 19 +- .../Writer/Xlsx/DefinedNames.php | 12 +- .../PhpSpreadsheet/Writer/Xlsx/DocProps.php | 13 +- .../PhpSpreadsheet/Writer/Xlsx/Drawing.php | 50 +- .../Writer/Xlsx/FunctionPrefix.php | 3 +- .../src/PhpSpreadsheet/Writer/Xlsx/Rels.php | 29 +- .../PhpSpreadsheet/Writer/Xlsx/RelsRibbon.php | 2 +- .../PhpSpreadsheet/Writer/Xlsx/RelsVBA.php | 2 +- .../Writer/Xlsx/StringTable.php | 39 +- .../src/PhpSpreadsheet/Writer/Xlsx/Style.php | 65 +- .../src/PhpSpreadsheet/Writer/Xlsx/Table.php | 2 +- .../src/PhpSpreadsheet/Writer/Xlsx/Theme.php | 187 +- .../PhpSpreadsheet/Writer/Xlsx/Workbook.php | 6 +- .../PhpSpreadsheet/Writer/Xlsx/Worksheet.php | 303 +-- .../PhpSpreadsheet/Writer/Xlsx/WriterPart.php | 8 +- .../src/PhpSpreadsheet/Writer/ZipStream0.php | 17 - .../src/PhpSpreadsheet/Writer/ZipStream2.php | 21 - .../src/PhpSpreadsheet/Writer/ZipStream3.php | 22 - 883 files changed, 29464 insertions(+), 17295 deletions(-) delete mode 100644 app/admin/view/default/lib/is_default_row.html delete mode 100755 app/admin/view/default/lib/is_enable_row.html delete mode 100755 app/admin/view/default/lib/is_new_window_open_row.html delete mode 100755 app/admin/view/default/lib/is_show_row.html delete mode 100755 app/admin/view/default/lib/region_linkage_row.html delete mode 100644 app/admin/view/default/lib/seo_row.html delete mode 100644 app/admin/view/default/lib/sort_row.html create mode 100644 app/admin/view/default/public/custom_to_value_tips.html delete mode 100644 app/index/view/.gitignore delete mode 100644 app/index/view/default/lib/is_default_row.html delete mode 100755 app/index/view/default/lib/is_enable_row.html delete mode 100755 app/index/view/default/lib/region_linkage_row.html delete mode 100644 app/index/view/default/lib/seo_row.html delete mode 100644 app/index/view/default/lib/sort_row.html create mode 100644 app/index/view/default/public/custom_to_value_tips.html create mode 100644 app/module/DataPrintHandleModule.php rename app/module/{FormHandleModule.php => FormTableHandleModule.php} (99%) create mode 100644 app/module/view/data_print/form_print_content.html create mode 100644 app/module/view/data_print/form_print_handle.html rename app/module/view/{ => form_table}/base_form.html (87%) rename app/module/view/{ => form_table}/detail.html (96%) rename app/module/view/{ => form_table}/detail_avg.html (97%) rename app/module/view/{ => form_table}/detail_content.html (96%) rename app/module/view/{ => form_table}/detail_nav_operate.html (72%) rename app/module/view/{ => form_table}/form.html (95%) rename app/module/view/{ => form_table}/form_fields_select.html (97%) rename app/module/view/{ => form_table}/form_operate_bottom.html (100%) rename app/module/view/{ => form_table}/form_operate_top.html (95%) rename app/module/view/{ => form_table}/form_table.html (96%) rename app/module/view/{ => form_table}/form_table_content.html (97%) rename app/module/view/{ => form_table}/form_table_page.html (100%) rename app/module/view/{ => form_table}/form_table_search.html (100%) rename app/module/view/{ => form_table}/user_form.html (96%) delete mode 100755 app/plugins/view/index.html create mode 100644 public/static/common/lib/swiper/swiper-bundle.min.css create mode 100644 public/static/common/lib/swiper/swiper-bundle.min.js create mode 100644 public/static/common/lib/swiper/swiper.min.css create mode 100644 public/static/common/lib/swiper/swiper.min.js delete mode 100644 public/static/index/.gitignore create mode 100644 public/static/index/default/lib/swiper/swiper-bundle.min.css create mode 100644 public/static/index/default/lib/swiper/swiper-bundle.min.js create mode 100644 public/static/index/default/lib/swiper/swiper.min.css create mode 100644 public/static/index/default/lib/swiper/swiper.min.js rename {app/plugins/view => public/static/plugins}/.gitignore (100%) delete mode 100755 public/static/plugins/css/.gitignore delete mode 100755 public/static/plugins/css/index.html delete mode 100755 public/static/plugins/images/.gitignore delete mode 100755 public/static/plugins/images/index.html delete mode 100755 public/static/plugins/js/.gitignore delete mode 100755 public/static/plugins/js/index.html delete mode 100644 vendor/phpoffice/phpspreadsheet/.readthedocs.yaml create mode 100644 vendor/phpoffice/phpspreadsheet/phpstan-conditional.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Database.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/DateTime.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Engineering.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Financial.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Logical.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/LookupRef.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/MathTrig.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Statistical.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/TextData.php create mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Calculation/Web.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/IgnoredErrors.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/AxisText.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Downloader.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Handler.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SharedFormula.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml/DataValidations.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalColorScale.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Date.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTimeWizard.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Duration.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/NumberFormat/Wizard/Time.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/RgbTint.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Theme.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Pane.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream0.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream2.php delete mode 100644 vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Writer/ZipStream3.php diff --git a/README.md b/README.md index 5f54508ec..529c08844 100755 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ | Gitee | [https://gitee.com/zongzhige/shopxo](https://gitee.com/zongzhige/shopxo) | | GitHub | [https://github.com/gongfuxiang/shopxo](https://github.com/gongfuxiang/shopxo) | | Coding | [https://zongzhige.coding.net/public/shopxo/shopxo/git](https://zongzhige.coding.net/public/shopxo/shopxo/git) | -| GitCode | [https://gitcode.net/zongzhige/shopxo](https://gitcode.net/zongzhige/shopxo) | +| GitCode | [https://gitcode.com/zongzhige/shopxo](https://gitcode.com/zongzhige/shopxo) | ### uniapp端源代码平台 | 平台 | 地址 | @@ -61,7 +61,7 @@ | Gitee | [https://gitee.com/zongzhige/shopxo-uniapp](https://gitee.com/zongzhige/shopxo-uniapp) | | GitHub | [https://github.com/gongfuxiang/shopxo-uniapp](https://github.com/gongfuxiang/shopxo-uniapp) | | Coding | [https://zongzhige.coding.net/public/shopxo/uniapp/git](https://zongzhige.coding.net/public/shopxo/uniapp/git) | -| GitCode | [https://gitcode.net/zongzhige/shopxo-uniapp](https://gitcode.net/zongzhige/shopxo-uniapp) | +| GitCode | [https://gitcode.com/zongzhige/shopxo-uniapp](https://gitcode.com/zongzhige/shopxo-uniapp) | | uni-app | [https://ext.dcloud.net.cn/plugin?id=6380](https://ext.dcloud.net.cn/plugin?id=6380) | ### 部分功能特性 @@ -81,6 +81,7 @@ | 客服 | 统一多端在线客服系统、支持（表情/图片/视频/快捷消息）、好友上下线实时通知、实时输入状态、支持网页及小程序直接发起即时咨询、客服离线（短信+邮件实时通知）、支持商品卡片、可打包工作台客服APP | | 进销存ERP | 采购(入库/退货)、销售(发货/退货)、自定义模板打印+导出Excel+PDF、产品excel批量导入+多单位+多仓库仓位、仓库盘点+调拨、其他出入库、客商+会员等级、采销收付款、商城商品与产品双向同步、商城订单自动同步批量发货| | 组合搭配 | 多个商品组合打包一口价或折扣销售、商品套餐组合搭配用户可选2件起下单、商品关联营销、捆绑销售提高成交率，支持多商户 | +| 配送员 | 同城自建物流团队配送系统，骑手管理、调度中心（地图方圆画圈批量派单及打印、实时观察订单及骑手位置）、配送员微信小程序端实时定位 | * 更多查看应用商店 ( https://store.shopxo.net/ ) ### 系统特性 @@ -126,5 +127,5 @@ 非常欢迎您对ShopXO的开发作出贡献！你可以选择以下方式向ShopXO贡献： - [Github - 发布issue进行问题反馈和建议](https://github.com/gongfuxiang/shopxo/pulls) - [Gitee - 发布issue进行问题反馈和建议](https://gitee.com/zongzhige/shopxo/pulls) -- [Gitcode - 发布issue进行问题反馈和建议](https://gitcode.net/zongzhige/shopxo/merge_requests) +- [Gitcode - 发布issue进行问题反馈和建议](https://gitcode.com/zongzhige/shopxo/merge_requests) > 通过Pull Request提交修复、完善我们的文档和例子 \ No newline at end of file diff --git a/app/admin/controller/Appconfig.php b/app/admin/controller/Appconfig.php index 175842b21..73a322c03 100755 --- a/app/admin/controller/Appconfig.php +++ b/app/admin/controller/Appconfig.php @@ -52,13 +52,11 @@ class AppConfig extends Base { $assign = [ // 配置数据 - 'data' => ConfigService::ConfigList(), + 'data' => ConfigService::ConfigList(), // 管理导航 - 'nav_data' => MyLang('appconfig.base_nav_list'), + 'nav_data' => MyLang('appconfig.base_nav_list'), // 页面导航 - 'nav_type' => $this->nav_type, - // 时区 - 'common_user_base_popup_pages_list' => MyConst('common_user_base_popup_pages_list'), + 'nav_type' => $this->nav_type, ]; MyViewAssign($assign); return MyView($this->nav_type); diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php index 108bb0698..61f2e9e27 100755 --- a/app/admin/controller/Common.php +++ b/app/admin/controller/Common.php @@ -11,7 +11,7 @@ namespace app\admin\controller; use app\BaseController; -use app\module\FormHandleModule; +use app\module\FormTableHandleModule; use app\service\SystemService; use app\service\SystemBaseService; use app\service\AdminService; @@ -377,7 +377,7 @@ class Common extends BaseController $site_store_info = StoreService::SiteStoreInfo(); if(empty($site_store_info)) { - $ret = StoreService::SiteStoreAccountsBindHandle(); + $ret = StoreService::SiteStoreAccountsBindHandle('', '', 'auto'); if($ret['code'] == 0) { $site_store_info = StoreService::SiteStoreInfo(); @@ -444,7 +444,7 @@ class Common extends BaseController $assign = []; $params = $this->data_request; $params['system_admin'] = $this->admin; - $ret = (new FormHandleModule())->Run($module['module'], $module['action'], $params); + $ret = (new FormTableHandleModule())->Run($module['module'], $module['action'], $params); if($ret['code'] == 0) { // 表格数据 diff --git a/app/admin/controller/Error.php b/app/admin/controller/Error.php index 238e298e4..adc6dde89 100755 --- a/app/admin/controller/Error.php +++ b/app/admin/controller/Error.php @@ -55,8 +55,7 @@ class Error extends Common public function Tips() { $msg = empty($this->data_request['msg']) ? MyLang('error') : urldecode(base64_decode($this->data_request['msg'])); - MyViewAssign('msg', $msg); - return MyView('public/tips_error'); + return MyView('public/tips_error', ['msg'=>$msg]); } } ?> \ No newline at end of file diff --git a/app/admin/controller/Navigation.php b/app/admin/controller/Navigation.php index dca0c800d..4ef50ad83 100755 --- a/app/admin/controller/Navigation.php +++ b/app/admin/controller/Navigation.php @@ -17,6 +17,7 @@ use app\service\NavigationService; use app\service\GoodsCategoryService; use app\service\CustomViewService; use app\service\DesignService; +use app\service\PluginsService; /** * 导航管理 @@ -66,6 +67,8 @@ class Navigation extends Base 'nav_data' => MyLang('navigation.base_nav_list'), // 添加类型列表 'add_type_list' => MyLang('navigation.base_add_type_list'), + // 插件列表 + 'plugins_list' => PluginsService::PluginsHomeDataList(), ]; // 获取列表 diff --git a/app/admin/form/Useraddress.php b/app/admin/form/Useraddress.php index 2f1dc1f37..a6698dd09 100644 --- a/app/admin/form/Useraddress.php +++ b/app/admin/form/Useraddress.php @@ -140,6 +140,15 @@ class UserAddress 'where_type' => 'like', ], ], + [ + 'label' => $lang['address_last_code'], + 'view_type' => 'field', + 'view_key' => 'address_last_code', + 'is_sort' => 1, + 'search_config' => [ + 'form_type' => 'input', + ], + ], [ 'label' => $lang['position'], 'view_type' => 'module', diff --git a/app/admin/lang/cht.php b/app/admin/lang/cht.php index d7375fc79..d0936f8e6 100644 --- a/app/admin/lang/cht.php +++ b/app/admin/lang/cht.php @@ -132,6 +132,7 @@ return [ 'city_name' => '所屬市', 'county_name' => '所屬區/縣', 'address' => '詳細地址', + 'address_last_code' => '地址最後一級編碼', 'position' => '經緯度', 'idcard_info' => '身份證資訊', 'is_default' => '是否默認', @@ -472,6 +473,7 @@ return [ ['name' => '基礎配寘', 'type' => 'index'], ['name' => 'APP/小程式', 'type' => 'app'], ], + 'online_service_title' => '線上客服', 'user_base_popup_title' => '用戶基礎資訊彈窗提示', 'user_onekey_bind_mobile_tips_list' => [ '1. 獲取當前小程式平臺帳戶或者本本機的手機號碼一鍵登入綁定，現時僅支持【微信小程式、百度小程式、頭條小程式】', @@ -486,6 +488,10 @@ return [ 'user_base_popup_top_tips_list' => [ '1. 現時僅微信小程式平臺自動授權登入後無用戶昵稱和頭像資訊', ], + 'online_service_top_tips_list' => [ + '1.自定義客服http協定採用webview管道打開', + '2.客服優先順序順序【客服系統->自定義客服->企業微信客服（僅app+h5+微信小程式生效）->各端平臺客服->電話客服】', + ], ], // 小程序管理 @@ -722,6 +728,7 @@ return [ 'customview' => '自定義頁面', 'goods_category' => '商品分類', 'design' => '頁面設計', + 'plugins' => '挿件首頁', ], // 动态表格 'form_table' => [ @@ -1088,6 +1095,8 @@ return [ 'data_list_author_title' => '作者', 'data_list_author_url_title' => '主頁', 'data_list_version_title' => '版本', + 'data_list_second_domain_title' => '二級功能變數名稱', + 'data_list_second_domain_tips' => '請在後臺[系統->系統配寘->安全]中配寘好Cookie有效功能變數名稱主功能變數名稱', 'uninstall_confirm_tips' => '卸載可能會遺失挿件基礎配寘數據不可恢復、確認操作嗎？', 'not_install_divide_title' => '以下挿件未安裝', 'delete_plugins_text' => '1.僅删除應用', diff --git a/app/admin/lang/en.php b/app/admin/lang/en.php index ff399842c..9accf6c23 100644 --- a/app/admin/lang/en.php +++ b/app/admin/lang/en.php @@ -132,6 +132,7 @@ return [ 'city_name' => 'City', 'county_name' => 'County/County', 'address' => 'Detail Address', + 'address_last_code' => 'Address Last Level Encoding', 'position' => 'Position', 'idcard_info' => 'Idcard Info', 'is_default' => 'Default or not', @@ -476,6 +477,7 @@ return [ ['name' => 'BaseConfig', 'type' => 'index'], ['name' => 'APP/Applet', 'type' => 'app'], ], + 'online_service_title' => 'Online Service', 'user_base_popup_title' => 'Pop up prompt for user basic information', 'user_onekey_bind_mobile_tips_list' => [ '1. One click login binding for obtaining the current mini program platform account or mobile phone number of this device. Currently, only WeChat mini programs, Baidu mini programs, and Headline mini programs are supported', @@ -490,6 +492,10 @@ return [ 'user_base_popup_top_tips_list' => [ '1. Currently, only the WeChat mini program platform automatically authorizes login without user nickname and avatar information', ], + 'online_service_top_tips_list' => [ + '1. Customize customer service HTTP protocol to open in webview mode', + '2. Customer service priority order: [Customer service system ->Custom customer service ->Enterprise WeChat customer service (only effective for app+h5+WeChat mini program) ->Customer service on various platforms ->Telephone customer service]', + ], ], // 小程序管理 @@ -726,6 +732,7 @@ return [ 'customview' => 'Custom Page', 'goods_category' => 'Goods Category', 'design' => 'Page Design', + 'plugins' => 'Plugins Home', ], // 表单 'form_item_pid' => 'Navigation Level', @@ -1106,6 +1113,8 @@ return [ 'data_list_author_title' => 'Author', 'data_list_author_url_title' => 'HomePage', 'data_list_version_title' => 'Version', + 'data_list_second_domain_title' => 'Secondary domain name', + 'data_list_second_domain_tips' => 'Please configure the valid domain name and primary domain name of the cookie in the backend [System ->System Configuration ->Security]', 'uninstall_confirm_tips' => 'Uninstallation may lose the basic configuration data of the plug-in. Is it unrecoverable and confirm the operation?', 'not_install_divide_title' => 'The following plugins are not installed', 'delete_plugins_text' => '1. Delete apps only', diff --git a/app/admin/lang/spa.php b/app/admin/lang/spa.php index 785619ae4..b30308bed 100644 --- a/app/admin/lang/spa.php +++ b/app/admin/lang/spa.php @@ -132,6 +132,7 @@ return [ 'city_name' => 'Ciudad a la que pertenece', 'county_name' => 'Distrito / condado al que pertenece', 'address' => 'Dirección detallada', + 'address_last_code' => 'El último nivel de Codificación de la dirección', 'position' => 'Longitud y latitud', 'idcard_info' => 'Información de la tarjeta de identificación', 'is_default' => 'Si predeterminado', @@ -472,6 +473,7 @@ return [ ['name' => 'Configuración básica', 'type' => 'index'], ['name' => 'APP / applet', 'type' => 'app'], ], + 'online_service_title' => 'Servicio al cliente en línea', 'user_base_popup_title' => 'Consejos de ventana emergente de información básica del usuario', 'user_onekey_bind_mobile_tips_list' => [ '1. Obtenga la cuenta actual de la Plataforma de applets o el número de teléfono móvil de esta máquina para iniciar sesión con un solo clic, y actualmente solo admite [applet de wechat, applet de baidu, applet de titulares]', @@ -486,6 +488,10 @@ return [ 'user_base_popup_top_tips_list' => [ '1. En la actualidad, solo la Plataforma de applets de Wechat autoriza automáticamente el inicio de sesión sin apodos de usuario e información de avatar.', ], + 'online_service_top_tips_list' => [ + '1. el Protocolo https de servicio al cliente personalizado se abre en webview', + '2. orden de prioridad del servicio al cliente [sistema de servicio al cliente - > Servicio al cliente personalizado - > Servicio al cliente de Wechat corporativo (solo la aplicación + H5 + applet de Wechat está en vigor) - > Servicio al cliente de cada plataforma final - > Servicio al cliente telefónico]', + ], ], // 小程序管理 @@ -722,6 +728,7 @@ return [ 'customview' => 'Página personalizada', 'goods_category' => 'Clasificación de mercancías', 'design' => 'Diseño de página', + 'plugins' => 'Plug - in de página de inicio', ], // 动态表格 'form_table' => [ @@ -1088,6 +1095,8 @@ return [ 'data_list_author_title' => 'Autor', 'data_list_author_url_title' => 'Página principal', 'data_list_version_title' => 'Versión', + 'data_list_second_domain_title' => 'Nombre de dominio secundario', + 'data_list_second_domain_tips' => 'Por favor, configure el nombre de dominio principal válido de la Cookie en segundo plano [sistema - > configuración del sistema - > seguridad]', 'uninstall_confirm_tips' => '¿¿ desinstalar puede perder los datos de configuración básicos del plug - in que no se pueden restaurar y confirmar?', 'not_install_divide_title' => 'Los siguientes plug - ins no están instalados', 'delete_plugins_text' => '1. eliminar solo la aplicación', diff --git a/app/admin/lang/zh.php b/app/admin/lang/zh.php index bc300f529..daefe93f9 100755 --- a/app/admin/lang/zh.php +++ b/app/admin/lang/zh.php @@ -123,20 +123,21 @@ return [ 'detail_user_address_idcard_pic' => '照片', // 动态表格 'form_table' => [ - 'user' => '用户信息', - 'user_placeholder' => '请输入用户名/昵称/手机/邮箱', - 'alias' => '别名', - 'name' => '联系人', - 'tel' => '联系电话', - 'province_name' => '所属省', - 'city_name' => '所属市', - 'county_name' => '所属区/县', - 'address' => '详细地址', - 'position' => '经纬度', - 'idcard_info' => '身份证信息', - 'is_default' => '是否默认', - 'add_time' => '创建时间', - 'upd_time' => '更新时间', + 'user' => '用户信息', + 'user_placeholder' => '请输入用户名/昵称/手机/邮箱', + 'alias' => '别名', + 'name' => '联系人', + 'tel' => '联系电话', + 'province_name' => '所属省', + 'city_name' => '所属市', + 'county_name' => '所属区/县', + 'address' => '详细地址', + 'address_last_code' => '地址最后一级编码', + 'position' => '经纬度', + 'idcard_info' => '身份证信息', + 'is_default' => '是否默认', + 'add_time' => '创建时间', + 'upd_time' => '更新时间', ], ], @@ -473,6 +474,7 @@ return [ ['name' => '基础配置', 'type' => 'index'], ['name' => 'APP/小程序', 'type' => 'app'], ], + 'online_service_title' => '在线客服', 'user_base_popup_title' => '用户基础信息弹窗提示', 'user_onekey_bind_mobile_tips_list' => [ '1. 获取当前小程序平台账户或者本本机的手机号码一键登录绑定，目前仅支持【微信小程序、百度小程序、头条小程序】', @@ -487,6 +489,10 @@ return [ 'user_base_popup_top_tips_list' => [ '1. 目前仅微信小程序平台自动授权登录后无用户昵称和头像信息', ], + 'online_service_top_tips_list' => [ + '1. 自定义客服http协议采用webview方式打开', + '2. 客服优先级顺序【 客服系统 -> 自定义客服 -> 企业微信客服(仅app+h5+微信小程序生效) -> 各端平台客服 -> 电话客服 】', + ], ], // 小程序管理 @@ -723,6 +729,7 @@ return [ 'customview' => '自定义页面', 'goods_category' => '商品分类', 'design' => '页面设计', + 'plugins' => '插件首页', ], // 动态表格 'form_table' => [ @@ -1089,6 +1096,8 @@ return [ 'data_list_author_title' => '作者', 'data_list_author_url_title' => '主页', 'data_list_version_title' => '版本', + 'data_list_second_domain_title' => '二级域名', + 'data_list_second_domain_tips' => '请在后台[ 系统 -> 系统配置 -> 安全 ]中配置好Cookie有效域名主域名', 'uninstall_confirm_tips' => '卸载可能会丢失插件基础配置数据不可恢复、确认操作吗？', 'not_install_divide_title' => '以下插件未安装', 'delete_plugins_text' => '1. 仅删除应用', diff --git a/app/admin/view/default/admin/detail.html b/app/admin/view/default/admin/detail.html index 156754ed8..7f273a2ec 100644 --- a/app/admin/view/default/admin/detail.html +++ b/app/admin/view/default/admin/detail.html @@ -1,2 +1,2 @@ -{{extend name="../../../module/view/detail" /}} \ No newline at end of file +{{extend name="../../../module/view/form_table/detail" /}} \ No newline at end of file diff --git a/app/admin/view/default/admin/index.html b/app/admin/view/default/admin/index.html index b3511702f..1dd9a15e0 100755 --- a/app/admin/view/default/admin/index.html +++ b/app/admin/view/default/admin/index.html @@ -1,5 +1,5 @@ -{{extend name="../../../module/view/form" /}} +{{extend name="../../../module/view/form_table/form" /}} {{block name="form_operate_top"}} @@ -7,7 +7,7 @@ {{if AdminIsPower('admin', 'saveinfo')}} - {{:MyLang('add_title')}} + {{:MyLang('add_title')}} {{/if}} diff --git a/app/admin/view/default/admin/logininfo.html b/app/admin/view/default/admin/logininfo.html index 9d30ad42a..00d22c58b 100755 --- a/app/admin/view/default/admin/logininfo.html +++ b/app/admin/view/default/admin/logininfo.html @@ -41,35 +41,30 @@
-
+
- -
-
- - - - -
+
+ + + +
{{if MyC('admin_login_img_verify_state') eq 1}} -
-
- - - - - {{:MyLang('form_images_verify_button_text')}} - +
+ + + + + {{:MyLang('form_images_verify_button_text')}} -
+
{{/if}} -
+
- +
@@ -79,21 +74,18 @@