mooho-base-admin-plus 2.4.19 → 2.4.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.4.19",
+  "version": "2.4.21",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/view/column-edit.vue

@@ -357,7 +357,7 @@
             <Col v-bind="grid8">
               <FormItem label="默认值" key="defaultValue" prop="defaultValue">
                 <Input type="text" v-model="data.defaultValue" maxlength="200" style="width: 150px" />
-                <Dropdown style="margin-left: 8px" @on-click="selectDefault">
+                <Dropdown style="margin-left: 8px" transfer="true" @on-click="selectDefault">
                   <Button type="primary" size="small">
                     <Icon type="ios-arrow-down" />
                   </Button>

package/src/components/view/filter-edit.vue

@@ -219,7 +219,7 @@
             <Col v-bind="grid8">
               <FormItem label="默认值" key="defaultValue" prop="defaultValue">
                 <Input type="text" v-model="data.defaultValue" maxlength="200" style="width: 150px" />
-                <Dropdown style="margin-left: 8px" @on-click="selectDefault">
+                <Dropdown style="margin-left: 8px" transfer="true" @on-click="selectDefault">
                   <Button type="primary" size="small">
                     <Icon type="ios-arrow-down" />
                   </Button>

package/src/pages/template/processPage.vue

@@ -32,7 +32,13 @@
         <Button type="primary" custom-icon="fa fa-save" @click="save">{{ $t('Front_Btn_Save') }}</Button>
         <Button
           type="warning"
-          v-if="$refs.form && $refs.form.data && $refs.form.data.application && ($refs.form.data.application.status == 'Draft' || $refs.form.data.application.status == 'Rejected')"
+          v-if="
+            $refs.form &&
+            $refs.form.data &&
+            $refs.form.data.application &&
+            $refs.form.data.applicationID &&
+            ($refs.form.data.application.status == 'Draft' || $refs.form.data.application.status == 'Rejected')
+          "
           custom-icon="fa fa-trash-alt"
           @click="cancel"
         >

package/src/styles/css/login.css

@@ -1,155 +1,23 @@
-.blue {
-  color: #00aaee;
-}
-
-.gray {
-  color: #b9bcc7;
-}
-
-.red {
-  color: #fc4444;
-}
-
-.orange {
-  color: #ff7802;
-}
-
-html {
-  font-family: 'Microsoft YaHei', 'Helvetica Neue', 'Hiragino Sans GB', '黑体', Arial, sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-
-article,
-aside,
-details,
-figcacption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
-  display: block;
-}
-
-audio,
-canvas,
-progress,
-video {
-  display: inline-block;
-  vertical-align: baseline;
-}
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-[hidden],
-template {
-  display: none;
-}
-
-a {
-  background: transparent;
-  text-decoration: none;
-  color: #333;
-}
-
-a:active,
-a:hover,
-a:focus {
-  outline: 0;
-  text-decoration: none;
-  color: #078dcf;
-}
-
-abbr[title] {
-  border-bottom: 1px dotted;
-}
-
-b,
-strong {
-  font-weight: bold;
-}
-
-dfn {
-  font-style: italic;
-}
-
-mark {
-  background: #ff0;
-  color: #000;
-}
-
-small {
-  font-size: 80%;
-}
-
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sup {
-  top: -0.5em;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-img {
-  border: 0;
-}
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
-hr {
-  -webkit-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
-}
-
-pre {
-  overflow: auto;
-}
-
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
+.signIn {
+  width: 100%;
+  min-height: 100%;
 }
 
-button,
-input,
-optgroup,
-select,
-textarea {
-  color: inherit;
-  font: inherit;
+.signIn .cf:before,
+.cf:after {
+  content: '';
+  display: table;
 }
 
-ton {
-  overflow: visible;
+.cf:after {
+  clear: both;
 }
 
-button,
-select {
-  text-transform: none;
+.signIn h2 {
+  font-weight: normal;
 }
 
-button,
+.signIn button,
 html input[type='button'],
 input[type='reset'],
 input[type='submit'] {
@@ -157,189 +25,7 @@ input[type='submit'] {
   cursor: pointer;
 }
 
-button[disabled],
-html input[disabled] {
-  cursor: default;
-}
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  border: 0;
-  padding: p;
-}
-
-input {
-  line-height: normal;
-}
-
-input[type='checkbox'],
-input[type='radio'] {
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
-
-input[type='number']::-webkit-inner-spin-button,
-input[type='number']::-webkit-outer-spin-button {
-  height: auto;
-}
-
-input[type='search'] {
-  -webkit-appearance: textfield;
-}
-
-input[type='search']::-webkit-search-cancel-button,
-input[type='search']::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-fieldset {
-  border: 1px solid #c0c0c0;
-}
-
-textarea {
-  overflow: auto;
-}
-
-optgroup {
-  font-weight: bold;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-body,
-div,
-address,
-blockquote,
-iframe,
-ul,
-ol,
-dl,
-dt,
-dd,
-li,
-dl,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-a,
-pre,
-table,
-caption,
-th,
-td,
-form,
-legend,
-fieldset,
-input,
-button,
-select,
-textarea,
-article,
-aside,
-audio,
-canvas,
-command,
-datalist,
-details,
-embed,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section,
-source,
-video,
-time {
-  margin: 0;
-  padding: 0;
-  font-weight: normal;
-  font-style: normal;
-  font-size: 100%;
-  font-family: inherit;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  /*text-align: justify;*/
-}
-
-body {
-  color: #333;
-  background: #fff;
-  font: 8px;
-  overflow-x: hidden;
-}
-
-ul,
-li,
-ol {
-  list-style: none;
-  line-height: normal;
-}
-
-i,
-address,
-cite,
-dfn,
-em,
-var {
-  font-style: normal;
-}
-
-body {
-  min-width: 1200px;
-}
-
-html,
-body {
-  min-height: 100%;
-}
-
-a,
-img,
-input[type='text'],
-input[type='submit'],
-input[type='password'],
-textarea,
-select,
-button,
-footer,
-header,
-time,
-span,
-em,
-i {
-  -webkit-transition: all 0.3s ease-in;
-  -o-transition: all 0.3s ease-in;
-  transition: all 0.3s ease-in;
-}
-
-.g-side-tab .hd,
-.cf {
-  /* *zoom: 1; */
-}
-
-.g-side-tab .hd:before,
-.g-side-tab .hd:after,
-.cf:before,
-.cf:after {
-  content: '';
-  display: table;
-}
-
-.g-side-tab .hd:after,
-.cf:after {
-  clear: both;
-}
-
-input[type='text'],
+.signIn input[type='text'],
 input[type='password'],
 select,
 textarea {
@@ -347,188 +33,6 @@ textarea {
   outline: none;
 }
 
-input:hover[type='text'],
-input:hover[type='password'],
-select:hover,
-textarea:hover,
-input:focus[type='text'],
-input:focus[type='password'],
-select:focus,
-textarea:focus {
-  border-color: #078dcf;
-}
-
-.left,
-.right {
-  float: left;
-}
-
-.show {
-  display: block !important;
-}
-
-.content {
-  width: 1200px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.btn {
-  height: 30px;
-  line-height: 30px;
-  padding: 0 10px;
-  border-radius: 5px;
-  border: #078dcf 1px solid;
-  text-align: center;
-  background-color: #078dcf;
-  color: #fff;
-}
-
-.btn:hover {
-  opacity: 0.8;
-  color: #fff;
-}
-
-.btn.btn-blue {
-  background-color: #00aaee;
-  border-color: #00aaee;
-}
-
-.btn.btn-gray {
-  background-color: #b9bcc7;
-  border-color: #b9bcc7;
-}
-
-.btn.btn-red {
-  background-color: #fc4444;
-  border-color: #fc4444;
-}
-
-.btn.btn-orange {
-  background-color: #ff7802;
-  border-color: #ff7802;
-}
-
-.btn.btn-white {
-  background-color: #fff;
-  border-color: #eee;
-  color: #333;
-}
-
-input[type='text'],
-input[type='password'],
-select {
-  width: 100%;
-  border: #eee 1px solid;
-  height: 30px;
-  border-radius: 5px;
-  padding: 0 5px;
-}
-
-input[type='text']:focus,
-input[type='password']:focus,
-select:focus {
-  border-color: #078dcf;
-}
-
-input[type='submit'] {
-  width: 100%;
-  outline: none;
-}
-
-input[type='submit']:hover {
-  opacity: 0.8;
-}
-
-textarea {
-  height: auto;
-  min-height: 120px;
-  border: #eee 1px solid;
-  border-radius: 5px;
-  padding: 5px;
-}
-
-.prv-nxt {
-  padding-top: 20px;
-  padding-bottom: 20px;
-}
-
-.prv-nxt .left {
-  float: left;
-}
-
-.prv-nxt .right {
-  float: right;
-}
-
-.prv-nxt a {
-  padding: 0 10px;
-  height: 27px;
-  border: #eee 1px solid;
-  text-align: center;
-  line-height: 27px;
-  font-size: 12px;
-  display: inline-block;
-  margin-right: 5px;
-}
-
-.prv-nxt a:hover,
-.prv-nxt .active {
-  background-color: #078dcf;
-  color: #fff;
-  border-color: #078dcf;
-}
-
-.prv-nxt .right {
-  font-size: 12px;
-}
-
-.g-side-tab .hd {
-  border-top: #494b4a 2px solid;
-  padding: 15px 0 15px 0;
-  position: relative;
-  line-height: 20px;
-  font-size: 16px;
-  border-bottom: #dfdfdf 1px solid;
-  margin-bottom: 20px;
-}
-
-.g-side-tab .hd li {
-  width: 50%;
-  text-align: center;
-  float: left;
-  border-left: #ab120d 5px solid;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
-
-.g-side-tab .hd li:first-child {
-  border: none;
-}
-
-.g-side-tab .bd > div {
-  display: none;
-}
-
-.g-side-tab .bd .tab-con1 {
-  display: block;
-}
-
-/* ----------------------------------------------------------------------main-------------------------------------------------------------------- */
-html {
-  min-height: 100%;
-}
-
-html body {
-  min-height: 100%;
-  min-width: auto;
-}
-
-.signIn {
-  width: 100%;
-  min-height: 100%;
-}
-
 .signIn .box {
   width: 100%;
   /*min-height: 731px;*/
@@ -725,12 +229,6 @@ html body {
 }
 
 @media (min-width: 768px) {
-  body {
-    /*height: 100vh;*/
-    background: url(/static/images/login/bg.png) center center no-repeat;
-    background-size: cover;
-  }
-
   .signIn {
     width: 100%;
     min-height: 100%;
@@ -911,10 +409,6 @@ html body {
 }
 
 @media (min-width: 1200px) {
-  body {
-    /*height: 100vh;*/
-  }
-
   .signIn {
     width: 100%;
     min-height: 100%;