cloud-web-corejs 1.1.0-dev.26 → 1.1.0-dev.27

package/src/components/xform/form-designer/form-widget/field-widget/rate-widget.vue

@@ -93,7 +93,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/rich-editor-widget.vue

@@ -114,7 +114,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/save_submit_wf_button-widget.vue

@@ -111,5 +111,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/script-input-widget.vue

@@ -122,7 +122,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 
 .script-input-design-placeholder {
   min-height: 120px;

package/src/components/xform/form-designer/form-widget/field-widget/search_button-widget.vue

@@ -77,5 +77,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/select-export-button-widget.vue

@@ -81,6 +81,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/select-export-item-button-widget.vue

@@ -126,5 +126,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/select-widget.vue

@@ -130,7 +130,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/singerSearch-widget.vue

@@ -30,7 +30,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/singleUpload-widget.vue

@@ -122,7 +122,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/slider-widget.vue

@@ -91,7 +91,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue

@@ -159,7 +159,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 
 .design-time-bottom-margin {
   margin-bottom: 5px;

package/src/components/xform/form-designer/form-widget/field-widget/static-text-widget.vue

@@ -83,6 +83,6 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/status-widget.vue

@@ -165,5 +165,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/switch-widget.vue

@@ -100,7 +100,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/table-export-button-widget.vue

@@ -97,5 +97,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/tempStorage-widget.vue

@@ -143,5 +143,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/text-widget.vue

@@ -162,7 +162,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 ::v-deep .el-form-item {
   min-height: 34px;
 }

package/src/components/xform/form-designer/form-widget/field-widget/textarea-widget.vue

@@ -94,6 +94,6 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/time-range-widget.vue

@@ -97,7 +97,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/time-widget.vue

@@ -125,7 +125,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/title-head-widget.vue

@@ -77,6 +77,6 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/vabSearch-widget.vue

@@ -30,7 +30,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload-widget.vue

@@ -314,7 +314,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload2-widget.vue

@@ -728,7 +728,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/vue-page-widget.vue

@@ -188,7 +188,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 
 .designer-vue-page-container {
   outline: 1px dashed #336699;

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -123,7 +123,7 @@ export const containers = [
 }, {
   type: "grid-sub-form",
   category: "container",
-  icon: "grid-sub-form",
+  icon: "sub-form",
   widgetList: [],
   options: {
     name: "",
@@ -141,7 +141,7 @@ export const containers = [
   {
     type: "grid-col",
     category: "container",
-    icon: "grid-col",
+    icon: "grid",
     internal: !0,
     widgetList: [],
     options: {
@@ -163,7 +163,7 @@ export const containers = [
   {
     type: "table-cell",
     category: "container",
-    icon: "table-cell",
+    icon: "table",
     internal: !0,
     widgetList: [],
     merged: !1,
@@ -179,7 +179,7 @@ export const containers = [
   {
     type: "tab-pane",
     category: "container",
-    icon: "tab-pane",
+    icon: "tab",
     internal: !0,
     widgetList: [],
     options: {
@@ -588,7 +588,7 @@ export const containers = [
      * 直接拖进 tab-pane(见 docs/详情模块标签承载方案.md) */
     type: "detail-pane",
     category: "container",
-    icon: "grid-col",
+    icon: "grid",
     buttonWidgetList: [],
     widgetList: [],
     options: {
@@ -798,7 +798,7 @@ export const containers = [
   {
     type: "h5-card-pane",
     category: "container",
-    icon: "tab-pane",
+    icon: "tab",
     internal: !0,
     buttonWidgetList: [],
     widgetList: [],
@@ -828,7 +828,7 @@ export const containers = [
   {
     type: "h5-table-cell",
     category: "container",
-    icon: "table-cell",
+    icon: "table",
     internal: !0,
     widgetList: [],
     merged: !1,
@@ -3861,7 +3861,7 @@ export const advancedFields = [
   },
   {
     type: "dropdown-item",
-    icon: "tab-pane",
+    icon: "tab",
     internal: !0,
     options: {
       name: "",

package/src/components/xform/mixins/scriptHttp.js

@@ -105,10 +105,23 @@ modules = {
       let toDo = () => {
         return new Promise((resolve, reject) => {
           getServiceName((searviceName) => {
+            let reportGlobalMap = getReportGlobalMap() || {};
+            let isFormData =
+              typeof FormData !== "undefined" && data instanceof FormData;
             let reqData;
-            reqData = data;
+            if (isFormData) {
+              if (!data.has("fixeData")) {
+                data.append("fixeData", JSON.stringify(reportGlobalMap));
+              }
+              reqData = data;
+            } else {
+              reqData = {
+                // scriptCode: scriptCode,
+                fixeData: reportGlobalMap,
+                ...(data || {}),
+              };
+            }
 
-            let reportGlobalMap = getReportGlobalMap() || {};
             let url = `/${searviceName}/bd_api/${formCode}/${scriptCode}`;
             return this.getHttpTarget().$http({
               // aes: true,
@@ -117,11 +130,19 @@ modules = {
               // loadingTarget: this.getLoadingTarget(),
               isLoading,
               ...opts,
-              data: {
-                // scriptCode: scriptCode,
-                fixeData: reportGlobalMap,
-                ...reqData,
-              },
+              ...(isFormData
+                ? {
+                    headers: Object.assign(
+                      { "Content-Type": "multipart/form-data" },
+                      opts.headers || {}
+                    ),
+                    filterConfig: Object.assign(
+                      { enabled: false },
+                      opts.filterConfig || {}
+                    ),
+                  }
+                : {}),
+              data: reqData,
               success: (res, response) => {
                 if (res.objx) {
                   res.objx = this.handleDecryptData(res.objx);

package/src/components/xform/styles/census.scss

@@ -0,0 +1,288 @@
+// Core xform census widget skins extracted from the app stylesheet.
+@import "~@base/styles/variables.scss";
+
+.form-count {
+  display: flex; /*margin-bottom: 6px !important;*/
+  overflow: hidden;
+  border-radius: 4px;
+  .form-count-item {
+    flex: 1;
+    color: rgba(255, 255, 255, 0.65);
+    line-height: 1.5;
+    background-color: $baseColor;
+    font-size: $fontSizeBase;
+    padding-bottom: 1000px;
+    margin-bottom: -1000px;
+    border-radius: 4px;
+    &:nth-child(1) {
+      background-image: linear-gradient(to right, #34c7a5, #4ed894);
+      margin-left: 0 !important;
+    }
+    &:nth-child(2) {
+      background-image: linear-gradient(to right, #5590fd, #6bd1ff);
+    }
+    &:nth-child(3) {
+      background-image: linear-gradient(to right, #fe6c69, #ffa57b);
+    }
+    &:nth-child(4) {
+      background-image: linear-gradient(to left, #ffcf60, #daae47);
+    }
+    &:nth-child(7) {
+      background-image: linear-gradient(to left, #7cc422, #63a313);
+    }
+    &:nth-child(5) {
+      background-image: linear-gradient(to left, #ffa060, #da7c3d);
+    }
+    &:nth-child(6) {
+      background-image: linear-gradient(to left, #60d0fe, #45b7e7);
+    }
+    &:nth-child(8) {
+      background-image: linear-gradient(to left, #46d2e3, #2fb7c8);
+    }
+    &:nth-child(9) {
+      background-image: linear-gradient(to left, #6ecd71, #4db751);
+    }
+    &:nth-child(10) {
+      background-image: linear-gradient(to left, #ff606c, #d8505a);
+    }
+    b {
+      color: #fff;
+      font-weight: 400;
+      font-size: 22px;
+    }
+    p {
+      margin: 0;
+    }
+    .t1 {
+      color: #ffffffcc;
+      padding: 15px 18px 0;
+      position: relative;
+      b {
+        display: inline-block;
+        margin-top: 5px;
+      }
+      &:after {
+        content: "\e794";
+        width: 22px;
+        height: 22px;
+        display: block;
+        position: absolute;
+        right: 14px;
+        top: 14px;
+        cursor: pointer;
+        font-family: element-icons !important;
+        border-radius: 50%;
+        border: solid 1px #ffffff69;
+        text-align: center;
+        line-height: 20px;
+      }
+    }
+    .t2 {
+      color: #ffffffcc;
+      margin: 12px 0;
+      padding: 0 18px;
+      p {
+        overflow: hidden;
+        margin-bottom: 8px;
+      }
+      span {
+        float: right;
+      }
+    }
+    .t3 {
+      text-align: center;
+      padding: 32px 12px;
+      font-size: 13px;
+      color: transparentize($baseColor, 0.6);
+      b {
+        font-size: 30px;
+        margin-top: 10px;
+        display: block;
+        color: $baseColor;
+      }
+    }
+    &.i-s2 {
+      background: #d8e9fc;
+    }
+  }
+}
+.form-count2 {
+  display: flex;
+  margin-bottom: 8px;
+  .form-count-item {
+    flex: 1;
+    border: solid 1px #265b860d;
+    text-align: center;
+    padding: 15px 0;
+    border-radius: 2px;
+    background-image: linear-gradient(
+      180deg,
+      rgb(243, 248, 255) 0%,
+      rgb(255, 255, 255) 100%
+    );
+    .t1 {
+      p {
+        font-size: $fontSizeBase;
+        color: #888;
+      }
+      b {
+        font-size: 30px;
+        color: #212121;
+        line-height: 1;
+      }
+    }
+  }
+}
+.form-count3 {
+  display: flex;
+  margin-bottom: 8px;
+  .form-count-item {
+    flex: 1;
+    text-align: center;
+    padding: 15px 0;
+    color: #212121;
+    position: relative;
+    &:after {
+      content: "";
+      width: 1px;
+      position: absolute;
+      top: 24px;
+      bottom: 24px;
+      background-color: #efefef;
+      right: 0;
+    }
+    &:last-child:after {
+      display: none;
+    }
+    .t1 {
+      p {
+        font-size: $fontSizeBase;
+      }
+      b {
+        font-size: 30px;
+        line-height: 1;
+        font-weight: 600;
+      }
+    }
+  }
+}
+.form-count4 {
+  display: flex;
+  margin-bottom: 8px;
+  .form-count-item {
+    flex: 1;
+    text-align: center;
+    padding: 11px 0;
+    color: #343434;
+    position: relative;
+    background: #f6f8fa;
+    line-height: 1;
+    border-radius: 8px;
+    font-size: $fontSizeBase;
+    p {
+      margin-bottom: 4px;
+    }
+  }
+}
+
+.form-count5 {
+  display: flex; /*margin-bottom: 6px !important;*/
+  overflow: hidden;
+  margin: 0 -3px;
+  .form-count-item {
+    padding: 12px 18px 10px;
+    flex: 1;
+    color: rgba(0, 0, 0, 0.65);
+    line-height: 1.5;
+    font-size: $fontSizeBase;
+    margin: 0 3px;
+    border-top: solid 3px;
+    b {
+      color: #3c4a5b;
+      font-weight: 400;
+      font-size: 22px;
+      display: inline-block;
+      margin-top: 8px;
+      margin-right: 12px;
+    }
+    span {
+      color: #888;
+    }
+    p {
+      margin: 0;
+      color: #475668;
+    }
+    &:nth-child(1) {
+      background: #eaf9f5;
+      border-top-color: #01bf8a;
+    }
+    &:nth-child(2) {
+      background: #ecf4ff;
+      border-top-color: #307df2;
+    }
+    &:nth-child(3) {
+      background: #fff8e6;
+      border-top-color: #f9b302;
+    }
+    &:nth-child(4) {
+      background: #f3f0ff;
+      border-top-color: #7f5bf2;
+    }
+    &:nth-child(5) {
+      background: #ffeeee;
+      border-top-color: #de0f0f;
+    }
+  }
+}
+.form-count6 {
+  display: flex; /*margin-bottom: 6px !important;*/
+  overflow: hidden;
+  margin: 0 -3px;
+  .form-count-item {
+    padding: 12px 18px 10px;
+    flex: 1;
+    color: rgba(0, 0, 0, 0.65);
+    line-height: 1.5;
+    font-size: $fontSizeBase;
+    margin: 0 3px;
+    border: solid 1px $borderColor;
+    border-radius: 4px;
+    b {
+      font-weight: 400;
+      font-size: 22px;
+      display: inline-block;
+      margin-top: 8px;
+      margin-right: 6px;
+    }
+    span {
+      color: #888;
+    }
+    p {
+      margin: 0;
+      color: #475668;
+      > i {
+        margin-right: 4px;
+        vertical-align: middle;
+        font-size: 16px;
+      }
+      > span {
+        vertical-align: middle;
+      }
+    }
+    &:nth-child(1) p {
+      color: #307df2;
+    }
+    &:nth-child(2) p {
+      color: #0ccd7c;
+    }
+    &:nth-child(3) p {
+      color: #fb3838;
+    }
+    &:nth-child(4) p {
+      color: #ff6949;
+    }
+    &:nth-child(5) p {
+      color: #307df2;
+    }
+  }
+}