合并

.env.development

@@ -0,0 +1,14 @@
+# just a flag
+NODE_ENV = 'development'
+MODE = 'development'
+DEV = true
+
+
+# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
+# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
+# It only does one thing by converting all import() to require().
+# This configuration can significantly increase the speed of hot updates,
+# when you have a large number of pages.
+# Detail:  https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
+
+VUE_CLI_BABEL_TRANSPILE_MODULES = true

dist/assets/Checker-f1def942.js

@@ -1 +1,15 @@
+<<<<<<< HEAD
+<<<<<<<< HEAD:dist/assets/Checker-f1def942.js
 import{Q as m,a2 as g,x as C,d as P,a6 as S,aa as x,T as z,n as y,i as r,g as d,I as B,S as D}from"./index-2f0cf2f5.js";const G={name:m,shape:g("round"),disabled:Boolean,iconSize:C,modelValue:m,checkedColor:String,labelPosition:String,labelDisabled:Boolean};var V=P({props:S({},G,{bem:x(Function),role:String,parent:Object,checked:Boolean,bindGroup:z}),emits:["click","toggle"],setup(e,{emit:s,slots:t}){const u=y(),l=n=>{if(e.parent&&e.bindGroup)return e.parent.props[n]},c=r(()=>{if(e.parent&&e.bindGroup){const n=l("disabled")||e.disabled;if(e.role==="checkbox"){const o=l("modelValue").length,a=l("max"),i=a&&o>=+a;return n||i&&!e.checked}return n}return e.disabled}),h=r(()=>l("direction")),f=r(()=>{const n=e.checkedColor||l("checkedColor");if(n&&e.checked&&!c.value)return{borderColor:n,backgroundColor:n}}),v=n=>{const{target:o}=n,a=u.value,i=a===o||(a==null?void 0:a.contains(o));!c.value&&(i||!e.labelDisabled)&&s("toggle"),s("click",n)},b=()=>{const{bem:n,shape:o,checked:a}=e,i=e.iconSize||l("iconSize");return d("div",{ref:u,class:n("icon",[o,{disabled:c.value,checked:a}]),style:{fontSize:D(i)}},[t.icon?t.icon({checked:a,disabled:c.value}):d(B,{name:"success",style:f.value},null)])},k=()=>{if(t.default)return d("span",{class:e.bem("label",[e.labelPosition,{disabled:c.value}])},[t.default()])};return()=>{const n=e.labelPosition==="left"?[k(),b()]:[b(),k()];return d("div",{role:e.role,class:e.bem([{disabled:c.value,"label-disabled":e.labelDisabled},h.value]),tabindex:c.value?void 0:0,"aria-checked":e.checked,onClick:v},[n])}}});export{G as c,V as s};
+========
+=======
+>>>>>>> iteration-create
+<<<<<<<< HEAD:dist/assets/Checker-9a3c6d3f.js
+import{aQ as m,m as g,n as C,d as P,aB as S,aG as x,t as z,q as B,D as r,g as d,I as D,j as G}from"./index-bc617d61.js";const y={name:m,shape:g("round"),disabled:Boolean,iconSize:C,modelValue:m,checkedColor:String,labelPosition:String,labelDisabled:Boolean};var V=P({props:S({},y,{bem:x(Function),role:String,parent:Object,checked:Boolean,bindGroup:z}),emits:["click","toggle"],setup(e,{emit:s,slots:t}){const u=B(),l=n=>{if(e.parent&&e.bindGroup)return e.parent.props[n]},c=r(()=>{if(e.parent&&e.bindGroup){const n=l("disabled")||e.disabled;if(e.role==="checkbox"){const o=l("modelValue").length,a=l("max"),i=a&&o>=+a;return n||i&&!e.checked}return n}return e.disabled}),h=r(()=>l("direction")),f=r(()=>{const n=e.checkedColor||l("checkedColor");if(n&&e.checked&&!c.value)return{borderColor:n,backgroundColor:n}}),v=n=>{const{target:o}=n,a=u.value,i=a===o||(a==null?void 0:a.contains(o));!c.value&&(i||!e.labelDisabled)&&s("toggle"),s("click",n)},b=()=>{const{bem:n,shape:o,checked:a}=e,i=e.iconSize||l("iconSize");return d("div",{ref:u,class:n("icon",[o,{disabled:c.value,checked:a}]),style:{fontSize:G(i)}},[t.icon?t.icon({checked:a,disabled:c.value}):d(D,{name:"success",style:f.value},null)])},k=()=>{if(t.default)return d("span",{class:e.bem("label",[e.labelPosition,{disabled:c.value}])},[t.default()])};return()=>{const n=e.labelPosition==="left"?[k(),b()]:[b(),k()];return d("div",{role:e.role,class:e.bem([{disabled:c.value,"label-disabled":e.labelDisabled},h.value]),tabindex:c.value?void 0:0,"aria-checked":e.checked,onClick:v},[n])}}});export{y as c,V as s};
+========
+import{Q as m,a2 as g,x as C,d as P,a6 as S,aa as x,T as z,n as y,i as r,g as d,I as B,S as D}from"./index-2f0cf2f5.js";const G={name:m,shape:g("round"),disabled:Boolean,iconSize:C,modelValue:m,checkedColor:String,labelPosition:String,labelDisabled:Boolean};var V=P({props:S({},G,{bem:x(Function),role:String,parent:Object,checked:Boolean,bindGroup:z}),emits:["click","toggle"],setup(e,{emit:s,slots:t}){const u=y(),l=n=>{if(e.parent&&e.bindGroup)return e.parent.props[n]},c=r(()=>{if(e.parent&&e.bindGroup){const n=l("disabled")||e.disabled;if(e.role==="checkbox"){const o=l("modelValue").length,a=l("max"),i=a&&o>=+a;return n||i&&!e.checked}return n}return e.disabled}),h=r(()=>l("direction")),f=r(()=>{const n=e.checkedColor||l("checkedColor");if(n&&e.checked&&!c.value)return{borderColor:n,backgroundColor:n}}),v=n=>{const{target:o}=n,a=u.value,i=a===o||(a==null?void 0:a.contains(o));!c.value&&(i||!e.labelDisabled)&&s("toggle"),s("click",n)},b=()=>{const{bem:n,shape:o,checked:a}=e,i=e.iconSize||l("iconSize");return d("div",{ref:u,class:n("icon",[o,{disabled:c.value,checked:a}]),style:{fontSize:D(i)}},[t.icon?t.icon({checked:a,disabled:c.value}):d(B,{name:"success",style:f.value},null)])},k=()=>{if(t.default)return d("span",{class:e.bem("label",[e.labelPosition,{disabled:c.value}])},[t.default()])};return()=>{const n=e.labelPosition==="left"?[k(),b()]:[b(),k()];return d("div",{role:e.role,class:e.bem([{disabled:c.value,"label-disabled":e.labelDisabled},h.value]),tabindex:c.value?void 0:0,"aria-checked":e.checked,onClick:v},[n])}}});export{G as c,V as s};
+>>>>>>>> f2082b7 (更新):dist/assets/Checker-f1def942.js
+<<<<<<< HEAD
+>>>>>>>> iteration-create:dist/assets/Checker-9a3c6d3f.js
+=======
+>>>>>>> iteration-create

dist/assets/Checker-legacy-f317edd7.js

@@ -1 +1,15 @@
+<<<<<<< HEAD
+<<<<<<<< HEAD:dist/assets/Checker-legacy-f317edd7.js
 System.register(["./index-legacy-34afeea3.js"],(function(e,n){"use strict";var l,a,i,o,r,c,t,d,u,s,b,v;return{setters:[function(e){l=e.Q,a=e.a2,i=e.x,o=e.d,r=e.a6,c=e.aa,t=e.T,d=e.n,u=e.i,s=e.g,b=e.I,v=e.S}],execute:function(){var n=e("c",{name:l,shape:a("round"),disabled:Boolean,iconSize:i,modelValue:l,checkedColor:String,labelPosition:String,labelDisabled:Boolean});e("s",o({props:r({},n,{bem:c(Function),role:String,parent:Object,checked:Boolean,bindGroup:t}),emits:["click","toggle"],setup:function(e,n){var l=n.emit,a=n.slots,i=d(),o=function(n){if(e.parent&&e.bindGroup)return e.parent.props[n]},r=u((function(){if(e.parent&&e.bindGroup){var n=o("disabled")||e.disabled;if("checkbox"===e.role){var l=o("modelValue").length,a=o("max");return n||a&&l>=+a&&!e.checked}return n}return e.disabled})),c=u((function(){return o("direction")})),t=u((function(){var n=e.checkedColor||o("checkedColor");if(n&&e.checked&&!r.value)return{borderColor:n,backgroundColor:n}})),f=function(n){var a=n.target,o=i.value,c=o===a||(null==o?void 0:o.contains(a));r.value||!c&&e.labelDisabled||l("toggle"),l("click",n)},k=function(){var n=e.bem,l=e.shape,c=e.checked,d=e.iconSize||o("iconSize");return s("div",{ref:i,class:n("icon",[l,{disabled:r.value,checked:c}]),style:{fontSize:v(d)}},[a.icon?a.icon({checked:c,disabled:r.value}):s(b,{name:"success",style:t.value},null)])},h=function(){if(a.default)return s("span",{class:e.bem("label",[e.labelPosition,{disabled:r.value}])},[a.default()])};return function(){var n="left"===e.labelPosition?[h(),k()]:[k(),h()];return s("div",{role:e.role,class:e.bem([{disabled:r.value,"label-disabled":e.labelDisabled},c.value]),tabindex:r.value?void 0:0,"aria-checked":e.checked,onClick:f},[n])}}}))}}}));
+========
+=======
+>>>>>>> iteration-create
+<<<<<<<< HEAD:dist/assets/Checker-legacy-12e3c5f1.js
+System.register(["./index-legacy-33e7c04a.js"],(function(e,n){"use strict";var l,a,i,o,r,c,t,d,u,s,b,v;return{setters:[function(e){l=e.aQ,a=e.m,i=e.n,o=e.d,r=e.aB,c=e.aG,t=e.t,d=e.q,u=e.D,s=e.g,b=e.I,v=e.j}],execute:function(){var n=e("c",{name:l,shape:a("round"),disabled:Boolean,iconSize:i,modelValue:l,checkedColor:String,labelPosition:String,labelDisabled:Boolean});e("s",o({props:r({},n,{bem:c(Function),role:String,parent:Object,checked:Boolean,bindGroup:t}),emits:["click","toggle"],setup:function(e,n){var l=n.emit,a=n.slots,i=d(),o=function(n){if(e.parent&&e.bindGroup)return e.parent.props[n]},r=u((function(){if(e.parent&&e.bindGroup){var n=o("disabled")||e.disabled;if("checkbox"===e.role){var l=o("modelValue").length,a=o("max");return n||a&&l>=+a&&!e.checked}return n}return e.disabled})),c=u((function(){return o("direction")})),t=u((function(){var n=e.checkedColor||o("checkedColor");if(n&&e.checked&&!r.value)return{borderColor:n,backgroundColor:n}})),f=function(n){var a=n.target,o=i.value,c=o===a||(null==o?void 0:o.contains(a));r.value||!c&&e.labelDisabled||l("toggle"),l("click",n)},k=function(){var n=e.bem,l=e.shape,c=e.checked,d=e.iconSize||o("iconSize");return s("div",{ref:i,class:n("icon",[l,{disabled:r.value,checked:c}]),style:{fontSize:v(d)}},[a.icon?a.icon({checked:c,disabled:r.value}):s(b,{name:"success",style:t.value},null)])},h=function(){if(a.default)return s("span",{class:e.bem("label",[e.labelPosition,{disabled:r.value}])},[a.default()])};return function(){var n="left"===e.labelPosition?[h(),k()]:[k(),h()];return s("div",{role:e.role,class:e.bem([{disabled:r.value,"label-disabled":e.labelDisabled},c.value]),tabindex:r.value?void 0:0,"aria-checked":e.checked,onClick:f},[n])}}}))}}}));
+========
+System.register(["./index-legacy-34afeea3.js"],(function(e,n){"use strict";var l,a,i,o,r,c,t,d,u,s,b,v;return{setters:[function(e){l=e.Q,a=e.a2,i=e.x,o=e.d,r=e.a6,c=e.aa,t=e.T,d=e.n,u=e.i,s=e.g,b=e.I,v=e.S}],execute:function(){var n=e("c",{name:l,shape:a("round"),disabled:Boolean,iconSize:i,modelValue:l,checkedColor:String,labelPosition:String,labelDisabled:Boolean});e("s",o({props:r({},n,{bem:c(Function),role:String,parent:Object,checked:Boolean,bindGroup:t}),emits:["click","toggle"],setup:function(e,n){var l=n.emit,a=n.slots,i=d(),o=function(n){if(e.parent&&e.bindGroup)return e.parent.props[n]},r=u((function(){if(e.parent&&e.bindGroup){var n=o("disabled")||e.disabled;if("checkbox"===e.role){var l=o("modelValue").length,a=o("max");return n||a&&l>=+a&&!e.checked}return n}return e.disabled})),c=u((function(){return o("direction")})),t=u((function(){var n=e.checkedColor||o("checkedColor");if(n&&e.checked&&!r.value)return{borderColor:n,backgroundColor:n}})),f=function(n){var a=n.target,o=i.value,c=o===a||(null==o?void 0:o.contains(a));r.value||!c&&e.labelDisabled||l("toggle"),l("click",n)},k=function(){var n=e.bem,l=e.shape,c=e.checked,d=e.iconSize||o("iconSize");return s("div",{ref:i,class:n("icon",[l,{disabled:r.value,checked:c}]),style:{fontSize:v(d)}},[a.icon?a.icon({checked:c,disabled:r.value}):s(b,{name:"success",style:t.value},null)])},h=function(){if(a.default)return s("span",{class:e.bem("label",[e.labelPosition,{disabled:r.value}])},[a.default()])};return function(){var n="left"===e.labelPosition?[h(),k()]:[k(),h()];return s("div",{role:e.role,class:e.bem([{disabled:r.value,"label-disabled":e.labelDisabled},c.value]),tabindex:r.value?void 0:0,"aria-checked":e.checked,onClick:f},[n])}}}))}}}));
+>>>>>>>> f2082b7 (更新):dist/assets/Checker-legacy-f317edd7.js
+<<<<<<< HEAD
+>>>>>>>> iteration-create:dist/assets/Checker-legacy-12e3c5f1.js
+=======
+>>>>>>> iteration-create

dist/index.html

@@ -37,7 +37,19 @@
   <meta name="referrer" content="no-referrer" />
   <title>学生端</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-2f0cf2f5.js"></script>
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+  <script type="module" crossorigin src="./assets/index-9be6876d.js"></script>
+  <link rel="stylesheet" href="./assets/index-f8710e46.css">
+=======
+  <script type="module" crossorigin src="./assets/index-bc617d61.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-2f0cf2f5.js"></script>
+>>>>>>> f2082b7 (更新)
+>>>>>>> iteration-create
   <link rel="stylesheet" href="./assets/index-466c9a64.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -58,8 +70,23 @@
       //   }
   </script>
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-6ecbd2c3.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-34afeea3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-763956e3.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-668778fa.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-50df5981.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-33e7c04a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> e39ed1f (更新打包)
+=======
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-6ecbd2c3.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-34afeea3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> f2082b7 (更新)
+>>>>>>> iteration-create
 </body>
 
 </html>