Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/WebApp/vanilla/.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-  "search.exclude": {
-    "lib": true
-  },
-  "editor.formatOnSave": true,
-  "liveServer.settings.port": 9527
-}

code/WebApp/vanilla/resize-detector/index.js

@@ -1,314 +0,0 @@
-var raf = null;
-function requestAnimationFrame (callback) {
-  if (!raf) {
-    raf = (
-      window.requestAnimationFrame ||
-      window.webkitRequestAnimationFrame ||
-      window.mozRequestAnimationFrame ||
-      function (callback) {
-        return setTimeout(callback, 16)
-      }
-    ).bind(window);
-  }
-  return raf(callback)
-}
-
-var caf = null;
-function cancelAnimationFrame (id) {
-  if (!caf) {
-    caf = (
-      window.cancelAnimationFrame ||
-      window.webkitCancelAnimationFrame ||
-      window.mozCancelAnimationFrame ||
-      function (id) {
-        clearTimeout(id);
-      }
-    ).bind(window);
-  }
-
-  caf(id);
-}
-
-function createStyles (styleText) {
-  var style = document.createElement('style');
-
-  if (style.styleSheet) {
-    style.styleSheet.cssText = styleText;
-  } else {
-    style.appendChild(document.createTextNode(styleText));
-  }
-  (document.querySelector('head') || document.body).appendChild(style);
-  return style
-}
-
-function createElement (tagName, props) {
-  if ( props === void 0 ) props = {};
-
-  var elem = document.createElement(tagName);
-  Object.keys(props).forEach(function (key) {
-    elem[key] = props[key];
-  });
-  return elem
-}
-
-function getComputedStyle (elem, prop, pseudo) {
-  // for older versions of Firefox, `getComputedStyle` required
-  // the second argument and may return `null` for some elements
-  // when `display: none`
-  var computedStyle = window.getComputedStyle(elem, pseudo || null) || {
-    display: 'none'
-  };
-
-  return computedStyle[prop]
-}
-
-function getRenderInfo (elem) {
-  if (!document.documentElement.contains(elem)) {
-    return {
-      detached: true,
-      rendered: false
-    }
-  }
-
-  var current = elem;
-  while (current !== document) {
-    if (getComputedStyle(current, 'display') === 'none') {
-      return {
-        detached: false,
-        rendered: false
-      }
-    }
-    current = current.parentNode;
-  }
-
-  return {
-    detached: false,
-    rendered: true
-  }
-}
-
-var css_248z = ".resize-triggers{visibility:hidden;opacity:0;pointer-events:none}.resize-contract-trigger,.resize-contract-trigger:before,.resize-expand-trigger,.resize-triggers{content:\"\";position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}.resize-contract-trigger,.resize-expand-trigger{background:#eee;overflow:auto}.resize-contract-trigger:before{width:200%;height:200%}";
-
-var total = 0;
-var style = null;
-
-function addListener (elem, callback) {
-  if (!elem.__resize_mutation_handler__) {
-    elem.__resize_mutation_handler__ = handleMutation.bind(elem);
-  }
-
-  var listeners = elem.__resize_listeners__;
-
-  if (!listeners) {
-    elem.__resize_listeners__ = [];
-    if (window.ResizeObserver) {
-      var offsetWidth = elem.offsetWidth;
-      var offsetHeight = elem.offsetHeight;
-      var ro = new ResizeObserver(function () {
-        if (!elem.__resize_observer_triggered__) {
-          elem.__resize_observer_triggered__ = true;
-          if (elem.offsetWidth === offsetWidth && elem.offsetHeight === offsetHeight) {
-            return
-          }
-        }
-        runCallbacks(elem);
-      });
-
-      // initially display none won't trigger ResizeObserver callback
-      var ref = getRenderInfo(elem);
-      var detached = ref.detached;
-      var rendered = ref.rendered;
-      elem.__resize_observer_triggered__ = detached === false && rendered === false;
-      elem.__resize_observer__ = ro;
-      ro.observe(elem);
-    } else if (elem.attachEvent && elem.addEventListener) {
-      // targeting IE9/10
-      elem.__resize_legacy_resize_handler__ = function handleLegacyResize () {
-        runCallbacks(elem);
-      };
-      elem.attachEvent('onresize', elem.__resize_legacy_resize_handler__);
-      document.addEventListener('DOMSubtreeModified', elem.__resize_mutation_handler__);
-    } else {
-      if (!total) {
-        style = createStyles(css_248z);
-      }
-      initTriggers(elem);
-
-      elem.__resize_rendered__ = getRenderInfo(elem).rendered;
-      if (window.MutationObserver) {
-        var mo = new MutationObserver(elem.__resize_mutation_handler__);
-        mo.observe(document, {
-          attributes: true,
-          childList: true,
-          characterData: true,
-          subtree: true
-        });
-        elem.__resize_mutation_observer__ = mo;
-      }
-    }
-  }
-
-  elem.__resize_listeners__.push(callback);
-  total++;
-}
-
-function removeListener (elem, callback) {
-  var listeners = elem.__resize_listeners__;
-  if (!listeners) {
-    return
-  }
-
-  if (callback) {
-    listeners.splice(listeners.indexOf(callback), 1);
-  }
-
-  // no listeners exist, or removing all listeners
-  if (!listeners.length || !callback) {
-    // targeting IE9/10
-    if (elem.detachEvent && elem.removeEventListener) {
-      elem.detachEvent('onresize', elem.__resize_legacy_resize_handler__);
-      document.removeEventListener('DOMSubtreeModified', elem.__resize_mutation_handler__);
-      return
-    }
-
-    if (elem.__resize_observer__) {
-      elem.__resize_observer__.unobserve(elem);
-      elem.__resize_observer__.disconnect();
-      elem.__resize_observer__ = null;
-    } else {
-      if (elem.__resize_mutation_observer__) {
-        elem.__resize_mutation_observer__.disconnect();
-        elem.__resize_mutation_observer__ = null;
-      }
-      elem.removeEventListener('scroll', handleScroll);
-      elem.removeChild(elem.__resize_triggers__.triggers);
-      elem.__resize_triggers__ = null;
-    }
-    elem.__resize_listeners__ = null;
-  }
-
-  if (!--total && style) {
-    style.parentNode.removeChild(style);
-  }
-}
-
-function getUpdatedSize (elem) {
-  var ref = elem.__resize_last__;
-  var width = ref.width;
-  var height = ref.height;
-  var offsetWidth = elem.offsetWidth;
-  var offsetHeight = elem.offsetHeight;
-  if (offsetWidth !== width || offsetHeight !== height) {
-    return {
-      width: offsetWidth,
-      height: offsetHeight
-    }
-  }
-  return null
-}
-
-function handleMutation () {
-  // `this` denotes the scrolling element
-  var ref = getRenderInfo(this);
-  var rendered = ref.rendered;
-  var detached = ref.detached;
-  if (rendered !== this.__resize_rendered__) {
-    if (!detached && this.__resize_triggers__) {
-      resetTriggers(this);
-      this.addEventListener('scroll', handleScroll, true);
-    }
-    this.__resize_rendered__ = rendered;
-    runCallbacks(this);
-  }
-}
-
-function handleScroll () {
-  var this$1 = this;
-
-  // `this` denotes the scrolling element
-  resetTriggers(this);
-  if (this.__resize_raf__) {
-    cancelAnimationFrame(this.__resize_raf__);
-  }
-  this.__resize_raf__ = requestAnimationFrame(function () {
-    var updated = getUpdatedSize(this$1);
-    if (updated) {
-      this$1.__resize_last__ = updated;
-      runCallbacks(this$1);
-    }
-  });
-}
-
-function runCallbacks (elem) {
-  if (!elem || !elem.__resize_listeners__) {
-    return
-  }
-  elem.__resize_listeners__.forEach(function (callback) {
-    callback.call(elem, elem);
-  });
-}
-
-function initTriggers (elem) {
-  var position = getComputedStyle(elem, 'position');
-  if (!position || position === 'static') {
-    elem.style.position = 'relative';
-  }
-
-  elem.__resize_old_position__ = position;
-  elem.__resize_last__ = {};
-
-  var triggers = createElement('div', {
-    className: 'resize-triggers'
-  });
-  var expand = createElement('div', {
-    className: 'resize-expand-trigger'
-  });
-  var expandChild = createElement('div');
-  var contract = createElement('div', {
-    className: 'resize-contract-trigger'
-  });
-  expand.appendChild(expandChild);
-  triggers.appendChild(expand);
-  triggers.appendChild(contract);
-  elem.appendChild(triggers);
-
-  elem.__resize_triggers__ = {
-    triggers: triggers,
-    expand: expand,
-    expandChild: expandChild,
-    contract: contract
-  };
-
-  resetTriggers(elem);
-  elem.addEventListener('scroll', handleScroll, true);
-
-  elem.__resize_last__ = {
-    width: elem.offsetWidth,
-    height: elem.offsetHeight
-  };
-}
-
-function resetTriggers (elem) {
-  var ref = elem.__resize_triggers__;
-  var expand = ref.expand;
-  var expandChild = ref.expandChild;
-  var contract = ref.contract;
-
-  // batch read
-  var csw = contract.scrollWidth;
-  var csh = contract.scrollHeight;
-  var eow = expand.offsetWidth;
-  var eoh = expand.offsetHeight;
-  var esw = expand.scrollWidth;
-  var esh = expand.scrollHeight;
-
-  // batch write
-  contract.scrollLeft = csw;
-  contract.scrollTop = csh;
-  expandChild.style.width = eow + 1 + 'px';
-  expandChild.style.height = eoh + 1 + 'px';
-  expand.scrollLeft = esw;
-  expand.scrollTop = esh;
-}
-
-export { addListener, removeListener };

code/WebApp/vanilla/router/routes.js

@@ -1,234 +0,0 @@
-export default [
-  {
-    path: "home",
-    meta: {
-      type: "page",
-      title: "首页",
-      icon: "home",
-      public: true,
-    },
-  },
-  {
-    path: "base-data",
-    meta: {
-      type: "group",
-      title: "基础数据",
-      icon: "folder",
-    },
-    children: [
-      {
-        path: "user",
-        meta: {
-          type: "page",
-          title: "用户管理",
-          icon: "file",
-          permission: "AbpIdentity.Users",
-        },
-        children: [
-          {
-            path: "query",
-            meta: {
-              type: "button",
-              title: "查询",
-              icon: "file",
-              isTop: true,
-            },
-          },
-          {
-            path: "create",
-            meta: {
-              type: "button",
-              title: "新建",
-              icon: "file",
-              permission: "AbpIdentity.Users.Create",
-              isTop: true,
-            },
-          },
-          {
-            path: "update",
-            meta: {
-              type: "button",
-              title: "编辑",
-              icon: "file",
-              htmlClass: "el-button--primary",
-              permission: "AbpIdentity.Users.Update",
-            },
-          },
-          {
-            path: "delete",
-            meta: {
-              type: "button",
-              title: "删除",
-              icon: "file",
-              permission: "AbpIdentity.Users.Delete",
-              disabled: "o=>o.userName==='admin'",
-            },
-          },
-          {
-            path: "%s/reset-password",
-            meta: {
-              type: "button",
-              title: "重置密码",
-              icon: "file",
-              permission: "reset-password?",
-              method: "PUT",
-            },
-          },
-        ],
-      },
-      // {
-      //   path: "role",
-      //   meta: {
-      //     type: "page",
-      //     title: "角色管理",
-      //     icon: "file",
-      //     permission: "AbpIdentity.Users",
-      //   },
-      //   children: [
-      //     {
-      //       path: "create",
-      //       meta: {
-      //         type: "button",
-      //         title: "新建",
-      //         icon: "file",
-      //         permission: "AbpIdentity.Users.Create",
-      //         isTop: true,
-      //       },
-      //     },
-      //     {
-      //       path: "update",
-      //       meta: {
-      //         type: "button",
-      //         title: "编辑",
-      //         icon: "file",
-      //         htmlClass: "el-button--primary",
-      //         permission: "AbpIdentity.Users.Update",
-      //         disabled: `(o) => o.isStatic`,
-      //       },
-      //     },
-      //     {
-      //       path: "delete",
-      //       meta: {
-      //         type: "button",
-      //         title: "删除",
-      //         icon: "file",
-      //         permission: "AbpIdentity.Users.Delete",
-      //         disabled: `(o) => o.isStatic`,
-      //       },
-      //     },
-      //   ],
-      // },
-      {
-        path: "centralized-control",
-        meta: {
-          type: "page",
-          title: "期间设置",
-          icon: "file",
-          children: [
-            {
-              path: "query",
-              meta: {
-                type: "button",
-                title: "查询",
-                icon: "file",
-                isTop: true,
-              },
-            },
-            {
-              path: "create",
-              meta: {
-                type: "button",
-                title: "新建",
-                icon: "file",
-                isTop: true,
-              },
-            },
-            {
-              path: "open-version",
-              meta: {
-                type: "button",
-                title: "启用",
-                icon: "file",
-                isTop: true,
-              },
-            },
-            {
-              path: "closed-version",
-              meta: {
-                type: "button",
-                title: "停用",
-                icon: "file",
-                isTop: true,
-              },
-            },
-            {
-              path: "delete",
-              meta: {
-                type: "button",
-                title: "删除",
-                icon: "file",
-                isTop: true,
-              },
-            },
-          ],
-        },
-      },
-      {
-        path: "code-setting",
-        meta: {
-          type: "page",
-          title: "通用代码",
-          icon: "file",
-          children: [
-            {
-              path: "query",
-              meta: {
-                type: "button",
-                title: "查询",
-                icon: "file",
-                isTop: true,
-              },
-            },
-            {
-              path: "create",
-              meta: {
-                type: "button",
-                title: "新建",
-                icon: "file",
-                isTop: true,
-              },
-            },
-            {
-              path: "delete",
-              meta: {
-                type: "button",
-                title: "删除",
-                icon: "file",
-                isTop: true,
-              },
-            },
-            {
-              path: "import",
-              meta: {
-                type: "button",
-                title: "导入",
-                icon: "file",
-                isTop: true,
-              },
-            },
-            {
-              path: "export",
-              meta: {
-                type: "button",
-                title: "导出",
-                icon: "file",
-                isTop: true,
-                pattern: "paged",
-              },
-            },
-          ],
-        },
-      },
-    ],
-  },
-];

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitignore

@@ -1,2 +1 @@
-wwwroot/files/
+appsettings.Development.json
-appsettings.Development.json

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Controllers/HomeController.cs

@@ -5,9 +5,10 @@ namespace Win.Sfs.SettleAccount.Controllers
 {
     public class HomeController : AbpController
     {
+        [ResponseCache(NoStore = true)]
         public ActionResult Index()
         {
-            return Redirect("~/swagger");
+            return File("~/index.html", "text/html");
         }
     }
 }

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.Text.RegularExpressions;
@@ -14,7 +15,7 @@ namespace Win.Sfs.SettleAccount
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddRouting(options => options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer));
-            services.AddMvc(options=>options.Conventions.Add(new RouteTokenTransformerConvention(new SlugifyParameterTransformer())));
+            services.AddMvc(options => options.Conventions.Add(new RouteTokenTransformerConvention(new SlugifyParameterTransformer())));
             services.AddApplication<SettleAccountHttpApiHostModule>();
             services.Configure<KestrelServerOptions>(options =>
             {
@@ -31,6 +32,9 @@ namespace Win.Sfs.SettleAccount
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
         {
+            var contentTypeProvider = new FileExtensionContentTypeProvider();
+            contentTypeProvider.Mappings.Add(".mjs", "text/javascript");
+            app.UseStaticFiles(new StaticFileOptions { ContentTypeProvider = contentTypeProvider });
             app.InitializeApplication();
         }
 

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.gitignore

@@ -0,0 +1,3 @@
+files/
+btsecsummary/
+secsummary/

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "editor.formatOnSave": true,
+  "liveServer.settings.port": 9527,
+  "explorer.excludeGitIgnore": true,
+  "search.followSymlinks": false,
+  "search.exclude": {
+    "lib/**": true
+  }
+}

code/WebApp/vanilla/config/settings.js → code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/config/settings.js

@@ -1,5 +1,5 @@
 export default {
   enableLocale: false,
   //baseURL: "http://dev.ccwin-in.com:10582/api",
-  baseURL: "http://localhost:44378/api",
+  baseURL: "/api",
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/jsconfig.json

@@ -0,0 +1,3 @@
+{
+  "exclude": ["node_modules", "files", "btsecsummary", "secsummary"]
+}